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

[rhughes svn gnome org]

Author: rhughes
Date: Tue Mar 24 11:43:50 2009
New Revision: 3376
URL: http://svn.gnome.org/viewvc/gnome-power-manager?rev=3376&view=rev

Log:
2009-03-24  Richard Hughes  <richard hughsie com>

* configure.ac:
Bump for new trunk version.

* data/gnome-power-manager.schemas.in:
Reduce initial dim threshold to 10 seconds.

* src/gpm-brightness-xrandr.c: (gpm_brightness_xrandr_init):
* src/gpm-brightness.c: (gpm_brightness_set), (gpm_brightness_get),
(gpm_brightness_up), (gpm_brightness_down), (gpm_brightness_init):
Add some debugging to try to work out why XRANDR craps out on us
sometimes.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/data/gnome-power-manager.schemas.in
   trunk/src/gpm-brightness-xrandr.c
   trunk/src/gpm-brightness.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Mar 24 11:43:50 2009
@@ -1,6 +1,6 @@
 AC_PREREQ(2.60)
 
-AC_INIT(gnome-power-manager, 2.26.1)
+AC_INIT(gnome-power-manager, 2.27.1)
 AC_CONFIG_SRCDIR(src)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)

Modified: trunk/data/gnome-power-manager.schemas.in
==============================================================================
--- trunk/data/gnome-power-manager.schemas.in	(original)
+++ trunk/data/gnome-power-manager.schemas.in	Tue Mar 24 11:43:50 2009
@@ -181,7 +181,7 @@
       <applyto>/apps/gnome-power-manager/backlight/idle_dim_time</applyto>
       <owner>gnome-power-manager</owner>
       <type>int</type>
-      <default>30</default>
+      <default>10</default>
       <locale name="C">
         <short>The default amount of time to dim the screen after idle</short>
         <long>The default amount of time to dim the screen after idle.</long>

Modified: trunk/src/gpm-brightness-xrandr.c
==============================================================================
--- trunk/src/gpm-brightness-xrandr.c	(original)
+++ trunk/src/gpm-brightness-xrandr.c	Tue Mar 24 11:43:50 2009
@@ -684,8 +684,10 @@
 
 	/* can we do this */
 	brightness->priv->has_extension = gpm_brightness_xrandr_setup_display (brightness);
-	if (brightness->priv->has_extension == FALSE)
+	if (brightness->priv->has_extension == FALSE) {
+		egg_debug ("no XRANDR extension, so aborting init");
 		return;
+	}
 
 	screen = gdk_screen_get_default ();
 	window = gdk_screen_get_root_window (screen);

Modified: trunk/src/gpm-brightness.c
==============================================================================
--- trunk/src/gpm-brightness.c	(original)
+++ trunk/src/gpm-brightness.c	Tue Mar 24 11:43:50 2009
@@ -132,11 +132,14 @@
 		ret = gpm_brightness_xrandr_set (brightness->priv->xrandr, percentage, &hw_changed_local);
 		if (ret)
 			goto out;
+		egg_warning ("failed to set using xrandr, falling back to HAL");
 		brightness->priv->use_xrandr = FALSE;
 	}
 	if (brightness->priv->use_hal) {
 		ret = gpm_brightness_hal_set (brightness->priv->hal, percentage, &hw_changed_local);
-		goto out;
+		if (ret)
+			goto out;
+		egg_warning ("failed to set using HAL");
 	}
 	egg_debug ("no hardware support");
 	return FALSE;
@@ -182,11 +185,14 @@
 		ret = gpm_brightness_xrandr_get (brightness->priv->xrandr, &percentage_local);
 		if (ret)
 			goto out;
+		egg_warning ("failed to set using xrandr, falling back to HAL");
 		brightness->priv->use_xrandr = FALSE;
 	}
 	if (brightness->priv->use_hal) {
 		ret = gpm_brightness_hal_get (brightness->priv->hal, &percentage_local);
-		goto out;
+		if (ret)
+			goto out;
+		egg_warning ("failed to set using HAL");
 	}
 	egg_debug ("no hardware support");
 	return FALSE;
@@ -227,11 +233,14 @@
 		ret = gpm_brightness_xrandr_up (brightness->priv->xrandr, &hw_changed_local);
 		if (ret)
 			goto out;
+		egg_warning ("failed to set using xrandr, falling back to HAL");
 		brightness->priv->use_xrandr = FALSE;
 	}
 	if (brightness->priv->use_hal) {
 		ret = gpm_brightness_hal_up (brightness->priv->hal, &hw_changed_local);
-		goto out;
+		if (ret)
+			goto out;
+		egg_warning ("failed to set using HAL");
 	}
 	egg_debug ("no hardware support");
 	return FALSE;
@@ -266,11 +275,14 @@
 		ret = gpm_brightness_xrandr_down (brightness->priv->xrandr, &hw_changed_local);
 		if (ret)
 			goto out;
+		egg_warning ("failed to set using xrandr, falling back to HAL");
 		brightness->priv->use_xrandr = FALSE;
 	}
 	if (brightness->priv->use_hal) {
 		ret = gpm_brightness_hal_down (brightness->priv->hal, &hw_changed_local);
-		goto out;
+		if (ret)
+			goto out;
+		egg_warning ("failed to set using HAL");
 	}
 	egg_debug ("no hardware support");
 	return FALSE;
@@ -396,11 +408,15 @@
 	brightness->priv->cache_percentage = 0;
 
 	brightness->priv->xrandr = gpm_brightness_xrandr_new ();
-	if (gpm_brightness_xrandr_has_hw (brightness->priv->xrandr))
+	if (gpm_brightness_xrandr_has_hw (brightness->priv->xrandr)) {
+		egg_debug ("detected XRANDR hardware");
 		brightness->priv->use_xrandr = TRUE;
+	}
 	brightness->priv->hal = gpm_brightness_hal_new ();
-	if (gpm_brightness_hal_has_hw (brightness->priv->hal))
+	if (gpm_brightness_hal_has_hw (brightness->priv->hal)) {
+		egg_debug ("detected HAL hardware");
 		brightness->priv->use_hal = TRUE;
+	}
 	g_signal_connect (brightness->priv->hal, "brightness-changed",
 			  G_CALLBACK (gpm_brightness_hal_changed_cb), brightness);
 	g_signal_connect (brightness->priv->xrandr, "brightness-changed",