From e8b4d0fc370cca038be614e3c7a72da30e0039b8 Mon Sep 17 00:00:00 2001 From: William Brown Date: Sun, 18 Nov 2012 12:00:05 +1030 Subject: This fixes an issue that I introduced, where when the screen would dim on idle, it would not undim. --- src/gpm-idle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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); } -- cgit v1.2.1 From c4c747f87ce3fb6f41f25ed5ad7be0d75d30a5c1 Mon Sep 17 00:00:00 2001 From: William Brown Date: Sun, 18 Nov 2012 16:32:32 +1030 Subject: This adds checks for glib version, in regards to deprecated apis. see http://developer.gnome.org/glib/2.31/glib-Deprecated-Thread-APIs.html#g-thread-init --- src/gpm-main.c | 6 ++++++ src/gpm-statistics.c | 3 +++ 2 files changed, 9 insertions(+) (limited to 'src') 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 (); -- cgit v1.2.1