Merge lp:~3v1n0/bamf/dispose-fixes into lp:bamf/0.4

[Marco Trevisan (Treviño)]

Making libbamf correctly free items when disposing BamfView and BamfControl, plus some misc cleanups

[Jason Smith (jassmith)]

+1 all sensible refactors

refactoring does not require testing as this makes no control logic changes

review: Approve

=== modified file 'lib/libbamf/bamf-application.c'
--- lib/libbamf/bamf-application.c	2012-02-08 15:59:27 +0000
+++ lib/libbamf/bamf-application.c	2012-02-27 18:39:37 +0000
@@ -259,22 +259,22 @@
 {
   BamfApplication *self;
   BamfApplicationPrivate *priv;
-  
+
   self = BAMF_APPLICATION (object);
   priv = self->priv;
-  
+
   if (priv->application_type)
     {
       g_free (priv->application_type);
       priv->application_type = NULL;
     }
-  
+
   if (priv->desktop_file)
     {
       g_free (priv->desktop_file);
       priv->desktop_file = NULL;
-    }  
-  
+    }
+
   if (priv->proxy)
     {
       dbus_g_proxy_disconnect_signal (priv->proxy,

=== modified file 'lib/libbamf/bamf-control.c'
--- lib/libbamf/bamf-control.c	2010-08-18 23:22:58 +0000
+++ lib/libbamf/bamf-control.c	2012-02-27 18:39:37 +0000
@@ -60,11 +60,27 @@
  */
 
 static void
+bamf_control_dispose (GObject *object)
+{
+  BamfControl *self = BAMF_CONTROL (object);
+
+  if (self->priv->proxy)
+    {
+      g_object_unref (self->priv->proxy);
+      self->priv->proxy = NULL;
+    }
+
+  if (G_OBJECT_CLASS (bamf_control_parent_class)->dispose)
+      G_OBJECT_CLASS (bamf_control_parent_class)->dispose (object);
+}
+
+static void
 bamf_control_class_init (BamfControlClass *klass)
 {
   GObjectClass *obj_class = G_OBJECT_CLASS (klass);
 
   g_type_class_add_private (obj_class, sizeof (BamfControlPrivate));
+  obj_class->dispose = bamf_control_dispose;
 }
 
 

=== modified file 'lib/libbamf/bamf-view.c'
--- lib/libbamf/bamf-view.c	2012-02-15 23:09:48 +0000
+++ lib/libbamf/bamf-view.c	2012-02-27 18:39:37 +0000
@@ -150,7 +150,7 @@
   BamfViewPrivate *priv;
 
   g_return_val_if_fail (BAMF_IS_VIEW (view), NULL);
-  
+
   if (BAMF_VIEW_GET_CLASS (view)->get_children)
     return BAMF_VIEW_GET_CLASS (view)->get_children (view);
 
@@ -181,7 +181,7 @@
 
   for (i = len-1; i >= 0; i--)
     {
-      BamfView *view = bamf_factory_view_for_path (bamf_factory_get_default (), children[i]);
+      view = bamf_factory_view_for_path (bamf_factory_get_default (), children[i]);
       results = g_list_prepend (results, g_object_ref (view));
     }
 
@@ -677,6 +677,18 @@
       priv->type = NULL;
     }
 
+  if (priv->local_icon)
+    {
+      g_free (priv->local_icon);
+      priv->local_icon = NULL;
+    }
+
+  if (priv->local_name)
+    {
+      g_free (priv->local_name);
+      priv->local_name = NULL;
+    }
+
   if (priv->cached_children)
     {
       g_list_free_full (priv->cached_children, g_object_unref);

=== modified file 'lib/libbamf/bamf-window.c'
--- lib/libbamf/bamf-window.c	2012-02-15 05:45:13 +0000
+++ lib/libbamf/bamf-window.c	2012-02-27 18:39:37 +0000
@@ -55,9 +55,6 @@
   guint32          pid;
   time_t           last_active;
   gint             monitor;
-  gchar           *application_id;
-  gchar           *unique_bus_name;
-  gchar           *dbus_menu_object_path;
   BamfWindowMaximizationType maximized;
 };
 
@@ -290,11 +287,6 @@
   g_return_val_if_fail (BAMF_IS_WINDOW (self), NULL);
   priv = self->priv;
 
-  if (priv->application_id)
-    {
-      return priv->application_id;
-    }
-
   if (!bamf_view_remote_ready (BAMF_VIEW (self)))
     return NULL;
 
@@ -408,24 +400,6 @@
       priv->proxy = NULL;
     }
 
-  if (priv->application_id)
-    {
-      g_free (priv->application_id);
-      priv->application_id = NULL;
-    }
-
-  if (priv->unique_bus_name)
-    {
-      g_free (priv->unique_bus_name);
-      priv->unique_bus_name = NULL;
-    }
-
-  if (priv->dbus_menu_object_path)
-    {
-      g_free (priv->dbus_menu_object_path);
-      priv->dbus_menu_object_path = NULL;
-    }
-
   if (G_OBJECT_CLASS (bamf_window_parent_class)->dispose)
     G_OBJECT_CLASS (bamf_window_parent_class)->dispose (object);
 }