[Goodies-commits] r5604 - xfce4-power-manager/trunk/src
Ali Abdallah
aliov at xfce.org
Mon Oct 13 17:00:19 CEST 2008
Author: aliov
Date: 2008-10-13 15:00:19 +0000 (Mon, 13 Oct 2008)
New Revision: 5604
Modified:
xfce4-power-manager/trunk/src/xfpm-ac-adapter.c
xfce4-power-manager/trunk/src/xfpm-battery.c
xfce4-power-manager/trunk/src/xfpm-button.c
xfce4-power-manager/trunk/src/xfpm-hal.c
Log:
defensive programming against faulty status of HAL
Modified: xfce4-power-manager/trunk/src/xfpm-ac-adapter.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-ac-adapter.c 2008-10-13 14:32:25 UTC (rev 5603)
+++ xfce4-power-manager/trunk/src/xfpm-ac-adapter.c 2008-10-13 15:00:19 UTC (rev 5604)
@@ -520,12 +520,14 @@
if ( factor == SYSTEM_LAPTOP )
{
- xfpm_hal_connect_to_signals(priv->hal,TRUE,TRUE,TRUE,FALSE);
- g_signal_connect(priv->hal,"xfpm-device-added",
- G_CALLBACK(xfpm_ac_adapter_device_added_cb),adapter);
- g_signal_connect(priv->hal,"xfpm-device-removed",
- G_CALLBACK(xfpm_ac_adapter_device_removed_cb),adapter);
- g_signal_connect(priv->hal,"xfpm-device-property-changed",
- G_CALLBACK(xfpm_ac_adapter_property_changed_cb),adapter);
+ if (xfpm_hal_connect_to_signals(priv->hal,TRUE,TRUE,TRUE,FALSE) )
+ {
+ g_signal_connect(priv->hal,"xfpm-device-added",
+ G_CALLBACK(xfpm_ac_adapter_device_added_cb),adapter);
+ g_signal_connect(priv->hal,"xfpm-device-removed",
+ G_CALLBACK(xfpm_ac_adapter_device_removed_cb),adapter);
+ g_signal_connect(priv->hal,"xfpm-device-property-changed",
+ G_CALLBACK(xfpm_ac_adapter_property_changed_cb),adapter);
+ }
}
}
Modified: xfce4-power-manager/trunk/src/xfpm-battery.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-battery.c 2008-10-13 14:32:25 UTC (rev 5603)
+++ xfce4-power-manager/trunk/src/xfpm-battery.c 2008-10-13 15:00:19 UTC (rev 5604)
@@ -251,22 +251,24 @@
g_error_free(error);
}
- xfpm_hal_connect_to_signals(priv->hal,TRUE,TRUE,TRUE,FALSE);
+ if (xfpm_hal_connect_to_signals(priv->hal,TRUE,TRUE,TRUE,FALSE) )
+ {
+ g_signal_connect(G_OBJECT(priv->hal),"xfpm-device-added",
+ G_CALLBACK(xfpm_battery_handle_device_added),
+ battery);
+
+ g_signal_connect(G_OBJECT(priv->hal),"xfpm-device-removed",
+ G_CALLBACK(xfpm_battery_handle_device_removed),
+ battery);
+
+ g_signal_connect(G_OBJECT(priv->hal),"xfpm-device-property-changed",
+ G_CALLBACK(xfpm_battery_handle_device_property_changed),
+ battery);
+
+ }
- g_signal_connect(G_OBJECT(priv->hal),"xfpm-device-added",
- G_CALLBACK(xfpm_battery_handle_device_added),
- battery);
-
- g_signal_connect(G_OBJECT(priv->hal),"xfpm-device-removed",
- G_CALLBACK(xfpm_battery_handle_device_removed),
- battery);
-
- g_signal_connect(G_OBJECT(priv->hal),"xfpm-device-property-changed",
- G_CALLBACK(xfpm_battery_handle_device_property_changed),
- battery);
-
g_signal_connect(G_OBJECT(battery),"notify",
- G_CALLBACK(xfpm_battery_notify_cb),NULL);
+ G_CALLBACK(xfpm_battery_notify_cb),NULL);
}
static void xfpm_battery_set_property(GObject *object,
Modified: xfce4-power-manager/trunk/src/xfpm-button.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-button.c 2008-10-13 14:32:25 UTC (rev 5603)
+++ xfce4-power-manager/trunk/src/xfpm-button.c 2008-10-13 15:00:19 UTC (rev 5604)
@@ -175,11 +175,12 @@
xfpm_button_load_config(bt);
xfpm_button_get_switches(bt);
- xfpm_hal_connect_to_signals(priv->hal,FALSE,FALSE,FALSE,TRUE);
-
- priv->handler_id =
- g_signal_connect(priv->hal,"xfpm-device-condition",
- G_CALLBACK(xfpm_button_handle_device_condition_cb),bt);
+ if (xfpm_hal_connect_to_signals(priv->hal,FALSE,FALSE,FALSE,TRUE) )
+ {
+ priv->handler_id =
+ g_signal_connect(priv->hal,"xfpm-device-condition",
+ G_CALLBACK(xfpm_button_handle_device_condition_cb),bt);
+ }
}
static void xfpm_button_set_property (GObject *object,
Modified: xfce4-power-manager/trunk/src/xfpm-hal.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-hal.c 2008-10-13 14:32:25 UTC (rev 5603)
+++ xfce4-power-manager/trunk/src/xfpm-hal.c 2008-10-13 15:00:19 UTC (rev 5604)
@@ -312,9 +312,11 @@
{
g_return_val_if_fail(XFPM_IS_HAL(hal),FALSE);
XfpmHalPrivate *priv;
- DBusError error;
priv = XFPM_HAL_GET_PRIVATE(hal);
+ g_return_val_if_fail(priv->connected == TRUE,FALSE);
+
+ DBusError error;
dbus_error_init(&error);
if (device_added )
@@ -354,6 +356,8 @@
g_return_val_if_fail(XFPM_IS_HAL(xfpm_hal),NULL);
XfpmHalPrivate *priv = XFPM_HAL_GET_PRIVATE(xfpm_hal);
+ g_return_val_if_fail(priv->connected == TRUE,NULL);
+
gchar **udi_info = NULL;
DBusError error;
@@ -379,6 +383,8 @@
g_return_val_if_fail(XFPM_IS_HAL(xfpm_hal),-1);
XfpmHalPrivate *priv = XFPM_HAL_GET_PRIVATE(xfpm_hal);
+ g_return_val_if_fail(priv->connected == TRUE,-1);
+
DBusError error;
gint ret;
@@ -408,6 +414,8 @@
g_return_val_if_fail(XFPM_IS_HAL(xfpm_hal),NULL);
XfpmHalPrivate *priv = XFPM_HAL_GET_PRIVATE(xfpm_hal);
+ g_return_val_if_fail(priv->connected == TRUE,NULL);
+
DBusError error;
gchar *ret;
@@ -437,6 +445,8 @@
g_return_val_if_fail(XFPM_IS_HAL(xfpm_hal),FALSE);
XfpmHalPrivate *priv = XFPM_HAL_GET_PRIVATE(xfpm_hal);
+ g_return_val_if_fail(priv->connected == TRUE,FALSE);
+
DBusError error;
gboolean ret;
@@ -466,6 +476,9 @@
g_return_val_if_fail(XFPM_IS_HAL(xfpm_hal),FALSE);
XfpmHalPrivate *priv;
priv = XFPM_HAL_GET_PRIVATE(xfpm_hal);
+
+ g_return_val_if_fail(priv->connected == TRUE,FALSE);
+
DBusError error;
dbus_error_init(&error);
@@ -492,6 +505,9 @@
g_return_val_if_fail(XFPM_IS_HAL(xfpm_hal),FALSE);
XfpmHalPrivate *priv;
priv = XFPM_HAL_GET_PRIVATE(xfpm_hal);
+
+ g_return_val_if_fail(priv->connected == TRUE,FALSE);
+
DBusError error;
dbus_error_init(&error);
@@ -512,9 +528,13 @@
gboolean xfpm_hal_shutdown(XfpmHal *xfpm_hal)
{
+ g_return_val_if_fail(XFPM_IS_HAL(xfpm_hal),FALSE);
+
XfpmHalPrivate *priv;
priv = XFPM_HAL_GET_PRIVATE(xfpm_hal);
+ g_return_val_if_fail(priv->connected == TRUE,FALSE);
+
DBusMessage *mess;
mess = xfpm_dbus_new_message(HAL_DBUS_SERVICE,
@@ -538,9 +558,13 @@
gboolean
xfpm_hal_hibernate(XfpmHal *xfpm_hal,GError **gerror,guint8 *critical)
{
+ g_return_val_if_fail(XFPM_IS_HAL(xfpm_hal),FALSE);
+
XfpmHalPrivate *priv;
priv = XFPM_HAL_GET_PRIVATE(xfpm_hal);
+ g_return_val_if_fail(priv->connected == TRUE,FALSE);
+
DBusMessage *mess,*reply;
DBusError error;
gint exit_code;
@@ -616,9 +640,13 @@
gboolean
xfpm_hal_suspend(XfpmHal *xfpm_hal,GError **gerror,guint8 *critical)
{
+ g_return_val_if_fail(XFPM_IS_HAL(xfpm_hal),FALSE);
+
XfpmHalPrivate *priv;
priv = XFPM_HAL_GET_PRIVATE(xfpm_hal);
+ g_return_val_if_fail(priv->connected == TRUE,FALSE);
+
DBusMessage *mess,*reply;
DBusError error;
int seconds= 2;
@@ -706,6 +734,8 @@
XfpmHalPrivate *priv;
priv = XFPM_HAL_GET_PRIVATE(xfpm_hal);
+ g_return_if_fail(priv->connected == TRUE);
+
DBusMessage *mess,*reply;
DBusError error;
@@ -752,6 +782,8 @@
XfpmHalPrivate *priv;
priv = XFPM_HAL_GET_PRIVATE(xfpm_hal);
+ g_return_val_if_fail(priv->connected == TRUE,-1);
+
DBusMessage *mess,*reply;
DBusError error;
gint32 brightness_level;
@@ -793,9 +825,13 @@
gchar
**xfpm_hal_get_available_cpu_governors(XfpmHal *xfpm_hal,GError **gerror)
{
+ g_return_val_if_fail(XFPM_IS_HAL(xfpm_hal),NULL);
+
XfpmHalPrivate *priv;
priv = XFPM_HAL_GET_PRIVATE(xfpm_hal);
+ g_return_val_if_fail(priv->connected == TRUE,NULL);
+
DBusMessage *mess;
DBusMessage *reply;
DBusError error;
@@ -841,9 +877,13 @@
gchar
*xfpm_hal_get_current_cpu_governor(XfpmHal *xfpm_hal,GError **gerror)
{
+ g_return_val_if_fail(XFPM_IS_HAL(xfpm_hal),NULL);
+
XfpmHalPrivate *priv;
priv = XFPM_HAL_GET_PRIVATE(xfpm_hal);
+ g_return_val_if_fail(priv->connected == TRUE,NULL);
+
DBusMessage *mess;
DBusMessage *reply;
DBusError error;
@@ -890,9 +930,13 @@
const gchar *governor,
GError **gerror)
{
+ g_return_if_fail(XFPM_IS_HAL(xfpm_hal));
+
XfpmHalPrivate *priv;
priv = XFPM_HAL_GET_PRIVATE(xfpm_hal);
+ g_return_if_fail(priv->connected == TRUE);
+
XFPM_DEBUG("Setting CPU gov %s\n",governor);
DBusMessage *mess;
@@ -932,6 +976,8 @@
XfpmHalPrivate *priv;
priv = XFPM_HAL_GET_PRIVATE(xfpm_hal);
+ g_return_if_fail(priv->connected == TRUE);
+
DBusMessage *mess;
DBusMessage *reply;
DBusError error;
More information about the Goodies-commits
mailing list