diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-19 11:16:57 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-19 14:53:46 +0000 |
| commit | 538cf0c496f509f8fa7efa2bc61bfb5e8878d097 (patch) | |
| tree | e77346932d9d36ae850bf0cd20a5226c6f2a570b /vcl/unx/gtk3/gtk3gtkframe.cxx | |
| parent | 26912eea7521dd2b84bfac56b322cf0f8b142450 (diff) | |
move dbus config into its own config header
Change-Id: I5b0734a30dee323d41270de06f6a02fd676155c9
Reviewed-on: https://gerrit.libreoffice.org/22502
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx/gtk3/gtk3gtkframe.cxx')
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 6d02b81f511e..c125ec552b69 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -40,7 +40,7 @@ #include <config_gio.h> -#if defined(ENABLE_DBUS) && ENABLE_GIO +#if ENABLE_DBUS && ENABLE_GIO # include <unx/gtk/gtksalmenu.hxx> #endif #if defined ENABLE_GMENU_INTEGRATION // defined in gtksalmenu.hxx above @@ -463,7 +463,7 @@ GtkSalFrame::GtkSalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) m_bDefaultPos = true; m_bDefaultSize = ( (nStyle & SalFrameStyleFlags::SIZEABLE) && ! pParent ); m_bWindowIsGtkPlug = false; -#if defined(ENABLE_DBUS) && ENABLE_GIO +#if ENABLE_DBUS && ENABLE_GIO m_pLastSyncedDbusMenu = nullptr; #endif Init( pParent, nStyle ); @@ -479,7 +479,7 @@ GtkSalFrame::GtkSalFrame( SystemParentData* pSysData ) GetGenericData()->ErrorTrapPush(); m_bDefaultPos = true; m_bDefaultSize = true; -#if defined(ENABLE_DBUS) && ENABLE_GIO +#if ENABLE_DBUS && ENABLE_GIO m_pLastSyncedDbusMenu = nullptr; #endif Init( pSysData ); @@ -496,7 +496,7 @@ static void ObjectDestroyedNotify( gpointer data ) } } -#if defined(ENABLE_DBUS) && ENABLE_GIO +#if ENABLE_DBUS && ENABLE_GIO void GtkSalFrame::EnsureDbusMenuSynced() { GtkSalMenu* pSalMenu = static_cast<GtkSalMenu*>(GetMenu()); |