Merge lp:~amigadave/gnome-control-center-signon/remove-infobar into lp:gnome-control-center-signon

[David King]

Remove InfoBar in ProvidersPage

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:107
http://s-jenkins:8080/job/online-accounts-gnome-control-center-ci/57/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/online-accounts-gnome-control-center-ci/./label=quantal/57/console

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:114
http://s-jenkins:8080/job/online-accounts-gnome-control-center-ci/59/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/online-accounts-gnome-control-center-ci/./label=quantal/59/console

review: Needs Fixing (continuous-integration)

[Alberto Mardegan (mardy)]

Perfect!

review: Approve

=== modified file 'src/cc-credentials-providers-page.vala'
--- src/cc-credentials-providers-page.vala	2012-09-26 05:59:52 +0000
+++ src/cc-credentials-providers-page.vala	2012-10-25 07:49:19 +0000
@@ -71,7 +71,7 @@
         // TODO: Use common Ag.Manager.
         manager = new Ag.Manager ();
 
-        this.add (create_providers_infobar ());
+        this.add (create_providers_selector ());
         this.add (create_providers_notebook ());
 
         /* This defaults to -1, no selection, so force it to have the first
@@ -108,11 +108,8 @@
      *
      * @return a Gtk.InfoBar describing the account providers
      */
-    private Gtk.Widget create_providers_infobar ()
+    private Gtk.Widget create_providers_selector ()
     {
-        var infobar = new Gtk.InfoBar ();
-        infobar.message_type = Gtk.MessageType.QUESTION;
-        infobar.name = "providers-infobar";
         var label = new Gtk.Label (_("Show accounts that integrate with:"));
         var applications_model = new ApplicationsModel ();
         applications_combo = new Gtk.ComboBox.with_model (applications_model);
@@ -121,32 +118,18 @@
         applications_combo.pack_start (text_renderer, false);
         applications_combo.set_attributes (text_renderer, "markup",
                                            ApplicationsModel.ModelColumns.APPLICATION_DESCRIPTION);
-        var infobar_grid = new Gtk.Grid ();
-        infobar_grid.column_spacing = 6;
-        infobar_grid.add (label);
-        infobar_grid.add (applications_combo);
-        var content_area = infobar.get_content_area () as Gtk.Container;
-        content_area.add (infobar_grid);
+        var grid = new Gtk.Grid ();
+        grid.column_spacing = 6;
+        grid.add (label);
+        grid.add (applications_combo);
 
         applications_combo.changed.connect (on_applications_combo_changed);
 
-        // Override theme colors according to the UI specification.
-        try
-        {
-          var css = new Gtk.CssProvider ();
-          css.load_from_data ("@define-color question_bg_color rgb (222, 222, 222); GtkInfoBar#providers-infobar { color: @fg_color; -GtkInfoBar-action-area-border: 0 }", -1);
-          var context = infobar.get_style_context ();
-          context.add_provider (css, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-        }
-        catch (Error err)
-        {
-          warning ("Error processing CSS theme override: %s", err.message);
-        }
-
-        infobar.set_size_request (-1, 48);
-        infobar.show_all ();
-
-        return infobar;
+        // Height matches infobar of AccountDetailsPage.
+        grid.set_size_request (-1, 48);
+        grid.show_all ();
+
+        return grid;
     }
 
     /**