[Goodies-commits] r6950 - in xfce4-power-manager/trunk: . settings src
Ali Abdallah
aliov at xfce.org
Thu Mar 19 16:22:08 CET 2009
Author: aliov
Date: 2009-03-19 15:22:08 +0000 (Thu, 19 Mar 2009)
New Revision: 6950
Added:
xfce4-power-manager/trunk/src/xfce4-power-manager.desktop.in
Modified:
xfce4-power-manager/trunk/ChangeLog
xfce4-power-manager/trunk/settings/xfpm-settings.c
xfce4-power-manager/trunk/src/Makefile.am
xfce4-power-manager/trunk/src/xfpm-battery.c
xfce4-power-manager/trunk/src/xfpm-brightness-hal.c
xfce4-power-manager/trunk/src/xfpm-engine.c
Log:
Change the default settings loaded+change the desktop.in name
Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog 2009-03-19 15:08:03 UTC (rev 6949)
+++ xfce4-power-manager/trunk/ChangeLog 2009-03-19 15:22:08 UTC (rev 6950)
@@ -1,4 +1,7 @@
+2009-03-19 16:22 Ali aliov at xfce.org
+ * : Change the default settings loaded+change the desktop.in name
+
2009-03-19 0:12 Ali aliov at xfce.org
* : Fix a bug regarding the network manager message sleep
Modified: xfce4-power-manager/trunk/settings/xfpm-settings.c
===================================================================
--- xfce4-power-manager/trunk/settings/xfpm-settings.c 2009-03-19 15:08:03 UTC (rev 6949)
+++ xfce4-power-manager/trunk/settings/xfpm-settings.c 2009-03-19 15:22:08 UTC (rev 6950)
@@ -705,7 +705,7 @@
gtk_list_store_append(list_store, &iter);
gtk_list_store_set (list_store, &iter, 0, _("When battery is charging or discharging"), 1, 2, -1);
- guint show_tray = xfconf_channel_get_uint (channel, SHOW_TRAY_ICON_CFG, 0);
+ guint show_tray = xfconf_channel_get_uint (channel, SHOW_TRAY_ICON_CFG, 1);
gtk_combo_box_set_active (GTK_COMBO_BOX(tray), show_tray);
g_signal_connect (tray, "changed",
G_CALLBACK(set_show_tray_icon_cb), channel);
@@ -1013,10 +1013,10 @@
dialog = glade_xml_get_widget (xml, "xfpm-settings-dialog");
- xfpm_settings_on_ac (channel, user_privilege, can_suspend, can_hibernate, has_lid, has_lcd_brightness);
+ xfpm_settings_on_ac (channel, user_privilege, can_suspend, can_hibernate, has_lcd_brightness, has_lid );
if ( system_laptop )
- xfpm_settings_on_battery (channel, user_privilege, can_suspend, can_hibernate, has_lid, has_lcd_brightness);
+ xfpm_settings_on_battery (channel, user_privilege, can_suspend, can_hibernate, has_lcd_brightness, has_lid);
xfpm_settings_tree_view (channel, system_laptop);
Modified: xfce4-power-manager/trunk/src/Makefile.am
===================================================================
--- xfce4-power-manager/trunk/src/Makefile.am 2009-03-19 15:08:03 UTC (rev 6949)
+++ xfce4-power-manager/trunk/src/Makefile.am 2009-03-19 15:22:08 UTC (rev 6950)
@@ -144,7 +144,7 @@
@INTLTOOL_DESKTOP_RULE@
autostartdir = $(sysconfdir)/xdg/autostart
-autostart_in_files = xfce-power-manager.desktop.in
+autostart_in_files = xfce4-power-manager.desktop.in
autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
@@ -154,5 +154,5 @@
DISTCLEANFILES = \
$(BUILT_SOURCES) \
- xfce-power-manager.desktop
+ xfce4-power-manager.desktop
Added: xfce4-power-manager/trunk/src/xfce4-power-manager.desktop.in
===================================================================
--- xfce4-power-manager/trunk/src/xfce4-power-manager.desktop.in (rev 0)
+++ xfce4-power-manager/trunk/src/xfce4-power-manager.desktop.in 2009-03-19 15:22:08 UTC (rev 6950)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+_Name=Xfce Power Manager
+_Comment=Power management for the Xfce desktop
+Icon=gpm-ac-adapter
+Exec=xfce4-power-manager
+Terminal=false
+Type=Application
+OnlyShowIn=XFCE;
+StartupNotify=false
\ No newline at end of file
Modified: xfce4-power-manager/trunk/src/xfpm-battery.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-battery.c 2009-03-19 15:08:03 UTC (rev 6949)
+++ xfce4-power-manager/trunk/src/xfpm-battery.c 2009-03-19 15:22:08 UTC (rev 6950)
@@ -102,7 +102,7 @@
static void
xfpm_battery_refresh_visible_icon (XfpmBattery *battery)
{
- gboolean visible = FALSE;
+ gboolean visible = TRUE;
if ( battery->priv->show_icon == SHOW_ICON_ALWAYS )
visible = TRUE;
@@ -119,7 +119,7 @@
else visible = TRUE;
}
- xfpm_tray_icon_set_visible (battery->priv->icon, TRUE);
+ xfpm_tray_icon_set_visible (battery->priv->icon, visible);
}
static void
@@ -373,6 +373,7 @@
is_charging, is_discharging,
last_full, current_charge,
percentage, time);
+ xfpm_battery_refresh_visible_icon (battery);
}
static void
@@ -380,7 +381,6 @@
{
TRACE("start");
xfpm_battery_refresh (battery);
- xfpm_battery_refresh_visible_icon (battery);
}
static gchar *
@@ -437,7 +437,7 @@
{
if ( G_VALUE_TYPE(value) == G_TYPE_INVALID )
return;
-
+
if ( xfpm_strequal (property, SHOW_TRAY_ICON_CFG) )
{
guint val = g_value_get_uint (value);
@@ -461,12 +461,11 @@
xfpm_battery_load_configuration (XfpmBattery *battery)
{
battery->priv->show_icon =
- xfconf_channel_get_uint (battery->priv->conf->channel, SHOW_TRAY_ICON_CFG, 0);
-
+ xfconf_channel_get_uint (battery->priv->conf->channel, SHOW_TRAY_ICON_CFG, SHOW_ICON_WHEN_BATTERY_PRESENT);
if ( battery->priv->show_icon < 0 || battery->priv->show_icon > 3 )
{
g_warning ("Invalid value %d for property %s, using default\n", battery->priv->show_icon, SHOW_TRAY_ICON_CFG);
- xfconf_channel_set_uint (battery->priv->conf->channel, CRITICAL_BATT_ACTION_CFG, 0);
+ xfconf_channel_set_uint (battery->priv->conf->channel, CRITICAL_BATT_ACTION_CFG, SHOW_ICON_WHEN_BATTERY_PRESENT);
}
battery->priv->critical_level =
@@ -517,7 +516,7 @@
battery->priv = XFPM_BATTERY_GET_PRIVATE(battery);
battery->priv->icon = xfpm_tray_icon_new ();
- battery->priv->show_icon = SHOW_ICON_ALWAYS;
+ battery->priv->show_icon = SHOW_ICON_WHEN_BATTERY_PRESENT;
battery->priv->adapter = xfpm_adapter_new ();
battery->priv->conf = xfpm_xfconf_new ();
Modified: xfce4-power-manager/trunk/src/xfpm-brightness-hal.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-brightness-hal.c 2009-03-19 15:08:03 UTC (rev 6949)
+++ xfce4-power-manager/trunk/src/xfpm-brightness-hal.c 2009-03-19 15:22:08 UTC (rev 6950)
@@ -477,6 +477,10 @@
xfpm_brightness_hal_set_timeouts (brg);
}
+ else
+ {
+ TRACE("No lcd brightness control found in the system");
+ }
return brg;
}
Modified: xfce4-power-manager/trunk/src/xfpm-engine.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-engine.c 2009-03-19 15:08:03 UTC (rev 6949)
+++ xfce4-power-manager/trunk/src/xfpm-engine.c 2009-03-19 15:22:08 UTC (rev 6950)
@@ -395,7 +395,7 @@
{
const gchar *str = g_value_get_string (value);
gint val = xfpm_shutdown_string_to_int (str);
- if ( val == -1 || val == 1 )
+ if ( val == -1 || val == 3 )
{
g_warning ("Invalid value %s for property %s, using default\n", str, SLEEP_SWITCH_CFG);
engine->priv->sleep_button = XFPM_DO_NOTHING;
More information about the Goodies-commits
mailing list