diff options
| author | Stefano Karapetsas <[email protected]> | 2012-11-18 04:19:03 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-11-18 04:19:03 -0800 |
| commit | ae8cacd5443dd6f93a5a23a5cad6e60de1b5691e (patch) | |
| tree | 25e5945e80b09363f16946183a11958ee04c22cd | |
| parent | e673e8d93e0abef7759547a9131e097106920a6e (diff) | |
| parent | c4c747f87ce3fb6f41f25ed5ad7be0d75d30a5c1 (diff) | |
| download | mate-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
| -rw-r--r-- | src/gpm-main.c | 6 | ||||
| -rw-r--r-- | src/gpm-statistics.c | 3 |
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 (); |