summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-11-18 04:19:03 -0800
committerStefano Karapetsas <[email protected]>2012-11-18 04:19:03 -0800
commitae8cacd5443dd6f93a5a23a5cad6e60de1b5691e (patch)
tree25e5945e80b09363f16946183a11958ee04c22cd /src
parente673e8d93e0abef7759547a9131e097106920a6e (diff)
parentc4c747f87ce3fb6f41f25ed5ad7be0d75d30a5c1 (diff)
downloadmate-power-manager-ae8cacd5443dd6f93a5a23a5cad6e60de1b5691e.tar.bz2
mate-power-manager-ae8cacd5443dd6f93a5a23a5cad6e60de1b5691e.tar.xz
Merge pull request #34 from Firstyear/master
Corrects an issue with deprecated glib apis
Diffstat (limited to 'src')
-rw-r--r--src/gpm-main.c6
-rw-r--r--src/gpm-statistics.c3
2 files changed, 9 insertions, 0 deletions
diff --git a/src/gpm-main.c b/src/gpm-main.c
index 5abff81..064ccf3 100644
--- a/src/gpm-main.c
+++ b/src/gpm-main.c
@@ -183,8 +183,11 @@ main (int argc, char *argv[])
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
+#if GLIB_CHECK_VERSION(2,32,0)
+#else
if (! g_thread_supported ())
g_thread_init (NULL);
+#endif
dbus_g_thread_init ();
g_type_init ();
@@ -200,8 +203,11 @@ main (int argc, char *argv[])
goto unref_program;
}
+#if GLIB_CHECK_VERSION(2,32,0)
+#else
if (!g_thread_supported ())
g_thread_init (NULL);
+#endif
dbus_g_thread_init ();
gtk_init (&argc, &argv);
diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c
index 3284067..4813d1f 100644
--- a/src/gpm-statistics.c
+++ b/src/gpm-statistics.c
@@ -1564,8 +1564,11 @@ main (int argc, char *argv[])
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
+#if GLIB_CHECK_VERSION(2,32,0)
+#else
if (! g_thread_supported ())
g_thread_init (NULL);
+#endif
dbus_g_thread_init ();
g_type_init ();