[Goodies-commits] r7903 - in xfce4-power-manager/trunk: . data/interfaces settings src
Ali Abdallah
aliov at xfce.org
Sun Aug 9 16:12:50 CEST 2009
Author: aliov
Date: 2009-08-09 14:12:50 +0000 (Sun, 09 Aug 2009)
New Revision: 7903
Modified:
xfce4-power-manager/trunk/ChangeLog
xfce4-power-manager/trunk/NEWS
xfce4-power-manager/trunk/configure.ac.in
xfce4-power-manager/trunk/data/interfaces/xfpm-settings.ui
xfce4-power-manager/trunk/settings/xfpm-settings.c
xfce4-power-manager/trunk/src/xfpm-config.h
xfce4-power-manager/trunk/src/xfpm-xfconf.c
Log:
* version 0.8.3.1
Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog 2009-08-09 13:19:52 UTC (rev 7902)
+++ xfce4-power-manager/trunk/ChangeLog 2009-08-09 14:12:50 UTC (rev 7903)
@@ -1,4 +1,7 @@
2009-08-09: aliov at xfce.org
+ * version 0.8.3.1
+
+2009-08-09: aliov at xfce.org
* Missing signal handler for power button settings (bug #5656).
* Regenerate documentation.
Modified: xfce4-power-manager/trunk/NEWS
===================================================================
--- xfce4-power-manager/trunk/NEWS 2009-08-09 13:19:52 UTC (rev 7902)
+++ xfce4-power-manager/trunk/NEWS 2009-08-09 14:12:50 UTC (rev 7903)
@@ -2,6 +2,8 @@
=======
- Missing signal handler for power button settings (bug #5656).
- Allow 5% as a minimum critical charge instead of 10%.
+- Change some property names, specially for buttons to avoid
+ problems with old 0.6 configuration.
0.8.3
=======
Modified: xfce4-power-manager/trunk/configure.ac.in
===================================================================
--- xfce4-power-manager/trunk/configure.ac.in 2009-08-09 13:19:52 UTC (rev 7902)
+++ xfce4-power-manager/trunk/configure.ac.in 2009-08-09 14:12:50 UTC (rev 7903)
@@ -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], [3])
-m4_define([xfpm_version_build], [r at REVISION@])
-m4_define([xfpm_version_tag],[svn])
+m4_define([xfpm_version_micro], [3.1])
+m4_define([xfpm_version_build], [])
+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/data/interfaces/xfpm-settings.ui
===================================================================
--- xfce4-power-manager/trunk/data/interfaces/xfpm-settings.ui 2009-08-09 13:19:52 UTC (rev 7902)
+++ xfce4-power-manager/trunk/data/interfaces/xfpm-settings.ui 2009-08-09 14:12:50 UTC (rev 7903)
@@ -53,7 +53,7 @@
<property name="step_increment">1</property>
</object>
<object class="GtkAdjustment" id="adjustment9">
- <property name="value">5</property>
+ <property name="value">10</property>
<property name="lower">5</property>
<property name="upper">20</property>
<property name="step_increment">1</property>
Modified: xfce4-power-manager/trunk/settings/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/settings/xfpm-settings.c 2009-08-09 13:19:52 UTC (rev 7902)
+++ xfce4-power-manager/trunk/settings/xfpm-settings.c 2009-08-09 14:12:50 UTC (rev 7903)
@@ -1346,12 +1346,12 @@
gtk_widget_set_tooltip_text (critical_level,
_("When all the power sources of the computer reach this charge level"));
- val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX CRITICAL_POWER_LEVEL, 5);
+ val = xfconf_channel_get_uint (channel, PROPERTIES_PREFIX CRITICAL_POWER_LEVEL, 10);
- if ( val > 20 )
+ if ( val > 20 || val < 5)
{
g_critical ("Value %d if out of range for property %s\n", val, CRITICAL_POWER_LEVEL);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON(critical_level), 5);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON(critical_level), 10);
}
else
gtk_spin_button_set_value (GTK_SPIN_BUTTON(critical_level), val);
Modified: xfce4-power-manager/trunk/src/xfpm-config.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-config.h 2009-08-09 13:19:52 UTC (rev 7902)
+++ xfce4-power-manager/trunk/src/xfpm-config.h 2009-08-09 14:12:50 UTC (rev 7903)
@@ -39,39 +39,40 @@
/*
* Backward compatibility with old version.
*/
-#define PROPERTIES_PREFIX "/xfce4-power-manager/"
+#define PROPERTIES_PREFIX "/xfce4-power-manager/"
#define POWER_SAVE_ON_BATTERY "power-save-on-battery"
-#define CPU_FREQ_CONTROL "enable-cpu-freq-control"
-#define LOCK_SCREEN_ON_SLEEP "lock-screen-suspend-hibernate"
+#define CPU_FREQ_CONTROL "enable-cpu-freq-control"
+#define LOCK_SCREEN_ON_SLEEP "lock-screen-suspend-hibernate"
#define DPMS_ENABLED_CFG "dpms-enabled"
-#define ON_AC_DPMS_SLEEP "dpms-on-ac-sleep"
+#define ON_AC_DPMS_SLEEP "dpms-on-ac-sleep"
#define ON_AC_DPMS_OFF "dpms-on-ac-off"
-#define ON_BATT_DPMS_SLEEP "dpms-on-battery-sleep"
-#define ON_BATT_DPMS_OFF "dpms-on-battery-off"
-#define DPMS_SLEEP_MODE "dpms-sleep-mode"
+#define ON_BATT_DPMS_SLEEP "dpms-on-battery-sleep"
+#define ON_BATT_DPMS_OFF "dpms-on-battery-off"
+#define DPMS_SLEEP_MODE "dpms-sleep-mode"
#define GENERAL_NOTIFICATION_CFG "general-notification"
-#define ON_AC_INACTIVITY_TIMEOUT "inactivity-on-ac"
-#define ON_BATTERY_INACTIVITY_TIMEOUT "inactivity-on-battery"
-#define INACTIVITY_SLEEP_MODE "inactivity-sleep-mode"
+#define ON_AC_INACTIVITY_TIMEOUT "inactivity-on-ac"
+#define ON_BATTERY_INACTIVITY_TIMEOUT "inactivity-on-battery"
+#define INACTIVITY_SLEEP_MODE "inactivity-sleep-mode"
-#define BRIGHTNESS_ON_AC "brightness-on-ac"
-#define BRIGHTNESS_ON_BATTERY "brightness-on-battery"
+#define BRIGHTNESS_ON_AC "brightness-on-ac"
+#define BRIGHTNESS_ON_BATTERY "brightness-on-battery"
-#define CRITICAL_POWER_LEVEL "critical-power-level"
-#define SHOW_BRIGHTNESS_POPUP "show-brightness-popup"
-#define ENABLE_BRIGHTNESS_CONTROL "change-brightness-on-key-events"
+#define CRITICAL_POWER_LEVEL "critical-power-level"
+#define SHOW_BRIGHTNESS_POPUP "show-brightness-popup"
+#define ENABLE_BRIGHTNESS_CONTROL "change-brightness-on-key-events"
#define SHOW_TRAY_ICON_CFG "show-tray-icon"
-#define CRITICAL_BATT_ACTION_CFG "critical-battery-action"
+#define CRITICAL_BATT_ACTION_CFG "critical-power-action"
-#define POWER_SWITCH_CFG "power-switch-action"
-#define HIBERNATE_SWITCH_CFG "hibernate-switch-action"
-#define SLEEP_SWITCH_CFG "sleep-switch-action"
+#define POWER_SWITCH_CFG "power-button-action"
+#define HIBERNATE_SWITCH_CFG "hibernate-button-action"
+#define SLEEP_SWITCH_CFG "sleep-button-action"
+
#define LID_SWITCH_ON_AC_CFG "lid-action-on-ac"
#define LID_SWITCH_ON_BATTERY_CFG "lid-action-on-battery"
Modified: xfce4-power-manager/trunk/src/xfpm-xfconf.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-xfconf.c 2009-08-09 13:19:52 UTC (rev 7902)
+++ xfce4-power-manager/trunk/src/xfpm-xfconf.c 2009-08-09 14:12:50 UTC (rev 7903)
@@ -175,7 +175,7 @@
if ( G_VALUE_TYPE(value) == G_TYPE_INVALID )
return;
- if ( !g_str_has_prefix (property, PROPERTIES_PREFIX) )
+ if ( !g_str_has_prefix (property, PROPERTIES_PREFIX) || strlen (property) <= strlen (PROPERTIES_PREFIX) )
return;
TRACE("Property modified: %s\n", property);
@@ -239,7 +239,7 @@
NULL, NULL,
5,
20,
- 5,
+ 10,
G_PARAM_READWRITE));
/**
More information about the Goodies-commits
mailing list