diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-11-14 23:38:42 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-11-14 23:38:50 +0100 |
| commit | 8aef1922f7cbe1a285320c81ef93eeffbbecfcac (patch) | |
| tree | 18381c0ad771d7aff02e2d426886be74390ba144 | |
| parent | 8c004e70aa44910d28d27e0b4cf837b3bbb85c5c (diff) | |
Trying to avoid dbus stuff when ENABLE_DBUS!=TRUE
Change-Id: Iec606a754c405710c45d78bd061ca1650522a747
| -rw-r--r-- | vcl/Library_vclplug_gtk.mk | 6 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 41e603723311..c336b6c297e6 100644 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -31,6 +31,12 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk,\ -DLIBO_VERSION=\"$(UPD)$(LAST_MINOR)\" \ )) +ifeq ($(ENABLE_DBUS),TRUE) +$(eval $(call gb_Library_add_defs,vclplug_gtk,\ + -DENABLE_DBUS \ +)) +endif + $(eval $(call gb_Library_use_sdk_api,vclplug_gtk)) $(eval $(call gb_Library_use_libraries,vclplug_gtk,\ diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 69261368ddd9..72b91199fb56 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -213,9 +213,11 @@ class GtkSalFrame : public SalFrame #endif SalMenu* m_pSalMenu; +#ifdef ENABLE_DBUS friend void ensure_dbus_setup(GdkWindow* gdkWindow, GtkSalFrame* pSalFrame); friend void on_registrar_available (GDBusConnection*, const gchar*, const gchar*, gpointer); friend void on_registrar_unavailable (GDBusConnection*, const gchar*, gpointer); +#endif guint m_nWatcherId; void Init( SalFrame* pParent, sal_uLong nStyle ); |