From 9361bbfbb5f7fda96f147310125fc709f4da2200 Mon Sep 17 00:00:00 2001 From: William Brown Date: Sun, 11 Nov 2012 20:02:11 +1030 Subject: Keyboard backlight patches, tested as working against 1.5.0 on F18 --- src/gpm-manager.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/gpm-manager.c') diff --git a/src/gpm-manager.c b/src/gpm-manager.c index 68ff788..13b0b8d 100644 --- a/src/gpm-manager.c +++ b/src/gpm-manager.c @@ -53,6 +53,7 @@ #include "gpm-manager.h" #include "gpm-screensaver.h" #include "gpm-backlight.h" +#include "gpm-kbd-backlight.h" #include "gpm-session.h" #include "gpm-stock-icons.h" #include "gpm-tray-icon.h" @@ -84,6 +85,7 @@ struct GpmManagerPrivate GpmTrayIcon *tray_icon; GpmEngine *engine; GpmBacklight *backlight; + GpmKbdBacklight *kbd_backlight; EggConsoleKit *console; guint32 screensaver_ac_throttle_id; guint32 screensaver_dpms_throttle_id; @@ -1904,6 +1906,13 @@ gpm_manager_init (GpmManager *manager) G_OBJECT (manager->priv->backlight)); } + manager->priv->kbd_backlight = gpm_kbd_backlight_new (); + if (manager->priv->kbd_backlight != NULL) { + gpm_kbd_backlight_register_dbus (manager->priv->kbd_backlight, + connection, + NULL); + } + manager->priv->idle = gpm_idle_new (); g_signal_connect (manager->priv->idle, "idle-changed", G_CALLBACK (gpm_manager_idle_changed_cb), manager); @@ -1998,6 +2007,7 @@ gpm_manager_finalize (GObject *object) g_object_unref (manager->priv->control); g_object_unref (manager->priv->button); g_object_unref (manager->priv->backlight); + g_object_unref (manager->priv->kbd_backlight); g_object_unref (manager->priv->console); g_object_unref (manager->priv->client); g_object_unref (manager->priv->status_icon); -- cgit v1.2.1 From 0453548baedf4e060bc3785555589b551cf5b98c Mon Sep 17 00:00:00 2001 From: William Brown Date: Wed, 14 Nov 2012 23:21:58 +1030 Subject: This fixes the mismatched dbus library issue --- src/gpm-manager.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/gpm-manager.c') diff --git a/src/gpm-manager.c b/src/gpm-manager.c index 13b0b8d..9ee8781 100644 --- a/src/gpm-manager.c +++ b/src/gpm-manager.c @@ -1850,10 +1850,12 @@ gpm_manager_init (GpmManager *manager) gboolean check_type_cpu; gint timeout; DBusGConnection *connection; + GDBusConnection *g_connection; GError *error = NULL; manager->priv = GPM_MANAGER_GET_PRIVATE (manager); connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); + g_connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); /* init to unthrottled */ manager->priv->screensaver_ac_throttle_id = 0; @@ -1909,7 +1911,7 @@ gpm_manager_init (GpmManager *manager) manager->priv->kbd_backlight = gpm_kbd_backlight_new (); if (manager->priv->kbd_backlight != NULL) { gpm_kbd_backlight_register_dbus (manager->priv->kbd_backlight, - connection, + g_connection, NULL); } -- cgit v1.2.1