[Goodies-commits] r7139 - in xfce4-power-manager/trunk: . src

[Ali Abdallah]

Author: aliov
Date: 2009-04-08 11:45:19 +0000 (Wed, 08 Apr 2009)
New Revision: 7139

Modified:
   xfce4-power-manager/trunk/ChangeLog
   xfce4-power-manager/trunk/src/xfpm-battery.c
   xfce4-power-manager/trunk/src/xfpm-shutdown.c
Log:
Properly unref the device object when battery is removed+fix shutdown callback

Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog	2009-04-08 11:36:34 UTC (rev 7138)
+++ xfce4-power-manager/trunk/ChangeLog	2009-04-08 11:45:19 UTC (rev 7139)
@@ -1,4 +1,7 @@
 
+2009-04-08 13:45 Ali aliov at xfce.org 
+	 * : Properly unref the device object when battery is removed+fix shutdown callback
+
 2009-04-08  0:23 Ali aliov at xfce.org 
 	 * : Fix issue with battery ref count that was causing a crash when hald restarts
 

Modified: xfce4-power-manager/trunk/src/xfpm-battery.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-battery.c	2009-04-08 11:36:34 UTC (rev 7138)
+++ xfce4-power-manager/trunk/src/xfpm-battery.c	2009-04-08 11:45:19 UTC (rev 7139)
@@ -71,6 +71,7 @@
     
     gulong	     sig_1;
     gulong           sig_2;
+    gulong           sig_3;
 };
 
 enum
@@ -548,6 +549,9 @@
 	
     if ( g_signal_handler_is_connected (battery->priv->conf, battery->priv->sig_2 ) )
 	g_signal_handler_disconnect (G_OBJECT (battery->priv->conf), battery->priv->sig_2);
+	
+     if ( g_signal_handler_is_connected (battery->priv->device, battery->priv->sig_3 ) )
+	g_signal_handler_disconnect (G_OBJECT (battery->priv->device), battery->priv->sig_3);
 
     g_object_unref (battery->priv->icon);
     
@@ -580,8 +584,8 @@
     
     xfpm_battery_refresh (battery);
     
-    g_signal_connect (G_OBJECT(battery->priv->device), "battery-changed",
-		      G_CALLBACK(xfpm_battery_device_changed_cb), battery);
+    battery->priv->sig_3 = g_signal_connect (G_OBJECT(battery->priv->device), "battery-changed",
+					     G_CALLBACK(xfpm_battery_device_changed_cb), battery);
 		      
     battery->priv->sig_2 = g_signal_connect (G_OBJECT(battery->priv->conf), "tray-icon-settings-changed",
 					     G_CALLBACK(xfpm_battery_tray_icon_settings_changed), battery);

Modified: xfce4-power-manager/trunk/src/xfpm-shutdown.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-shutdown.c	2009-04-08 11:36:34 UTC (rev 7138)
+++ xfce4-power-manager/trunk/src/xfpm-shutdown.c	2009-04-08 11:45:19 UTC (rev 7139)
@@ -42,6 +42,8 @@
 #include "xfpm-shutdown.h"
 #include "xfpm-errors.h"
 
+#define DUPLICATE_SHUTDOWN_REQUEST 8.0f
+
 /* Init */
 static void xfpm_shutdown_class_init (XfpmShutdownClass *klass);
 static void xfpm_shutdown_init       (XfpmShutdown *shutdown);
@@ -372,6 +374,7 @@
     if ( G_UNLIKELY (shutdown->priv->connected == FALSE) )
     {
 	g_set_error (error, XFPM_ERROR, XFPM_ERROR_HAL_DISCONNECTED, _("HAL daemon is currently not connected"));
+	shutdown->priv->block_shutdown = FALSE;
 	return;
     }
     
@@ -389,6 +392,7 @@
     if ( G_UNLIKELY (shutdown->priv->connected == FALSE) )
     {
 	g_set_error (error, XFPM_ERROR, XFPM_ERROR_HAL_DISCONNECTED, _("HAL daemon is currently not connected"));
+	shutdown->priv->block_shutdown = FALSE;
 	return;
     }
 
@@ -417,6 +421,7 @@
     if ( G_UNLIKELY (shutdown->priv->connected == FALSE) )
     {
 	g_set_error (error, XFPM_ERROR, XFPM_ERROR_HAL_DISCONNECTED, _("HAL daemon is currently not connected"));
+	shutdown->priv->block_shutdown = FALSE;
 	return;
     }