summaryrefslogtreecommitdiffstats
path: root/src/extension/dbus
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2013-05-16 16:00:19 +0000
committer~suv <suv-sf@users.sourceforge.net>2013-05-16 16:00:19 +0000
commit58f7c54bdd82261552c308b672e8d5f079bf5c6d (patch)
treec62c20759bfdea3c52cd2805289957731ab38305 /src/extension/dbus
parentmerge from trunk (r12322) (diff)
parentWin32. More include fixes for glibmm 2.36 (file dialog). (diff)
downloadinkscape-58f7c54bdd82261552c308b672e8d5f079bf5c6d.tar.gz
inkscape-58f7c54bdd82261552c308b672e8d5f079bf5c6d.zip
merge from trunk (r12337)
(bzr r11668.1.70)
Diffstat (limited to 'src/extension/dbus')
-rw-r--r--src/extension/dbus/wrapper/inkscape-dbus-wrapper.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/extension/dbus/wrapper/inkscape-dbus-wrapper.c b/src/extension/dbus/wrapper/inkscape-dbus-wrapper.c
index 7a33d4f38..0be1be42e 100644
--- a/src/extension/dbus/wrapper/inkscape-dbus-wrapper.c
+++ b/src/extension/dbus/wrapper/inkscape-dbus-wrapper.c
@@ -96,7 +96,9 @@ inkscape_desktop_init_dbus ()
GError *error;
DBusGProxy *proxy;
+#if !GLIB_CHECK_VERSION(2,36,0)
g_type_init ();
+#endif
error = NULL;
connection = dbus_g_bus_get (DBUS_BUS_SESSION,