[Goodies-commits] r6945 - in xfce4-power-manager/trunk: . src
Ali Abdallah
aliov at xfce.org
Wed Mar 18 23:15:52 CET 2009
Author: aliov
Date: 2009-03-18 22:15:51 +0000 (Wed, 18 Mar 2009)
New Revision: 6945
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-engine.c
xfce4-power-manager/trunk/src/xfpm-inhibit.c
xfce4-power-manager/trunk/src/xfpm-inhibit.h
Log:
Fix a bug in the inhibit interface signal
Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog 2009-03-18 21:18:15 UTC (rev 6944)
+++ xfce4-power-manager/trunk/ChangeLog 2009-03-18 22:15:51 UTC (rev 6945)
@@ -1,4 +1,7 @@
+2009-03-18 23:15 Ali aliov at xfce.org
+ * : Fix a bug in the inhibit interface signal
+
2009-03-18 22:18 Ali aliov at xfce.org
* : Load relevent settings depending on the form factor the power manager is running on
Modified: xfce4-power-manager/trunk/src/xfpm-brightness-hal.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-brightness-hal.c 2009-03-18 21:18:15 UTC (rev 6944)
+++ xfce4-power-manager/trunk/src/xfpm-brightness-hal.c 2009-03-18 22:15:51 UTC (rev 6945)
@@ -453,7 +453,7 @@
brg->priv->adapter = xfpm_adapter_new ();
brg->priv->inhibit = xfpm_inhibit_new ();
- g_signal_connect (brg->priv->inhibit, "inhibit-changed",
+ g_signal_connect (brg->priv->inhibit, "has-inhibit-changed",
G_CALLBACK(xfpm_brightness_hal_inhibit_changed_cb), brg);
brg->priv->on_battery = !xfpm_adapter_get_present (brg->priv->adapter);
Modified: xfce4-power-manager/trunk/src/xfpm-dpms.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dpms.c 2009-03-18 21:18:15 UTC (rev 6944)
+++ xfce4-power-manager/trunk/src/xfpm-dpms.c 2009-03-18 22:15:51 UTC (rev 6945)
@@ -315,7 +315,7 @@
dpms->priv->adapter = xfpm_adapter_new ();
dpms->priv->inhibit = xfpm_inhibit_new ();
- g_signal_connect (dpms->priv->inhibit, "inhibit-changed",
+ g_signal_connect (dpms->priv->inhibit, "has-inhibit-changed",
G_CALLBACK(xfpm_dpms_inhibit_changed_cb), dpms);
g_signal_connect (dpms->priv->adapter, "adapter-changed",
Modified: xfce4-power-manager/trunk/src/xfpm-engine.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-engine.c 2009-03-18 21:18:15 UTC (rev 6944)
+++ xfce4-power-manager/trunk/src/xfpm-engine.c 2009-03-18 22:15:51 UTC (rev 6945)
@@ -418,7 +418,7 @@
engine->priv->inhibit = xfpm_inhibit_new ();
engine->priv->inhibited = FALSE;
- g_signal_connect (engine->priv->inhibit, "inhibit-changed",
+ g_signal_connect (engine->priv->inhibit, "has-inhibit-changed",
G_CALLBACK(xfpm_engine_inhibit_changed_cb), engine);
engine->priv->conf = NULL;
@@ -568,6 +568,7 @@
static gboolean xfpm_engine_dbus_hibernate (XfpmEngine *engine,
GError **error)
{
+ TRACE("Hibernate message received");
gboolean caller_privilege, can_hibernate;
g_object_get (G_OBJECT(engine->priv->iface),
@@ -584,6 +585,7 @@
static gboolean xfpm_engine_dbus_suspend (XfpmEngine *engine,
GError **error)
{
+ TRACE("Suspend message received");
gboolean caller_privilege, can_suspend;
g_object_get (G_OBJECT(engine->priv->iface),
@@ -601,6 +603,7 @@
gboolean *OUT_can_hibernate,
GError **error)
{
+ TRACE("Can hibernate message received");
g_object_get (G_OBJECT(engine->priv->iface),
"can-hibernate", OUT_can_hibernate,
NULL);
@@ -612,6 +615,7 @@
gboolean *OUT_can_suspend,
GError **error)
{
+ TRACE("Can suspend message received");
g_object_get (G_OBJECT(engine->priv->iface),
"can-suspend", OUT_can_suspend,
NULL);
@@ -623,6 +627,7 @@
gboolean *OUT_on_battery,
GError **error)
{
+ TRACE("On battery message received");
*OUT_on_battery = engine->priv->on_battery;
return TRUE;
@@ -632,6 +637,7 @@
gboolean *OUT_low_battery,
GError **error)
{
+ TRACE("On low battery message received");
*OUT_low_battery = xfpm_supply_on_low_battery (engine->priv->supply);
return TRUE;
Modified: xfce4-power-manager/trunk/src/xfpm-inhibit.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-inhibit.c 2009-03-18 21:18:15 UTC (rev 6944)
+++ xfce4-power-manager/trunk/src/xfpm-inhibit.c 2009-03-18 22:15:51 UTC (rev 6945)
@@ -62,7 +62,7 @@
enum
{
- INHIBIT_CHANGED,
+ HAS_INHIBIT_CHANGED,
LAST_SIGNAL
};
@@ -76,7 +76,7 @@
xfpm_inhibit_screen_saver_inhibited_cb (XfpmScreenSaver *srv, gboolean is_inhibited, XfpmInhibit *inhibit)
{
inhibit->priv->inhibited = is_inhibited;
- g_signal_emit (G_OBJECT(inhibit), signals[INHIBIT_CHANGED], 0, is_inhibited);
+ g_signal_emit (G_OBJECT(inhibit), signals[HAS_INHIBIT_CHANGED], 0, is_inhibited);
}
static void
@@ -84,11 +84,11 @@
{
GObjectClass *object_class = G_OBJECT_CLASS(klass);
- signals[INHIBIT_CHANGED] =
- g_signal_new("inhibit-changed",
+ signals[HAS_INHIBIT_CHANGED] =
+ g_signal_new("has-inhibit-changed",
XFPM_TYPE_INHIBIT,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET(XfpmInhibitClass, inhibit_changed),
+ G_STRUCT_OFFSET(XfpmInhibitClass, has_inhibit_changed),
NULL, NULL,
g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
@@ -181,10 +181,10 @@
guint *OUT_cookie,
GError **error)
{
- TRACE("application name=%s reason=%s", IN_appname, IN_reason);
+ TRACE("Inhibit send application name=%s reason=%s", IN_appname, IN_reason);
inhibit->priv->inhibited = TRUE;
- g_signal_emit (G_OBJECT(inhibit), signals[INHIBIT_CHANGED], 0, inhibit->priv->inhibited);
+ g_signal_emit (G_OBJECT(inhibit), signals[HAS_INHIBIT_CHANGED], 0, inhibit->priv->inhibited);
*OUT_cookie = 1;//FIXME support cookies
@@ -195,8 +195,9 @@
guint IN_cookie,
GError **error)
{
+ TRACE("UnHibit message received");
inhibit->priv->inhibited = FALSE;
- g_signal_emit (G_OBJECT(inhibit), signals[INHIBIT_CHANGED], 0, inhibit->priv->inhibited);
+ g_signal_emit (G_OBJECT(inhibit), signals[HAS_INHIBIT_CHANGED], 0, inhibit->priv->inhibited);
return TRUE;
}
@@ -205,6 +206,6 @@
gboolean *OUT_has_inhibit,
GError **error)
{
-
+ TRACE("Has Inhibit message received");
return TRUE;
}
Modified: xfce4-power-manager/trunk/src/xfpm-inhibit.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-inhibit.h 2009-03-18 21:18:15 UTC (rev 6944)
+++ xfce4-power-manager/trunk/src/xfpm-inhibit.h 2009-03-18 22:15:51 UTC (rev 6945)
@@ -42,7 +42,7 @@
{
GObjectClass parent_class;
- void (*inhibit_changed) (XfpmInhibit *inhibit,
+ void (*has_inhibit_changed) (XfpmInhibit *inhibit,
gboolean is_inhibit);
} XfpmInhibitClass;
More information about the Goodies-commits
mailing list