diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-11-15 20:08:12 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-15 20:29:48 +0000 |
| commit | 67582fd2e3180fde45c11e85f8c3eb5e20ef8bc0 (patch) | |
| tree | 67d32416ff9b3064093c8bd087dc2bfbb60d0749 /vcl/unx | |
| parent | 6e1c579f3ba822af3f4449d16a39c5fa4a1f2093 (diff) | |
glib / dbus version checks strangely ommitted from the merge.
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 88ac7f2d3dd7..5736413d58d5 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -481,12 +481,14 @@ GtkSalFrame::GtkSalFrame( SystemParentData* pSysData ) Init( pSysData ); } -#if !GTK_CHECK_VERSION(3,0,0) && defined(ENABLE_DBUS) && defined(ENABLE_GIO) +#ifdef ENABLE_GMENU_INTEGRATION + static void gdk_x11_window_set_utf8_property (GdkWindow *window, const gchar *name, const gchar *value) { +#if !GTK_CHECK_VERSION(3,0,0) GdkDisplay* display = gdk_window_get_display (window); if (value != NULL) @@ -503,12 +505,11 @@ gdk_x11_window_set_utf8_property (GdkWindow *window, GDK_WINDOW_XID (window), gdk_x11_get_xatom_by_name_for_display (display, name)); } -} #endif +} // AppMenu watch functions. -#ifdef ENABLE_GMENU_INTEGRATION static void ObjectDestroyedNotify( gpointer data ) { if ( data ) { @@ -1135,7 +1136,7 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle ) #if !GTK_CHECK_VERSION(3,0,0) if( eWinType == GTK_WINDOW_TOPLEVEL ) { -#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) +#ifdef ENABLE_GMENU_INTEGRATION // Enable DBus native menu if available. ensure_dbus_setup( this ); #endif |