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

[Ali Abdallah]

Author: aliov
Date: 2009-04-08 15:45:08 +0000 (Wed, 08 Apr 2009)
New Revision: 7142

Modified:
   xfce4-power-manager/trunk/ChangeLog
   xfce4-power-manager/trunk/src/xfpm-brightness-hal.c
   xfce4-power-manager/trunk/src/xfpm-screen-saver.c
Log:
Fix some Glib warnings

Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog	2009-04-08 13:05:35 UTC (rev 7141)
+++ xfce4-power-manager/trunk/ChangeLog	2009-04-08 15:45:08 UTC (rev 7142)
@@ -1,4 +1,7 @@
 
+2009-04-08 17:45 Ali aliov at xfce.org 
+	 * : Fix some Glib warnings
+
 2009-04-08 13:45 Ali aliov at xfce.org 
 	 * : Properly unref the device object when battery is removed+fix shutdown callback
 

Modified: xfce4-power-manager/trunk/src/xfpm-brightness-hal.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-brightness-hal.c	2009-04-08 13:05:35 UTC (rev 7141)
+++ xfce4-power-manager/trunk/src/xfpm-brightness-hal.c	2009-04-08 15:45:08 UTC (rev 7142)
@@ -464,13 +464,17 @@
     
     if ( brg->priv->proxy )
 	g_object_unref (brg->priv->proxy);
-    
-    g_object_unref (brg->priv->conf);
+
+    if ( brg->priv->conf )
+	g_object_unref (brg->priv->conf);
 	
-    g_object_unref (brg->priv->adapter);
+    if ( brg->priv->adapter)
+	g_object_unref (brg->priv->adapter);
 	
-    g_object_unref (brg->priv->saver);
+    if ( brg->priv->saver )
+	g_object_unref (brg->priv->saver);
     
+    if ( brg->priv->idle )
     g_object_unref (brg->priv->idle);
 	
     G_OBJECT_CLASS(xfpm_brightness_hal_parent_class)->finalize(object);

Modified: xfce4-power-manager/trunk/src/xfpm-screen-saver.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-screen-saver.c	2009-04-08 13:05:35 UTC (rev 7141)
+++ xfce4-power-manager/trunk/src/xfpm-screen-saver.c	2009-04-08 15:45:08 UTC (rev 7142)
@@ -90,8 +90,6 @@
 {
     gchar *name;
     
-    g_return_if_fail (srv->priv->inhibitors != 0 );
-    
     name = xfpm_screen_saver_find_unique_name (srv, unique_name);
     
     if ( name )
@@ -134,22 +132,13 @@
     XfpmScreenSaver *srv = ( XfpmScreenSaver *)data;
     
     if ( dbus_message_is_method_call (message, "org.gnome.ScreenSaver", "Inhibit") )
-    {
 	xfpm_screen_saver_inhibit_message (srv, dbus_message_get_sender (message) );
-	
-    }
     else if ( dbus_message_is_method_call (message, "org.gnome.ScreenSaver", "UnInhibit") )
-    {
 	xfpm_screen_saver_uninhibit_message (srv, dbus_message_get_sender (message) );
-    }
     else if ( dbus_message_is_method_call (message, "org.freedesktop.ScreenSaver", "Inhibit") )
-    {
 	xfpm_screen_saver_inhibit_message (srv, dbus_message_get_sender (message) );
-    }
     else if ( dbus_message_is_method_call (message, "org.freedesktop.ScreenSaver", "UnInhibit") )
-    {
 	xfpm_screen_saver_uninhibit_message (srv, dbus_message_get_sender (message) );
-    }
     
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; /* Keep on as we just want to spy */
 }
@@ -192,7 +181,7 @@
     g_signal_connect (srv->priv->monitor, "connection-lost",
 		      G_CALLBACK (xfpm_screen_saver_connection_lost), srv);
 		      
-    srv->priv->array   = g_ptr_array_new ();
+    srv->priv->array   	  = g_ptr_array_new ();
     srv->priv->inhibitors = 0;
     
     if ( dbus_error_is_set (&error) )