[Goodies-commits] r7064 - in xfce4-power-manager/trunk: . src
Ali Abdallah
aliov at xfce.org
Tue Mar 31 08:48:39 CEST 2009
Author: aliov
Date: 2009-03-31 06:48:39 +0000 (Tue, 31 Mar 2009)
New Revision: 7064
Modified:
xfce4-power-manager/trunk/ChangeLog
xfce4-power-manager/trunk/src/xfpm-brightness-hal.c
xfce4-power-manager/trunk/src/xfpm-dpms.c
xfce4-power-manager/trunk/src/xfpm-idle.c
xfce4-power-manager/trunk/src/xfpm-idle.h
xfce4-power-manager/trunk/src/xfpm-xfconf.c
Log:
Bug:Brightness control wasn't getting disabled even if the user disabled it+fix dpms settings changed signal
Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog 2009-03-30 22:31:31 UTC (rev 7063)
+++ xfce4-power-manager/trunk/ChangeLog 2009-03-31 06:48:39 UTC (rev 7064)
@@ -1,4 +1,7 @@
+2009-03-31 8:48 Ali aliov at xfce.org
+ * : Bug:Brightness control wasn't getting disabled even if the user disabled it+fix dpms settings changed signal
+
2009-03-30 21:21 Ali aliov at xfce.org
* : Added brightness popup+fix in XSyncAlarm error iin idle function+Fix reacration of popup window in the brightness plugin
Modified: xfce4-power-manager/trunk/src/xfpm-brightness-hal.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-brightness-hal.c 2009-03-30 22:31:31 UTC (rev 7063)
+++ xfce4-power-manager/trunk/src/xfpm-brightness-hal.c 2009-03-31 06:48:39 UTC (rev 7064)
@@ -52,6 +52,8 @@
#define XFPM_BRIGHTNESS_HAL_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE((o), XFPM_TYPE_BRIGHTNESS_HAL, XfpmBrightnessHalPrivate))
+#define ALARM_DISABLED 9
+
struct XfpmBrightnessHalPrivate
{
DBusGProxy *proxy;
@@ -345,21 +347,31 @@
xfpm_brightness_get_user_timeouts (brg, &on_ac, &on_battery);
- if ( on_ac == 9 )
- on_ac = 0;
- if ( on_battery == 9 )
- on_battery = 0;
+ if ( on_ac == ALARM_DISABLED )
+ {
+ xfpm_idle_free_alarm (brg->priv->idle, TIMEOUT_ON_AC_ID );
+ }
+ else
+ {
+ xfpm_idle_set_alarm (brg->priv->idle, TIMEOUT_ON_AC_ID, on_ac * 1000);
+ }
- xfpm_idle_set_alarm (brg->priv->idle, TIMEOUT_ON_AC_ID, on_ac * 1000);
+ if ( on_battery == ALARM_DISABLED )
+ {
+ xfpm_idle_free_alarm (brg->priv->idle, TIMEOUT_ON_BATTERY_ID );
+ }
+ else
+ {
+ xfpm_idle_set_alarm (brg->priv->idle, TIMEOUT_ON_BATTERY_ID, on_battery * 1000);
+ }
- xfpm_idle_set_alarm (brg->priv->idle, TIMEOUT_ON_BATTERY_ID, on_battery * 1000);
-
xfpm_idle_alarm_reset_all (brg->priv->idle);
}
static void
xfpm_brightness_hal_settings_changed_cb (XfpmXfconf *conf, XfpmBrightnessHal *brg)
{
+ TRACE ("User settings changed");
xfpm_brightness_hal_set_timeouts (brg);
}
@@ -388,7 +400,7 @@
object_class->finalize = xfpm_brightness_hal_finalize;
- g_type_class_add_private(klass,sizeof(XfpmBrightnessHalPrivate));
+ g_type_class_add_private (klass, sizeof (XfpmBrightnessHalPrivate));
}
static void
Modified: xfce4-power-manager/trunk/src/xfpm-dpms.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dpms.c 2009-03-30 22:31:31 UTC (rev 7063)
+++ xfce4-power-manager/trunk/src/xfpm-dpms.c 2009-03-31 06:48:39 UTC (rev 7064)
@@ -194,6 +194,7 @@
static void
xfpm_dpms_settings_changed_cb (XfpmXfconf *conf, XfpmDpms *dpms)
{
+ TRACE ("User settings changed");
xfpm_dpms_refresh (dpms);
}
@@ -231,7 +232,7 @@
dpms->priv = XFPM_DPMS_GET_PRIVATE(dpms);
dpms->priv->dpms_capable = DPMSCapable (GDK_DISPLAY());
-
+
if ( dpms->priv->dpms_capable )
{
dpms->priv->adapter = xfpm_adapter_new ();
@@ -247,6 +248,10 @@
g_signal_connect (dpms->priv->conf, "dpms-settings-changed",
G_CALLBACK (xfpm_dpms_settings_changed_cb), dpms);
}
+ else
+ {
+ g_warning ("Monitor is not DPMS capable");
+ }
}
static void
Modified: xfce4-power-manager/trunk/src/xfpm-idle.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-idle.c 2009-03-30 22:31:31 UTC (rev 7063)
+++ xfce4-power-manager/trunk/src/xfpm-idle.c 2009-03-31 06:48:39 UTC (rev 7064)
@@ -278,7 +278,7 @@
}
static void
-xfpm_idle_free_alarm (XfpmIdle *idle, IdleAlarm *alarm)
+xfpm_idle_free_alarm_internal (XfpmIdle *idle, IdleAlarm *alarm)
{
gdk_error_trap_push ();
XSyncDestroyAlarm (GDK_DISPLAY(), alarm->xalarm);
@@ -300,7 +300,7 @@
for ( i = 0; i<idle->priv->array->len; i++)
{
alarm = g_ptr_array_index (idle->priv->array, i);
- xfpm_idle_free_alarm (idle, alarm);
+ xfpm_idle_free_alarm_internal (idle, alarm);
}
g_ptr_array_free (idle->priv->array, TRUE);
@@ -342,3 +342,22 @@
return TRUE;
}
+gboolean xfpm_idle_free_alarm (XfpmIdle *idle, guint id)
+{
+ IdleAlarm *alarm;
+
+ g_return_val_if_fail (XFPM_IS_IDLE (idle), FALSE);
+
+ if ( id == 0 )
+ return FALSE;
+
+ alarm = xfpm_idle_find_alarm (idle, id);
+
+ if ( alarm )
+ {
+ xfpm_idle_free_alarm_internal (idle, alarm);
+ return TRUE;
+ }
+
+ return FALSE;
+}
Modified: xfce4-power-manager/trunk/src/xfpm-idle.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-idle.h 2009-03-30 22:31:31 UTC (rev 7063)
+++ xfce4-power-manager/trunk/src/xfpm-idle.h 2009-03-31 06:48:39 UTC (rev 7064)
@@ -57,6 +57,9 @@
guint timeout);
void xfpm_idle_alarm_reset_all (XfpmIdle *idle);
+
+gboolean xfpm_idle_free_alarm (XfpmIdle *idle,
+ guint id);
G_END_DECLS
#endif /* __XFPM_IDLE_H */
Modified: xfce4-power-manager/trunk/src/xfpm-xfconf.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-xfconf.c 2009-03-30 22:31:31 UTC (rev 7063)
+++ xfce4-power-manager/trunk/src/xfpm-xfconf.c 2009-03-31 06:48:39 UTC (rev 7064)
@@ -408,7 +408,7 @@
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0, G_TYPE_NONE);
- signals[DPMS_SETTINGS_CHANGED] =
+ signals[POWER_SAVE_SETTINGS_CHANGED] =
g_signal_new("power-save-settings-changed",
XFPM_TYPE_XFCONF,
G_SIGNAL_RUN_LAST,
More information about the Goodies-commits
mailing list