[gnome-control-center] network: Clean up all args when done handling them

[Bastien Nocera <hadess src gnome org>]

commit dc559e3a9953ccef8f01802031375a722164c458
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Sep 27 20:26:50 2012 +0200

    network: Clean up all args when done handling them

 panels/network/cc-network-panel.c |   14 +++++++-------
 panels/network/network-dialogs.c  |    2 ++
 2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
index 9fce704..e3ac4a0 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -195,9 +195,9 @@ cc_network_panel_dispose (GObject *object)
 static void
 cc_network_panel_finalize (GObject *object)
 {
-        CcNetworkPanelPrivate *priv = CC_NETWORK_PANEL (object)->priv;
-        g_free (priv->arg_device);
-        g_free (priv->arg_access_point);
+        CcNetworkPanel *panel = CC_NETWORK_PANEL (object);
+
+        reset_command_line_args (panel);
 
         G_OBJECT_CLASS (cc_network_panel_parent_class)->finalize (object);
 }
@@ -453,24 +453,24 @@ panel_add_device (CcNetworkPanel *panel, NMDevice *device)
                         else
                                 cc_network_panel_connect_to_hidden_network (panel, priv->client, priv->remote_settings);
 
-                        priv->arg_operation = OPERATION_NULL; /* done */
+                        reset_command_line_args (panel); /* done */
                         return TRUE;
                 } else if (g_strcmp0 (nm_object_get_path (NM_OBJECT (device)), priv->arg_device) == 0) {
                         if (priv->arg_operation == OPERATION_CONNECT_MOBILE) {
                                 cc_network_panel_connect_to_3g_network (panel, priv->client, priv->remote_settings, device);
 
-                                priv->arg_operation = OPERATION_NULL; /* done */
+                                reset_command_line_args (panel); /* done */
                                 select_tree_iter (panel, &iter);
                                 return TRUE;
                         } else if (priv->arg_operation == OPERATION_CONNECT_8021X) {
                                 cc_network_panel_connect_to_8021x_network (panel, priv->client, priv->remote_settings, device, priv->arg_access_point);
-                                priv->arg_operation = OPERATION_NULL; /* done */
+                                reset_command_line_args (panel); /* done */
                                 select_tree_iter (panel, &iter);
                                 return TRUE;
                         }
                         else if (priv->arg_operation == OPERATION_SHOW_DEVICE) {
                                 select_tree_iter (panel, &iter);
-                                priv->arg_operation = OPERATION_NULL;
+                                reset_command_line_args (panel); /* done */
                                 return TRUE;
                         }
                 }
diff --git a/panels/network/network-dialogs.c b/panels/network/network-dialogs.c
index e5295dc..3fab0e5 100644
--- a/panels/network/network-dialogs.c
+++ b/panels/network/network-dialogs.c
@@ -218,6 +218,8 @@ show_wireless_dialog (CcNetworkPanel   *panel,
         GtkWidget *toplevel = cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (panel)));
         WirelessDialogClosure *closure;
 
+        g_debug ("About to parent and show a network dialog");
+
         g_assert (gtk_widget_is_toplevel (toplevel));
         g_object_set (G_OBJECT (dialog),
                       "modal", TRUE,