Merge lp:~seb128/unity-control-center/dont-leak-dialog into lp:unity-control-center

[Sebastien Bacher]

Backport some leak fixes from upstream, those were leading to dialogs
not closing when they should (e.g when exiting the panel they belong to),
hitting a segfault when used then.

Backport some leak fixes from upstream, those were leading to dialogs
not closing when they should (e.g when exiting the panel they belong to),
hitting a segfault when used then.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:12752
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/71/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/72

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/71/rebuild

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'panels/info/cc-info-panel.c'
--- panels/info/cc-info-panel.c	2014-02-20 17:15:24 +0000
+++ panels/info/cc-info-panel.c	2014-03-14 14:53:11 +0000
@@ -96,6 +96,7 @@
 struct _CcInfoPanelPrivate
 {
   GtkBuilder    *builder;
+  GtkWidget     *extra_options_dialog;
   char          *gnome_version;
   char          *gnome_distributor;
   char          *gnome_date;
@@ -464,29 +465,11 @@
 {
   CcInfoPanelPrivate *priv = CC_INFO_PANEL (object)->priv;
 
-  if (priv->builder != NULL)
-    {
-      g_object_unref (priv->builder);
-      priv->builder = NULL;
-    }
-
-  if (priv->pk_proxy != NULL)
-    {
-      g_object_unref (priv->pk_proxy);
-      priv->pk_proxy = NULL;
-    }
-
-  if (priv->pk_transaction_proxy != NULL)
-    {
-      g_object_unref (priv->pk_transaction_proxy);
-      priv->pk_transaction_proxy = NULL;
-    }
-
-  if (priv->graphics_data != NULL)
-    {
-      graphics_data_free (priv->graphics_data);
-      priv->graphics_data = NULL;
-    }
+  g_clear_object (&priv->builder);
+  g_clear_object (&priv->pk_proxy);
+  g_clear_object (&priv->pk_transaction_proxy);
+  g_clear_pointer (&priv->graphics_data, graphics_data_free);
+  g_clear_pointer (&priv->extra_options_dialog, gtk_widget_destroy);
 
   G_OBJECT_CLASS (cc_info_panel_parent_class)->dispose (object);
 }
@@ -1209,7 +1192,7 @@
   GtkWidget *dialog;
   GtkWidget *combo_box;
 
-  dialog = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, "extra_options_dialog"));
+  dialog = self->priv->extra_options_dialog;
   combo_box = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, "media_other_type_combobox"));
   gtk_window_set_transient_for (GTK_WINDOW (dialog),
                                 GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (self))));
@@ -1715,8 +1698,7 @@
     }
   else if (g_strcmp0 (signal_name, "Destroy") == 0)
     {
-      g_object_unref (self->priv->pk_transaction_proxy);
-      self->priv->pk_transaction_proxy = NULL;
+      g_clear_object (&self->priv->pk_transaction_proxy);
     }
 }
 
@@ -1940,6 +1922,8 @@
       return;
     }
 
+  self->priv->extra_options_dialog = WID ("extra_options_dialog");
+
   self->priv->graphics_data = get_graphics_data ();
 
   widget = WID ("updates_button");
 
=== modified file 'panels/keyboard/keyboard-shortcuts.c'
--- panels/keyboard/keyboard-shortcuts.c	2013-11-29 06:28:37 +0000
+++ panels/keyboard/keyboard-shortcuts.c	2014-03-14 14:53:11 +0000
@@ -1893,5 +1893,7 @@
 
   g_clear_object (&binding_settings);
 
+  g_clear_pointer (&custom_shortcut_dialog, gtk_widget_destroy);
+
   cc_keyboard_option_clear_all ();
 }
 
=== modified file 'panels/user-accounts/um-account-dialog.c'
--- panels/user-accounts/um-account-dialog.c	2014-02-21 15:48:18 +0000
+++ panels/user-accounts/um-account-dialog.c	2014-03-14 14:53:11 +0000
@@ -1192,6 +1192,8 @@
                 self->realm_manager = NULL;
         }
 
+        g_clear_pointer (&self->join_dialog, gtk_widget_destroy);
+
         G_OBJECT_CLASS (um_account_dialog_parent_class)->dispose (obj);
 }