[Libreoffice-commits] .: vcl/inc vcl/Library_vclplug_gtk.mk

[Libreoffice Gerrit user]

 vcl/Library_vclplug_gtk.mk   |    6 ++++++
 vcl/inc/unx/gtk/gtkframe.hxx |    2 ++
 2 files changed, 8 insertions(+)

New commits:
commit 8aef1922f7cbe1a285320c81ef93eeffbbecfcac
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Nov 14 23:38:42 2012 +0100

    Trying to avoid dbus stuff when ENABLE_DBUS!=TRUE
    
    Change-Id: Iec606a754c405710c45d78bd061ca1650522a747

diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index 41e6037..c336b6c 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 6926136..72b9119 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 );