summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gpm-idle.c2
-rw-r--r--src/gpm-main.c6
-rw-r--r--src/gpm-statistics.c3
3 files changed, 10 insertions, 1 deletions
diff --git a/src/gpm-idle.c b/src/gpm-idle.c
index 97e9072..a7132fa 100644
--- a/src/gpm-idle.c
+++ b/src/gpm-idle.c
@@ -352,7 +352,7 @@ static void
gpm_idle_session_idle_changed_cb (GpmSession *session, gboolean is_idle, GpmIdle *idle)
{
egg_debug ("Received mate session idle changed: %i", is_idle);
- idle->priv->x_idle = TRUE;
+ idle->priv->x_idle = is_idle;
gpm_idle_evaluate (idle);
}
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 ();