[gnome-control-center] shell: Don't remove old panel if new one is broken



commit 4f8ac6639e392d20ef1b1bc91e934377adeaaf20
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Nov 2 17:25:07 2012 +0100

    shell: Don't remove old panel if new one is broken
    
    If a valid panel fails to load (outdated library, file missing, etc.)
    don't remove the old panel, but keep it around instead.

 shell/gnome-control-center.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/shell/gnome-control-center.c b/shell/gnome-control-center.c
index 99697b9..00a5b5b 100644
--- a/shell/gnome-control-center.c
+++ b/shell/gnome-control-center.c
@@ -1016,12 +1016,8 @@ _shell_set_active_panel_from_id (CcShell      *shell,
   else if (activate_panel (GNOME_CONTROL_CENTER (shell), start_id, argv, desktop,
                            name, gicon) == FALSE)
     {
-      /* Failed to activate the panel for some reason */
-      old_panel = priv->current_panel_box;
-      priv->current_panel_box = NULL;
-      notebook_select_page (priv->notebook, priv->scrolled_window);
-      if (old_panel)
-        notebook_remove_page (priv->notebook, old_panel);
+      /* Failed to activate the panel for some reason,
+       * let's keep the old panel around instead */
     }
   else
     {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]