[Libreoffice-commits] core.git: config_host/config_gio.h.in config_host/config_vclplug.h.in configure.ac RepositoryExternal.mk scp2/InstallModule_gnome.mk scp2/source sfx2/source vcl/inc vcl/unx
Caolán McNamara
caolanm at redhat.com
Fri Feb 19 13:06:29 UTC 2016
RepositoryExternal.mk | 4 ----
config_host/config_gio.h.in | 12 ++++++++++++
config_host/config_vclplug.h.in | 1 -
configure.ac | 1 +
scp2/InstallModule_gnome.mk | 1 -
scp2/source/gnome/file_gnome.scp | 3 ++-
scp2/source/gnome/module_gnome.scp | 3 ++-
sfx2/source/appl/shutdowniconunx.cxx | 12 +++++++-----
vcl/inc/unx/gtk/gtkframe.hxx | 2 +-
vcl/inc/unx/gtk/gtksalmenu.hxx | 2 +-
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 2 +-
vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 2 +-
vcl/unx/gtk/gtksalframe.cxx | 2 +-
vcl/unx/gtk3/gtk3gtkframe.cxx | 2 +-
14 files changed, 30 insertions(+), 19 deletions(-)
New commits:
commit ad627912b5390ca46dde34815add876b0ae24bab
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Feb 19 11:10:01 2016 +0000
move gio config into its own separate config header
Change-Id: I25ca238931da039c244c2af6171d69c9875f95ff
Reviewed-on: https://gerrit.libreoffice.org/22501
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8ef7074..b3b06db 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2446,10 +2446,6 @@ $(call gb_LinkTarget_set_include,$(1),\
$(GIO_CFLAGS) \
)
-$(call gb_LinkTarget_add_defs,$(1),\
- -DENABLE_GIO \
-)
-
$(call gb_LinkTarget_add_libs,$(1),$(GIO_LIBS))
endef
diff --git a/config_host/config_gio.h.in b/config_host/config_gio.h.in
new file mode 100644
index 0000000..1c0c440
--- /dev/null
+++ b/config_host/config_gio.h.in
@@ -0,0 +1,12 @@
+/*
+
+Settings for gio header file dection
+
+*/
+
+#ifndef CONFIG_GIO_H
+#define CONFIG_GIO_H
+
+#define ENABLE_GIO 0
+
+#endif
diff --git a/config_host/config_vclplug.h.in b/config_host/config_vclplug.h.in
index ae17474..12d90ee 100644
--- a/config_host/config_vclplug.h.in
+++ b/config_host/config_vclplug.h.in
@@ -10,6 +10,5 @@ Settings about which X11 desktops have support enabled.
#define ENABLE_GTK 0
#define ENABLE_KDE4 0
#define ENABLE_TDE 0
-#define ENABLE_GIO 0
#endif
diff --git a/configure.ac b/configure.ac
index daa1810..5993c11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12852,6 +12852,7 @@ AC_CONFIG_HEADERS([config_host/config_cups.h])
AC_CONFIG_HEADERS([config_host/config_features.h])
AC_CONFIG_HEADERS([config_host/config_folders.h])
AC_CONFIG_HEADERS([config_host/config_gcc.h])
+AC_CONFIG_HEADERS([config_host/config_gio.h])
AC_CONFIG_HEADERS([config_host/config_global.h])
AC_CONFIG_HEADERS([config_host/config_graphite.h])
AC_CONFIG_HEADERS([config_host/config_java.h])
diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk
index a2d1c88..ac3a1fd 100644
--- a/scp2/InstallModule_gnome.mk
+++ b/scp2/InstallModule_gnome.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/gnome))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome))
$(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
- ENABLE_GIO \
ENABLE_GTK \
))
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index f64ad42..3f4b8f5 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -16,8 +16,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "macros.inc"
+#include "config_gio.h"
-#if defined ENABLE_GIO
+#if ENABLE_GIO
File gid_File_Share_Registry_Gnome_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index 08d9efe..e1c5862 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -17,6 +17,7 @@
*/
#include "macros.inc"
+#include "config_gio.h"
#include "AutoInstall/gnome"
@@ -27,7 +28,7 @@ Module gid_Module_Optional_Gnome
MOD_NAME_DESC(MODULE_OPTIONAL_GNOME);
Styles = ();
Files = (auto_gnome_ALL,
-#if defined ENABLE_GIO
+#if ENABLE_GIO
gid_File_Share_Registry_Gnome_Xcd,
#endif
gid_File_Bin_Gnome_Open_Url
diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx
index ceaacfb..f8c84d4 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,
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 10b0ecf..93aac14 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -47,7 +47,7 @@
#include <list>
#include <vector>
-#include <config_vclplug.h>
+#include <config_gio.h>
#include "headless/svpgdi.hxx"
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index 8df2c1d..3e827ff 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
#define INCLUDED_VCL_INC_UNX_GTK_GTKSALMENU_HXX
-#include <config_vclplug.h>
+#include <config_gio.h>
#include <vector>
#if ENABLE_GIO
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 313af1e..88c4205 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -23,7 +23,7 @@
#undef _LINUX_SOURCE_COMPAT
#endif
-#include <config_vclplug.h>
+#include <config_gio.h>
#include <com/sun/star/awt/Toolkit.hpp>
#include <com/sun/star/frame/Desktop.hpp>
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index 4aebe6a..fa6fe19 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -23,7 +23,7 @@
#undef _LINUX_SOURCE_COMPAT
#endif
-#include <config_vclplug.h>
+#include <config_gio.h>
#include <com/sun/star/awt/Toolkit.hpp>
#include <com/sun/star/frame/Desktop.hpp>
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index ff1c9e6..fcd05b0 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -39,7 +39,7 @@
#include <vcl/settings.hxx>
#include <vcl/opengl/OpenGLHelper.hxx>
-#include <config_vclplug.h>
+#include <config_gio.h>
#include <unx/x11/xlimits.hxx>
#if defined(ENABLE_DBUS) && ENABLE_GIO
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index f16676c..6d02b81 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -38,7 +38,7 @@
#include <vcl/window.hxx>
#include <vcl/settings.hxx>
-#include <config_vclplug.h>
+#include <config_gio.h>
#if defined(ENABLE_DBUS) && ENABLE_GIO
# include <unx/gtk/gtksalmenu.hxx>
More information about the Libreoffice-commits
mailing list