[gnome-control-center] shell: Make sure the "active-panel" property is updated

[Florian MÃllner <fmuellner src gnome org>]

commit 78717031db90c42221a7dce1f20762b9d8b8103c
Author: Florian MÃllner <fmuellner gnome org>
Date:   Tue May 8 18:45:25 2012 +0200

    shell: Make sure the "active-panel" property is updated
    
    The (currently unused) cc_shell_get_active_panel() method is useless
    unless "active-panel" is actually updated correctly.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=675471

 shell/cc-shell.c             |    1 -
 shell/gnome-control-center.c |    3 +++
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/shell/cc-shell.c b/shell/cc-shell.c
index 95b6487..9264e68 100644
--- a/shell/cc-shell.c
+++ b/shell/cc-shell.c
@@ -165,7 +165,6 @@ cc_shell_set_active_panel (CcShell *shell,
       if (panel)
         {
           shell->priv->active_panel = g_object_ref (panel);
-          g_object_set (G_OBJECT (panel), "shell", shell, NULL);
         }
       g_object_notify (G_OBJECT (shell), "active-panel");
     }
diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c
index f76818d..5cf3817 100644
--- a/shell/gnome-control-center.c
+++ b/shell/gnome-control-center.c
@@ -158,6 +158,7 @@ activate_panel (GnomeControlCenter *shell,
 
   /* create the panel plugin */
   panel = g_object_new (panel_type, "shell", shell, "argv", argv, NULL);
+  cc_shell_set_active_panel (CC_SHELL (shell), CC_PANEL (panel));
   gtk_widget_show (panel);
 
   gtk_lock_button_set_permission (GTK_LOCK_BUTTON (priv->lock_button),
@@ -231,6 +232,8 @@ shell_show_overview_page (GnomeControlCenter *center)
   gtk_window_set_icon_name (GTK_WINDOW (priv->window),
                             priv->default_window_icon);
 
+  cc_shell_set_active_panel (CC_SHELL (center), NULL);
+
   /* clear any custom widgets */
   _shell_remove_all_custom_widgets (priv);
 }