gnome-power-manager r2827 - in trunk: . data src

[rhughes svn gnome org]

Author: rhughes
Date: Mon Jun 30 10:22:59 2008
New Revision: 2827
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=2827&view=rev

Log:
2008-06-30  Richard Hughes  <richard hughsie com>

* data/gnome-power-manager.schemas.in:
* src/gpm-backlight.c: (gpm_backlight_brightness_evaluate_and_set),
(conf_key_changed_cb):
* src/gpm-conf.h:
Fix the name and description of the gconf key:
/apps/gnome-power-manager/backlight/brightness_dim_battery
Fixes #483144


Modified:
   trunk/ChangeLog
   trunk/data/gnome-power-manager.schemas.in
   trunk/src/gpm-backlight.c
   trunk/src/gpm-conf.h

Modified: trunk/data/gnome-power-manager.schemas.in
==============================================================================
--- trunk/data/gnome-power-manager.schemas.in	(original)
+++ trunk/data/gnome-power-manager.schemas.in	Mon Jun 30 10:22:59 2008
@@ -14,18 +14,6 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-power-manager/ambient/v4l_device</key>
-      <applyto>/apps/gnome-power-manager/ambient/v4l_device</applyto>
-      <owner>gnome-power-manager</owner>
-      <type>string</type>
-      <default>default</default>
-      <locale name="C">
-        <short>The device name for the v4l device used as a brightness sensor backup</short>
-        <long>The device name for the v4l device used as a brightness sensor backup. A value of 'default' uses the first discovered sensor, or devices can be specified, e.g. '/dev/video0'</long>
-      </locale>
-    </schema>
-
-    <schema>
       <key>/schemas/apps/gnome-power-manager/ambient/poll_timeout</key>
       <applyto>/apps/gnome-power-manager/ambient/poll_timeout</applyto>
       <owner>gnome-power-manager</owner>
@@ -201,13 +189,13 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/gnome-power-manager/backlight/brightness_battery</key>
-      <applyto>/apps/gnome-power-manager/backlight/brightness_battery</applyto>
+      <key>/schemas/apps/gnome-power-manager/backlight/brightness_dim_battery</key>
+      <applyto>/apps/gnome-power-manager/backlight/brightness_dim_battery</applyto>
       <type>int</type>
       <default>50</default>
       <locale name="C">
-        <short>LCD brightness when on battery</short>
-        <long>The brightness of the display when on battery power. Possible values are between 0 and 100.</long>
+        <short>LCD dimming amount when on battery</short>
+        <long>The amount to dim the brightness of the display when on battery power. Possible values are between 0 and 100.</long>
       </locale>
     </schema>
 

Modified: trunk/src/gpm-backlight.c
==============================================================================
--- trunk/src/gpm-backlight.c	(original)
+++ trunk/src/gpm-backlight.c	Mon Jun 30 10:22:59 2008
@@ -384,7 +384,7 @@
 	/* reduce if on battery power if we should */
 	gpm_conf_get_bool (backlight->priv->conf, GPM_CONF_BACKLIGHT_BATTERY_REDUCE, &battery_reduce);
 	if (on_ac == FALSE && battery_reduce == TRUE) {
-		gpm_conf_get_uint (backlight->priv->conf, GPM_CONF_BACKLIGHT_BRIGHTNESS_BATT, &value);
+		gpm_conf_get_uint (backlight->priv->conf, GPM_CONF_BACKLIGHT_BRIGHTNESS_DIM_BATT, &value);
 		if (value > 100) {
 			gpm_warning ("cannot use battery brightness value %i, correcting to 50", value);
 			value = 50;
@@ -476,7 +476,7 @@
 				   &backlight->priv->master_percentage);
 		gpm_backlight_brightness_evaluate_and_set (backlight, FALSE);
 
-	} else if (!on_ac && strcmp (key, GPM_CONF_BACKLIGHT_BRIGHTNESS_BATT) == 0) {
+	} else if (!on_ac && strcmp (key, GPM_CONF_BACKLIGHT_BRIGHTNESS_DIM_BATT) == 0) {
 		gpm_backlight_brightness_evaluate_and_set (backlight, FALSE);
 	}
 

Modified: trunk/src/gpm-conf.h
==============================================================================
--- trunk/src/gpm-conf.h	(original)
+++ trunk/src/gpm-conf.h	Mon Jun 30 10:22:59 2008
@@ -43,7 +43,6 @@
 #define GPM_CONF_AMBIENT_POLL			GPM_CONF_DIR "/ambient/poll_timeout"
 #define GPM_CONF_AMBIENT_FACTOR			GPM_CONF_DIR "/ambient/correction_factor"
 #define GPM_CONF_AMBIENT_SCALE			GPM_CONF_DIR "/ambient/correction_scale"
-#define GPM_CONF_AMBIENT_V4L_DEVICE		GPM_CONF_DIR "/ambient/v4l_device"
 #define GPM_CONF_AMBIENT_DIM_POLICY		GPM_CONF_DIR "/ambient/dim_policy"
 
 /* actions */
@@ -64,7 +63,7 @@
 #define GPM_CONF_BACKLIGHT_IDLE_DIM_BATT	GPM_CONF_DIR "/backlight/idle_dim_battery"
 #define GPM_CONF_BACKLIGHT_IDLE_DIM_TIME	GPM_CONF_DIR "/backlight/idle_dim_time"
 #define GPM_CONF_BACKLIGHT_BRIGHTNESS_AC	GPM_CONF_DIR "/backlight/brightness_ac"
-#define GPM_CONF_BACKLIGHT_BRIGHTNESS_BATT	GPM_CONF_DIR "/backlight/brightness_battery"
+#define GPM_CONF_BACKLIGHT_BRIGHTNESS_DIM_BATT	GPM_CONF_DIR "/backlight/brightness_battery"
 
 /* buttons */
 #define GPM_CONF_BUTTON_LID_AC			GPM_CONF_DIR "/buttons/lid_ac"