diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-04-17 20:04:45 +0400 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2013-11-05 11:50:52 +0100 |
| commit | 99c722f4e214744f9574f6fddb5f57412da4e20e (patch) | |
| tree | 4deeb2a63746e9a3e8e9392b6349b362d1633a3e /shell | |
| parent | 3a311ccf1f26adbf3ef5deebc9bb7401441170b8 (diff) | |
WaE: g_type_init has been deprecated since GLib 2.36
Change-Id: Ied9b2c2424d780d589cb1b07df0ec38107d49829
Reviewed-on: https://gerrit.libreoffice.org/3434
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 025857d81d4781a95cda4e790808b05b97eb97d9)
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/backends/gconfbe/gconfaccess.cxx | 2 | ||||
| -rw-r--r-- | shell/source/sessioninstall/SyncDbusSessionHelper.cxx | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx index 205a2cf3f1a9..532fd1003929 100644 --- a/shell/source/backends/gconfbe/gconfaccess.cxx +++ b/shell/source/backends/gconfbe/gconfaccess.cxx @@ -51,8 +51,10 @@ GConfClient* getGconfClient() static GConfClient* mClient= 0; if (mClient == NULL) { +#if !defined(GLIB_VERSION_2_36) /* initialize glib object type library */ g_type_init(); +#endif GError* aError = NULL; if (!gconf_init(0, NULL, &aError)) diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx index 47f0749400a4..996754875fe2 100644 --- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx +++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx @@ -62,7 +62,9 @@ namespace shell { namespace sessioninstall { SyncDbusSessionHelper::SyncDbusSessionHelper(Reference<XComponentContext> const&) { +#if !defined(GLIB_VERSION_2_36) g_type_init (); +#endif } void SAL_CALL SyncDbusSessionHelper::InstallPackageNames( const ::sal_uInt32 nXid, const Sequence< OUString >& vPackages, const OUString& sInteraction ) throw (RuntimeException) { |