[maemo-commits] [maemo-commits] r12767 - in projects/haf/trunk/hildon-plugins-settings: . debian src

[From: subversion at stage.maemo.org]

Author: moimart
Date: 2007-07-18 15:21:03 +0300 (Wed, 18 Jul 2007)
New Revision: 12767

Modified:
   projects/haf/trunk/hildon-plugins-settings/ChangeLog
   projects/haf/trunk/hildon-plugins-settings/debian/changelog
   projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c
Log:
2007-07-18  Moises Martinez  <moises.martinez at nokia.com>

        * src/hildon-plugin-settings.c: (execute):
        - Free DBus stuff.
	* debian/changelog updated.
	* ChangeLog updated.



Modified: projects/haf/trunk/hildon-plugins-settings/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-07-17 13:36:47 UTC (rev 12766)
+++ projects/haf/trunk/hildon-plugins-settings/ChangeLog	2007-07-18 12:21:03 UTC (rev 12767)
@@ -1,3 +1,8 @@
+2007-07-18  Moises Martinez  <moises.martinez at nokia.com>
+
+	* src/hildon-plugin-settings.c: (execute):
+	- Free DBus stuff.
+
 2007-07-17  Moises Martinez  <moises.martinez at nokia.com>
 
 	* configure.ac: 0.0.5

Modified: projects/haf/trunk/hildon-plugins-settings/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/debian/changelog	2007-07-17 13:36:47 UTC (rev 12766)
+++ projects/haf/trunk/hildon-plugins-settings/debian/changelog	2007-07-18 12:21:03 UTC (rev 12767)
@@ -1,3 +1,10 @@
+hildon-plugins-settings (0.0.5-2) unstable; urgency=low
+
+  * src/hildon-plugin-settings.c: (execute):
+  - Free DBus stuff.
+
+ -- Moises Martinez <moises.martinez at nokia.com>  Wed, 18 Jul 2007 15:19:41 +0300
+
 hildon-plugins-settings (0.0.5-1) unstable; urgency=low
 
   * configure.ac:

Modified: projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c
===================================================================
--- projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c	2007-07-17 13:36:47 UTC (rev 12766)
+++ projects/haf/trunk/hildon-plugins-settings/src/hildon-plugin-settings.c	2007-07-18 12:21:03 UTC (rev 12767)
@@ -232,6 +232,7 @@
 {
   gint ret;
   DBusGConnection *conn = NULL;
+  DBusGProxy *proxy = NULL;
   GError *error = NULL;
   GtkTreeModel *sbtm = NULL;
 
@@ -293,39 +294,45 @@
 
   if (!error)
   {
-    DBusGProxy *proxy = dbus_g_proxy_new_for_name (conn,
-		    				   SB_STATUS_NAME,
-						   SB_STATUS_PATH,
-						   SB_STATUS_INTERFACE);
+    dbus_g_connection_ref (conn);
+	  
+    proxy = dbus_g_proxy_new_for_name (conn,
+    				       SB_STATUS_NAME,
+				       SB_STATUS_PATH,
+				       SB_STATUS_INTERFACE);
 
-    dbus_g_object_register_marshaller (g_cclosure_user_marshal_VOID__STRING_BOOLEAN,
-                                        G_TYPE_NONE,
-                                        G_TYPE_STRING,
-                                        G_TYPE_BOOLEAN,
-                                        G_TYPE_INVALID);
+    if (proxy)
+    {	    
 
-    dbus_g_proxy_add_signal (proxy,
-		    	     "UpdateStatus",
-			     G_TYPE_STRING,
-			     G_TYPE_BOOLEAN,
-			     G_TYPE_INVALID);
+      dbus_g_object_register_marshaller (g_cclosure_user_marshal_VOID__STRING_BOOLEAN,
+                                         G_TYPE_NONE,
+                                         G_TYPE_STRING,
+                                         G_TYPE_BOOLEAN,
+                                         G_TYPE_INVALID);
 
-    dbus_g_proxy_connect_signal (proxy,
-				 "UpdateStatus",
-				 G_CALLBACK (_sb_update_status),
-				 sbtm,
-				 NULL);
+      dbus_g_proxy_add_signal (proxy,
+  	  	    	       "UpdateStatus",
+			       G_TYPE_STRING,
+			       G_TYPE_BOOLEAN,
+			       G_TYPE_INVALID);
 
-    dbus_g_proxy_call (proxy,
-		       "RefreshItemsStatus",
-		       &error,
-		       G_TYPE_INVALID);
+      dbus_g_proxy_connect_signal (proxy,
+				   "UpdateStatus",
+				   G_CALLBACK (_sb_update_status),
+				   sbtm,
+				   NULL);
+
+      dbus_g_proxy_call (proxy,
+		         "RefreshItemsStatus",
+		         &error,
+		         G_TYPE_INVALID);
     
-    if (error)
-    {
-      g_warning ("Oops: %s", error->message);
-      g_error_free (error);
-    }		    
+      if (error)
+      {
+        g_warning ("Oops: %s", error->message);
+        g_error_free (error);
+      }		    
+    }
   }
   else
   {
@@ -343,6 +350,12 @@
   }
     
   gtk_widget_destroy (dialog);
+
+  if (proxy)
+    g_object_unref (G_OBJECT (proxy));
+  
+  if (conn)
+    dbus_g_connection_unref (conn);
     
   return OSSO_OK;  
 }