summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gpm-backlight-helper.c1
-rw-r--r--src/gpm-main.c6
-rw-r--r--src/gpm-statistics.c3
3 files changed, 10 insertions, 0 deletions
diff --git a/src/gpm-backlight-helper.c b/src/gpm-backlight-helper.c
index 4868446..a9c0fd4 100644
--- a/src/gpm-backlight-helper.c
+++ b/src/gpm-backlight-helper.c
@@ -52,6 +52,7 @@ gcm_backlight_helper_get_best_backlight ()
/* available kernel interfaces in priority order */
static const gchar *backlight_interfaces[] = {
"nv_backlight",
+ "nvidia_backlight",
"asus_laptop",
"toshiba",
"eeepc",
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 ();