diff options
author | Stefano Karapetsas <[email protected]> | 2013-07-24 19:59:05 +0200 |
---|---|---|
committer | Stefano Karapetsas <[email protected]> | 2013-07-24 19:59:05 +0200 |
commit | 3be92767b85acabf1f30e010cca425d322b89de2 (patch) | |
tree | a2b95e572dad332a349cc9b17c1c7f2dac33499c /src/gpm-main.c | |
parent | 147f55213c2592b118d16bb813041768769cf61b (diff) | |
download | mate-power-manager-3be92767b85acabf1f30e010cca425d322b89de2.tar.bz2 mate-power-manager-3be92767b85acabf1f30e010cca425d322b89de2.tar.xz |
Code improvements and deprecation fixesmate-power-manager-1.6.2
Diffstat (limited to 'src/gpm-main.c')
-rw-r--r-- | src/gpm-main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpm-main.c b/src/gpm-main.c index 064ccf3..054cf3b 100644 --- a/src/gpm-main.c +++ b/src/gpm-main.c @@ -183,13 +183,14 @@ main (int argc, char *argv[]) bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); -#if GLIB_CHECK_VERSION(2,32,0) -#else +#if !GLIB_CHECK_VERSION(2,32,0) if (! g_thread_supported ()) g_thread_init (NULL); #endif dbus_g_thread_init (); +#if !GLIB_CHECK_VERSION(2,36,0) g_type_init (); +#endif context = g_option_context_new (N_("MATE Power Manager")); /* TRANSLATORS: program name, a simple app to view pending updates */ @@ -203,8 +204,7 @@ main (int argc, char *argv[]) goto unref_program; } -#if GLIB_CHECK_VERSION(2,32,0) -#else +#if !GLIB_CHECK_VERSION(2,32,0) if (!g_thread_supported ()) g_thread_init (NULL); #endif |