Merge lp:~aroman/switchboard/fix-1305316 into lp:~elementary-pantheon/switchboard/switchboard

[Avi Romanoff]

Don't animate the opening of the plug from cli, add debug logging for plug code names, update author info

[Corentin Noël (tintou)]

Nice fix ! The debbuging is indeed useful.

review: Approve

=== modified file 'lib/PlugsManager.vala'
--- lib/PlugsManager.vala	2013-12-23 23:12:40 +0000
+++ lib/PlugsManager.vala	2014-04-09 22:17:26 +0000
@@ -90,6 +90,7 @@
     }
     
     private void register_plug (Switchboard.Plug plug) {
+        debug("%s registered", plug.code_name);
         if (plugs.contains (plug))
             return;
         plugs.add (plug);

=== modified file 'src/Switchboard.vala'
--- src/Switchboard.vala	2014-03-20 20:03:03 +0000
+++ src/Switchboard.vala	2014-04-09 22:17:26 +0000
@@ -28,6 +28,7 @@
     }
 
     private static string? plug_to_open = null;
+    private static bool should_animate_next_transition = true;
     
     public static int main (string[] args) {
         
@@ -67,7 +68,7 @@
         construct {
             application_id = "org.elementary.Switchboard";
             program_name = "Switchboard";
-            app_years = "2011-2013";
+            app_years = "2011-2014";
             exec_name = "switchboard";
             app_launcher = exec_name+".desktop";
 
@@ -77,9 +78,14 @@
             bug_url = "https://bugs.launchpad.net/switchboard";
             help_url = "https://answers.launchpad.net/switchboard";
             translate_url = "https://translations.launchpad.net/switchboard";
-            about_authors = {"Avi Romanoff <[e-mail]>", "Corentin Noël <[e-mail]>", null};
+            about_authors = {"Avi Romanoff <[e-mail]>", "Corentin Noël <[e-mail]>", null};
 
             about_license_type = Gtk.License.GPL_3_0;
+
+            // If plug_to_open was set from the command line
+            if (plug_to_open != null) {
+                should_animate_next_transition = false;
+            }
         }
 
         public override void activate () {
@@ -225,7 +231,7 @@
                 show_alert (_("No settings found"), _("Install some and re-launch Switchboard"), Gtk.MessageType.WARNING);
                 search_box.sensitive = false;
             } else {
-#if HAVE_UNITY	    
+#if HAVE_UNITY      
                 update_libunity_quicklist ();
 #endif
             }
@@ -283,9 +289,11 @@
             }
         }
 
-        // Switches to the socket view
+        // Switches to the given plug
         private void switch_to_plug (Switchboard.Plug plug) {
-            stack.set_transition_type (Gtk.StackTransitionType.SLIDE_LEFT);
+            if (should_animate_next_transition) {
+                stack.set_transition_type (Gtk.StackTransitionType.SLIDE_LEFT);
+            }
             search_box.sensitive = false;
             plug.shown ();
             stack.set_visible_child_name (plug.code_name);