diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-11-14 11:39:53 +0000 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:53:02 +0100 |
| commit | dc3ada4db5f6311aaf3154aed0bba17d96c2af9a (patch) | |
| tree | 882e4f70f70eaa4abd3d75c06217b239418dd636 /vcl/Library_vclplug_gtk.mk | |
| parent | gbooleans are true if non-zero, bin == TRUE comparisons. (diff) | |
| download | core-dc3ada4db5f6311aaf3154aed0bba17d96c2af9a.tar.gz core-dc3ada4db5f6311aaf3154aed0bba17d96c2af9a.zip | |
misc dbus menu integration fixes
Re-declare GMenuModel / GActionGroup if we don't have a recent enough gio.
Fix a number of compile warnings.
use the standard gnumake macros / linking for ENABLE_GIO & ENABLE_DBUS
Initialize GDBusInterfaceVTable cleanly.
Take the Solar Mutex on hud_activated.
Change-Id: Ie0c1d6e75c4be857f0db1adad36418dd1693f63e
Diffstat (limited to 'vcl/Library_vclplug_gtk.mk')
| -rw-r--r-- | vcl/Library_vclplug_gtk.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index c43173a8e467..41e603723311 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\ $(eval $(call gb_Library_use_externals,vclplug_gtk,\ dbus \ + gio \ gtk \ gthread \ icule \ @@ -103,10 +104,6 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\ vcl/unx/gtk/window/glomenu \ vcl/unx/gtk/window/hudawareness \ )) -$(eval $(call gb_Library_add_defs,vclplug_gtk,\ - -DENABLE_GIO=$(ENABLE_GIO) \ - -DENABLE_DBUS=$(ENABLE_DBUS) \ -)) endif endif |