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

[Jaap Broekhuizen]

[David Gomes (davidgomes)]

I really prefer this.

review: Approve

[David Gomes (davidgomes)]

Good code too.

=== modified file 'Switchboard/switchboard-app.vala'
--- Switchboard/switchboard-app.vala	2012-11-18 13:28:26 +0000
+++ Switchboard/switchboard-app.vala	2012-11-24 14:22:21 +0000
@@ -128,6 +128,7 @@
             toolbar.set_hexpand (true);
 
             alert_view = new Granite.Widgets.EmbeddedAlert ();
+            alert_view.set_vexpand (true);
             grid.attach (alert_view, 0, 2, 1, 1);
 
             main_window.add (grid);
@@ -205,13 +206,13 @@
 
         public void hide_alert () {
             alert_view.hide ();
-            category_view.show ();
+            scrollable_view.show ();
         }
 
         public void show_alert (string primary_text, string secondary_text, Gtk.MessageType type) {
             alert_view.set_alert (primary_text, secondary_text, null, true, type);
             alert_view.show ();
-            category_view.hide ();
+            scrollable_view.hide ();
         }
 
         public void load_plug (string title, string executable, bool @extern) {