[Goodies-commits] r7707 - in xfce4-power-manager/trunk: . src

Ali Abdallah aliov at xfce.org
Thu Jul 9 16:01:15 CEST 2009


Author: aliov
Date: 2009-07-09 14:01:15 +0000 (Thu, 09 Jul 2009)
New Revision: 7707

Modified:
   xfce4-power-manager/trunk/ChangeLog
   xfce4-power-manager/trunk/configure.ac.in
   xfce4-power-manager/trunk/src/xfpm-engine.c
   xfce4-power-manager/trunk/src/xfpm-xfconf.c
Log:
	* src/xfpm-xfconf.c fix a bug affecting 0.8.1.* for the properties prefix.
	* src/xfpm-engine.c Fix default idle timeout.
	* prepare 0.8.2.

Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog	2009-07-09 13:18:49 UTC (rev 7706)
+++ xfce4-power-manager/trunk/ChangeLog	2009-07-09 14:01:15 UTC (rev 7707)
@@ -1,4 +1,9 @@
 2009-07-09: Ali aliov at xfce.org
+	* src/xfpm-xfconf.c fix a bug affecting 0.8.1.* for the properties prefix.
+	* src/xfpm-engine.c Fix default idle timeout.
+	* prepare 0.8.2.
+
+2009-07-09: Ali aliov at xfce.org
 	* settings/xfpm-settings.c automatically switch inactivity sleep mode 
 	to hibernate if suspend is not supported.
 	* Allow 15 minutes as a minimum value for idle.

Modified: xfce4-power-manager/trunk/configure.ac.in
===================================================================
--- xfce4-power-manager/trunk/configure.ac.in	2009-07-09 13:18:49 UTC (rev 7706)
+++ xfce4-power-manager/trunk/configure.ac.in	2009-07-09 14:01:15 UTC (rev 7707)
@@ -1,9 +1,9 @@
 m4_define([intltool_minimum_version], [0.31])
 m4_define([xfpm_version_major],  [0])
 m4_define([xfpm_version_minor],  [8])
-m4_define([xfpm_version_micro],  [1.1])
+m4_define([xfpm_version_micro],  [2])
 m4_define([xfpm_version_build],  [])
-m4_define([xfpm_version_tag],[r at REVISION@])
+m4_define([xfpm_version_tag],[])
 m4_define([xfpm_version], [xfpm_version_major().xfpm_version_minor().xfpm_version_micro()ifelse(xfpm_version_tag(), [svn], [xfpm_version_tag().xfpm_version_build()], [xfpm_version_tag()])])
 
 AC_INIT([xfce4-power-manager], [xfpm_version], [http://bugzilla.xfce.org/])

Modified: xfce4-power-manager/trunk/src/xfpm-engine.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-engine.c	2009-07-09 13:18:49 UTC (rev 7706)
+++ xfce4-power-manager/trunk/src/xfpm-engine.c	2009-07-09 14:01:15 UTC (rev 7707)
@@ -280,7 +280,6 @@
 	g_object_get (G_OBJECT (engine->priv->conf),
 		      SLEEP_SWITCH_CFG, &req,
 		      NULL);
-	g_print ("req %d\n", req);
     }
     else if ( type == BUTTON_HIBERNATE )
     {
@@ -418,17 +417,17 @@
 		  NULL);
     
 #ifdef DEBUG
-    if ( on_ac == 30 )
+    if ( on_ac == 14 )
 	TRACE ("setting inactivity sleep timeout on ac to never");
     else
 	TRACE ("setting inactivity sleep timeout on ac to %d", on_ac);
-    if ( on_battery == 30 )
+    if ( on_battery == 14 )
 	TRACE ("setting inactivity sleep timeout on battery to never");
     else
 	TRACE ("setting inactivity sleep timeout on battery to %d", on_battery);
 #endif
     
-    if ( on_ac == 30 )
+    if ( on_ac == 14 )
     {
 	xfpm_idle_free_alarm (engine->priv->idle, TIMEOUT_INACTIVITY_ON_AC );
     }
@@ -437,7 +436,7 @@
 	xfpm_idle_set_alarm (engine->priv->idle, TIMEOUT_INACTIVITY_ON_AC, on_ac * 1000 * 60);
     }
     
-    if ( on_battery == 30 )
+    if ( on_battery == 14 )
     {
 	xfpm_idle_free_alarm (engine->priv->idle, TIMEOUT_INACTIVITY_ON_BATTERY );
     }

Modified: xfce4-power-manager/trunk/src/xfpm-xfconf.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-xfconf.c	2009-07-09 13:18:49 UTC (rev 7706)
+++ xfce4-power-manager/trunk/src/xfpm-xfconf.c	2009-07-09 14:01:15 UTC (rev 7707)
@@ -144,7 +144,7 @@
     for ( i = 0; i < nspecs; i++)
     {
 	gchar *prop_name;
-	prop_name = g_strdup_printf ("/%s", specs[i]->name);
+	prop_name = g_strdup_printf ("%s%s", PROPERTIES_PREFIX, specs[i]->name);
 	g_value_init (&value, specs[i]->value_type);
 	
 	if (channel_valid)




More information about the Goodies-commits mailing list