diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-02-19 11:10:01 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-02-19 13:06:03 +0000 |
| commit | ad627912b5390ca46dde34815add876b0ae24bab (patch) | |
| tree | d7c1539c585e9daab055dc432b0c52a20c8ea229 /sfx2 | |
| parent | aa7ceb44cf018d092ce09bb1572d7ce4876be513 (diff) | |
move gio config into its own separate config header
Change-Id: I25ca238931da039c244c2af6171d69c9875f95ff
Reviewed-on: https://gerrit.libreoffice.org/22501
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 'sfx2')
| -rw-r--r-- | sfx2/source/appl/shutdowniconunx.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index ceaacfb06f81..f8c84d4629cf 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -32,7 +32,9 @@ #include "app.hrc" #include "shutdownicon.hxx" -#ifdef ENABLE_GIO +#include <config_gio.h> + +#if ENABLE_GIO #include <gio/gio.h> #endif @@ -59,7 +61,7 @@ static GtkStatusIcon* pTrayIcon; static GtkWidget *pExitMenuItem = nullptr; static GtkWidget *pOpenMenuItem = nullptr; static GtkWidget *pDisableMenuItem = nullptr; -#ifdef ENABLE_GIO +#if ENABLE_GIO GFileMonitor* pMonitor = nullptr; #endif @@ -293,7 +295,7 @@ static gboolean display_menu_cb( GtkWidget *, return sal_True; } -#ifdef ENABLE_GIO +#if ENABLE_GIO /* * If the quickstarter is running, then LibreOffice is * upgraded, then the old quickstarter is still running, but is now unreliable @@ -353,7 +355,7 @@ void plugin_init_sys_tray() pShutdownIcon->SetVeto( true ); ShutdownIcon::addTerminateListener(); -#ifdef ENABLE_GIO +#if ENABLE_GIO GFile* pFile = nullptr; OUString sLibraryFileUrl; if (osl::Module::getUrlFromAddress(plugin_init_sys_tray, sLibraryFileUrl)) @@ -374,7 +376,7 @@ void plugin_shutdown_sys_tray() if( !pTrayIcon ) return; -#ifdef ENABLE_GIO +#if ENABLE_GIO if (pMonitor) { g_signal_handlers_disconnect_by_func(pMonitor, |