[gnome-power-manager] Remove the keyboard backlight key handling, it's moved to gnome-settings-daemon
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-power-manager] Remove the keyboard backlight key handling, it's moved to gnome-settings-daemon
- Date: Mon, 25 Jul 2011 13:21:24 +0000 (UTC)
commit 507a6182e22ecb11a9c520cf17cca0bad75fca56
Author: Richard Hughes <richard hughsie com>
Date: Mon Jul 4 12:17:23 2011 +0100
Remove the keyboard backlight key handling, it's moved to gnome-settings-daemon
data/org.gnome.power-manager.gschema.xml.in | 20 -
src/Makefile.am | 2 -
src/gpm-button.c | 3 -
src/gpm-button.h | 3 -
src/gpm-common.h | 6 -
src/gpm-kbd-backlight.c | 745 ---------------------------
src/gpm-kbd-backlight.h | 78 ---
src/gpm-manager.c | 12 -
8 files changed, 0 insertions(+), 869 deletions(-)
---
diff --git a/data/org.gnome.power-manager.gschema.xml.in b/data/org.gnome.power-manager.gschema.xml.in
index 4d64ed5..687de7a 100644
--- a/data/org.gnome.power-manager.gschema.xml.in
+++ b/data/org.gnome.power-manager.gschema.xml.in
@@ -27,26 +27,6 @@
<_summary>LCD brightness when on AC</_summary>
<_description>The brightness of the display when on AC power. Possible values are between 0.0 and 1.0.</_description>
</key>
- <key name="kbd-backlight-battery-reduce" type="b">
- <default>true</default>
- <_summary>Reduce the keyboard backlight when on battery power</_summary>
- <_description>If the keyboard backlight brightness should be reduced when the computer is on battery power</_description>
- </key>
- <key name="kbd-brightness-on-ac" type="i">
- <default>100</default>
- <_summary>Keyboard backlight brightness when on AC power.</_summary>
- <_description>Percent brightness to set keyboard backlight at when on AC power. Legal values are between 0 and 100.</_description>
- </key>
- <key name="kbd-brightness-dim-by-on-battery" type="i">
- <default>50</default>
- <_summary>Percent to reduce keyboard backlight by when on battery power.</_summary>
- <_description>The percentage to reduce the keyboard backlight by when on battery power. For example, if set to '60', the backlight will be cut by 40% on battery power. Legal values are between 0 and 100.</_description>
- </key>
- <key name="kbd-brightness-dim-by-on-idle" type="i">
- <default>75</default>
- <_summary>Percent to reduce keyboard backlight by when idle.</_summary>
- <_description>The percentage to reduce the keyboard backlight by when idle. For example, if set to '60', the backlight will be cut by 40% when idle. Legal values are between 0 and 100.</_description>
- </key>
<key name="use-time-for-policy" type="b">
<default>true</default>
<_summary>Whether to use time-based notifications</_summary>
diff --git a/src/Makefile.am b/src/Makefile.am
index f6db8db..572202a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -100,8 +100,6 @@ gnome_power_manager_SOURCES = \
gpm-control.c \
gpm-button.h \
gpm-button.c \
- gpm-kbd-backlight.h \
- gpm-kbd-backlight.c \
gpm-main.c \
gpm-manager.h \
gpm-manager.c \
diff --git a/src/gpm-button.c b/src/gpm-button.c
index d133292..2373a80 100644
--- a/src/gpm-button.c
+++ b/src/gpm-button.c
@@ -336,9 +336,6 @@ gpm_button_init (GpmButton *button)
#ifdef HAVE_XF86XK_BATTERY
gpm_button_xevent_key (button, XF86XK_Battery, GPM_BUTTON_BATTERY);
#endif
- gpm_button_xevent_key (button, XF86XK_KbdBrightnessUp, GPM_BUTTON_KBD_BRIGHT_UP);
- gpm_button_xevent_key (button, XF86XK_KbdBrightnessDown, GPM_BUTTON_KBD_BRIGHT_DOWN);
- gpm_button_xevent_key (button, XF86XK_KbdLightOnOff, GPM_BUTTON_KBD_BRIGHT_TOGGLE);
/* use global filter */
gdk_window_add_filter (button->priv->window,
diff --git a/src/gpm-button.h b/src/gpm-button.h
index 8992007..891acc8 100644
--- a/src/gpm-button.h
+++ b/src/gpm-button.h
@@ -44,9 +44,6 @@ typedef struct GpmButtonPrivate GpmButtonPrivate;
#define GPM_BUTTON_LID_CLOSED "lid-down"
#define GPM_BUTTON_BRIGHT_UP "brightness-up"
#define GPM_BUTTON_BRIGHT_DOWN "brightness-down"
-#define GPM_BUTTON_KBD_BRIGHT_UP "kbd-illum-up"
-#define GPM_BUTTON_KBD_BRIGHT_DOWN "kbd-illum-down"
-#define GPM_BUTTON_KBD_BRIGHT_TOGGLE "kbd-illum-toggle"
#define GPM_BUTTON_LOCK "lock"
#define GPM_BUTTON_BATTERY "battery"
diff --git a/src/gpm-common.h b/src/gpm-common.h
index b40204f..fb14577 100644
--- a/src/gpm-common.h
+++ b/src/gpm-common.h
@@ -56,12 +56,6 @@ G_BEGIN_DECLS
#define GPM_SETTINGS_BRIGHTNESS_AC "brightness-ac"
#define GPM_SETTINGS_BRIGHTNESS_DIM_BATT "brightness-dim-battery"
-/* keyboard backlight */
-#define GPM_SETTINGS_KBD_BACKLIGHT_BATT_REDUCE "kbd-backlight-battery-reduce"
-#define GPM_SETTINGS_KBD_BRIGHTNESS_ON_AC "kbd-brightness-on-ac"
-#define GPM_SETTINGS_KBD_BRIGHTNESS_DIM_BY_ON_BATT "kbd-brightness-dim-by-on-battery"
-#define GPM_SETTINGS_KBD_BRIGHTNESS_DIM_BY_ON_IDLE "kbd-brightness-dim-by-on-idle"
-
/* buttons */
#define GSD_SETTINGS_BUTTON_LID_AC "lid-close-ac-action"
#define GSD_SETTINGS_BUTTON_LID_BATT "lid-close-battery-action"
diff --git a/src/gpm-manager.c b/src/gpm-manager.c
index 06442dc..fc88a89 100644
--- a/src/gpm-manager.c
+++ b/src/gpm-manager.c
@@ -50,7 +50,6 @@
#include "gpm-manager.h"
#include "gpm-screensaver.h"
#include "gpm-backlight.h"
-#include "gpm-kbd-backlight.h"
#include "gpm-stock-icons.h"
#include "gpm-engine.h"
#include "gpm-upower.h"
@@ -95,7 +94,6 @@ struct GpmManagerPrivate
GpmScreensaver *screensaver;
GpmEngine *engine;
GpmBacklight *backlight;
- GpmKbdBacklight *kbd_backlight;
EggConsoleKit *console;
guint32 screensaver_ac_throttle_id;
guint32 screensaver_dpms_throttle_id;
@@ -2186,12 +2184,6 @@ gpm_manager_bus_acquired_cb (GDBusConnection *connection,
if (manager->priv->backlight != NULL) {
gpm_backlight_register_dbus (manager->priv->backlight, connection);
}
-
- if (manager->priv->kbd_backlight != NULL) {
- gpm_kbd_backlight_register_dbus (manager->priv->kbd_backlight,
- connection,
- NULL);
- }
}
/**
@@ -2275,9 +2267,6 @@ gpm_manager_init (GpmManager *manager)
/* try an start an interactive service */
manager->priv->backlight = gpm_backlight_new ();
- /* try and start an interactive service */
- manager->priv->kbd_backlight = gpm_kbd_backlight_new ();
-
manager->priv->idle = gpm_idle_new ();
g_signal_connect (manager->priv->idle, "idle-changed",
G_CALLBACK (gpm_manager_idle_changed_cb), manager);
@@ -2367,7 +2356,6 @@ 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]