[Goodies-commits] r7097 - in xfce4-power-manager/trunk: . src
Ali Abdallah
aliov at xfce.org
Thu Apr 2 14:14:25 CEST 2009
Author: aliov
Date: 2009-04-02 12:14:25 +0000 (Thu, 02 Apr 2009)
New Revision: 7097
Modified:
xfce4-power-manager/trunk/ChangeLog
xfce4-power-manager/trunk/src/org.freedesktop.PowerManagement.xml
xfce4-power-manager/trunk/src/xfpm-engine.c
xfce4-power-manager/trunk/src/xfpm-engine.h
xfce4-power-manager/trunk/src/xfpm-xfconf.c
Log:
Added on battery DBus signal+Fix brightness settings on battery power
Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog 2009-04-02 11:45:31 UTC (rev 7096)
+++ xfce4-power-manager/trunk/ChangeLog 2009-04-02 12:14:25 UTC (rev 7097)
@@ -1,4 +1,7 @@
+2009-04-02 14:14 Ali aliov at xfce.org
+ * : Added on battery DBus signal+Fix brightness settings on battery power
+
2009-04-02 10:46 Ali aliov at xfce.org
* : Fix a Glade warnings
Modified: xfce4-power-manager/trunk/src/org.freedesktop.PowerManagement.xml
===================================================================
--- xfce4-power-manager/trunk/src/org.freedesktop.PowerManagement.xml 2009-04-02 11:45:31 UTC (rev 7096)
+++ xfce4-power-manager/trunk/src/org.freedesktop.PowerManagement.xml 2009-04-02 12:14:25 UTC (rev 7097)
@@ -29,5 +29,9 @@
<arg type="b" name="low_battery" direction="out"/>
</method>
+ <signal name="OnBatteryChanged">
+ <arg type="b" name="on_battery" direction="out"/>
+ </signal>
+
</interface>
</node>
Modified: xfce4-power-manager/trunk/src/xfpm-engine.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-engine.c 2009-04-02 11:45:31 UTC (rev 7096)
+++ xfce4-power-manager/trunk/src/xfpm-engine.c 2009-04-02 12:14:25 UTC (rev 7097)
@@ -90,6 +90,14 @@
gboolean has_lid;
};
+enum
+{
+ ON_BATTERY_CHANGED,
+ LAST_SIGNAL
+};
+
+static guint signals [LAST_SIGNAL] = { 0 };
+
G_DEFINE_TYPE (XfpmEngine, xfpm_engine, G_TYPE_OBJECT)
static gboolean xfpm_engine_do_suspend (XfpmEngine * engine)
@@ -320,6 +328,7 @@
XfpmEngine * engine)
{
engine->priv->on_battery = !present;
+ g_signal_emit (G_OBJECT (engine), signals [ON_BATTERY_CHANGED], 0, engine->priv->on_battery);
}
static void
@@ -334,6 +343,15 @@
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ signals [ON_BATTERY_CHANGED] =
+ g_signal_new("on-battery-changed",
+ XFPM_TYPE_ENGINE,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(XfpmEngineClass, on_battery_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__BOOLEAN,
+ G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+
object_class->finalize = xfpm_engine_finalize;
g_type_class_add_private (klass, sizeof (XfpmEnginePrivate));
Modified: xfce4-power-manager/trunk/src/xfpm-engine.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-engine.h 2009-04-02 11:45:31 UTC (rev 7096)
+++ xfce4-power-manager/trunk/src/xfpm-engine.h 2009-04-02 12:14:25 UTC (rev 7097)
@@ -40,20 +40,23 @@
typedef struct
{
- GObjectClass parent_class;
+ GObjectClass parent_class;
+ void (*on_battery_changed) (XfpmEngine *engine,
+ gboolean on_battery);
+
} XfpmEngineClass;
-GType xfpm_engine_get_type (void) G_GNUC_CONST;
-XfpmEngine *xfpm_engine_new (void);
+GType xfpm_engine_get_type (void) G_GNUC_CONST;
+XfpmEngine *xfpm_engine_new (void);
-void xfpm_engine_get_info (XfpmEngine *engine,
- gboolean *system_laptop,
- gboolean *user_privilege,
- gboolean *can_suspend,
- gboolean *can_hibernate,
- gboolean *has_lcd_brightness,
- gboolean *has_lid);
+void xfpm_engine_get_info (XfpmEngine *engine,
+ gboolean *system_laptop,
+ gboolean *user_privilege,
+ gboolean *can_suspend,
+ gboolean *can_hibernate,
+ gboolean *has_lcd_brightness,
+ gboolean *has_lid);
G_END_DECLS
#endif /* __XFPM_ENGINE_H */
Modified: xfce4-power-manager/trunk/src/xfpm-xfconf.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-xfconf.c 2009-04-02 11:45:31 UTC (rev 7096)
+++ xfce4-power-manager/trunk/src/xfpm-xfconf.c 2009-04-02 12:14:25 UTC (rev 7097)
@@ -225,7 +225,7 @@
g_warning ("Value %d for %s is out of range", conf->priv->brightness_on_battery_timeout, BRIGHTNESS_ON_BATTERY );
conf->priv->brightness_on_battery_timeout = 9;
}
- g_signal_emit (G_OBJECT(conf), signals[POWER_SAVE_SETTINGS_CHANGED], 0);
+ g_signal_emit (G_OBJECT(conf), signals[BRIGHTNESS_SETTINGS_CHANGED], 0);
}
else if ( xfpm_strequal (property, CRITICAL_BATT_ACTION_CFG) )
{
More information about the Goodies-commits
mailing list