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

[Jaap Broekhuizen]

When application is already running, but launched again, it now presents the window of the already running instance.

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

339. By Jaap Broekhuizen on 2012-11-18

Reverted another change i made...

340. By Jaap Broekhuizen on 2012-11-18

Fix tab.

[David Gomes (davidgomes)]

Good job.

review: Approve

=== modified file 'Switchboard/switchboard-app.vala'
--- Switchboard/switchboard-app.vala	2012-10-14 12:52:23 +0000
+++ Switchboard/switchboard-app.vala	2012-11-18 13:30:25 +0000
@@ -504,7 +504,13 @@
         }
         
         public override void activate () {
-        	build ();
+            // If app is already running, present the current window.
+            if (get_windows () != null) {
+                get_windows ().data.present ();
+                return;
+            }
+
+            build ();
         }
     }
 
@@ -534,7 +540,7 @@
         // In the future, the plug_root_dir should be overridable by CLI flags.
         var switchboard_app = new SwitchboardApp ();
         
-        Bus.own_name (BusType.SESSION, "org.elementary.switchboard",
+        GLib.Bus.own_name (BusType.SESSION, "org.elementary.switchboard",
                 BusNameOwnerFlags.NONE,
                 (conn) => { 
                     try {