Merge lp:~jaapz-b/switchboard/fix-1082736 into lp:~elementary-pantheon/switchboard/switchboard

[Jaap Broekhuizen]

[lp:~jaapz-b/switchboard/fix-1082736]

351. By Jaap Broekhuizen on 2012-12-09

Code formatting.

[David Gomes (davidgomes)]

Good job, approved.

review: Approve

=== modified file 'Switchboard/switchboard-app.vala'
--- Switchboard/switchboard-app.vala	2012-11-25 19:32:09 +0000
+++ Switchboard/switchboard-app.vala	2012-12-09 19:14:18 +0000
@@ -94,10 +94,14 @@
 
             // Set up socket
             socket = new Gtk.Socket ();
-            socket.plug_removed.connect(switch_to_icons);
             socket.set_hexpand(true);
             socket.set_vexpand(true);
 
+            socket.plug_removed.connect (() => {
+                plug_closed ();
+                return true;
+            });
+
             // Set up accelerators (hotkeys)
             var accel_group = new Gtk.AccelGroup ();
             uint accel_key;
@@ -242,17 +246,14 @@
                         navigation_button.stock_id = Gtk.Stock.HOME;
                         current_plug["title"] = title;
                         current_plug["executable"] = executable;
+                        switch_to_socket ();
+                        main_window.title = @"$APP_TITLE - $title";
                     }
                 } catch {  warning(_("Failed to launch plug: title %s | executable %s"), title, executable); }
             } else {
                 navigation_button.set_sensitive(true);
                 navigation_button.stock_id = Gtk.Stock.HOME;
             }
-            
-            if (!@extern) {
-                switch_to_socket ();
-                main_window.title = @"$APP_TITLE - $title";
-            }
         }
 
         // Change Switchboard title back to "Switchboard"
@@ -279,6 +280,7 @@
             search_box.sensitive = false;
 
             category_view.hide ();
+            socket.hide ();
             loading.show_all ();
         }