Merge lp:~tombeckmann/switchboard/quantal-crash into lp:~elementary-pantheon/switchboard/switchboard

[Tom Beckmann]

Don't crash on quantal systems.

=== modified file 'Switchboard/switchboard-app.vala'
--- Switchboard/switchboard-app.vala	2012-09-23 22:43:12 +0000
+++ Switchboard/switchboard-app.vala	2012-10-14 12:57:19 +0000
@@ -77,7 +77,9 @@
         private const string[] SUPPORTED_GETTEXT_DOMAINS_KEYS = {"X-Ubuntu-Gettext-Domain", "X-GNOME-Gettext-Domain"};
 
         public SwitchboardApp () {
-            
+        }
+        
+        void build () {
             main_window = new Gtk.Window();
 
             // Set up defaults
@@ -193,6 +195,8 @@
                     return false;
                 });
             }
+            
+            progress_toolitem.hide ();
         }
         
         void shut_down () {
@@ -499,7 +503,9 @@
             toolbar.insert (create_appmenu (new Gtk.Menu ()), -1);
         }
         
-        public override void activate () {}
+        public override void activate () {
+        	build ();
+        }
     }
 
     static const OptionEntry[] entries = {
@@ -527,7 +533,6 @@
         
         // In the future, the plug_root_dir should be overridable by CLI flags.
         var switchboard_app = new SwitchboardApp ();
-        switchboard_app.progress_toolitem.hide();
         
         Bus.own_name (BusType.SESSION, "org.elementary.switchboard",
                 BusNameOwnerFlags.NONE,