Merge lp:~amigadave/gnome-control-center-signon/legal-notice-tweaks into lp:gnome-control-center-signon

[David King]

Tweak button location and add only one string (‘Legal notice’)

* Move legal notice button in OAuth widget to bottom right
* Move legal notice button in AccountsPage to bottom right

[jenkins (martin-mrazik+qa)]

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

review: Needs Fixing (continuous-integration)

[David King (amigadave)]

The Jenkins failure is sadly completely unrelated. :/

[jenkins (martin-mrazik+qa)]

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

review: Needs Fixing (continuous-integration)

[jenkins (martin-mrazik+qa)]

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

review: Approve (continuous-integration)

[Alberto Mardegan (mardy)]

Still works perfectly, and looks much better!

review: Approve

=== modified file 'libaccount-plugin/oauth-plugin.c'
--- libaccount-plugin/oauth-plugin.c	2012-09-26 06:22:34 +0000
+++ libaccount-plugin/oauth-plugin.c	2012-09-26 16:03:23 +0000
@@ -483,9 +483,7 @@
 create_infobar (ApOAuthPlugin *self)
 {
     GtkWidget *infobar;
-    GtkWidget *grid;
     GtkWidget *infobar_label;
-    GtkWidget *legal_button;
     GtkWidget *content_area;
     GtkCssProvider *css;
     GError *error;
@@ -503,23 +501,15 @@
     g_signal_connect (infobar, "response",
                       G_CALLBACK (on_infobar_response), self);
 
-    grid = gtk_grid_new ();
-
     provider = ap_plugin_get_provider ((ApPlugin *)self);
     text = g_strdup_printf (_("Please authorize Ubuntu to access "
-                              "your %s account."),
+                              "your %s account"),
                             ag_provider_get_display_name (provider));
     infobar_label = gtk_label_new (text);
     g_free (text);
 
-    gtk_container_add (GTK_CONTAINER (grid), infobar_label);
-
-    legal_button = gtk_link_button_new_with_label ("help:web-credentials/legal-notice",
-                                                   _("Learn more"));
-    gtk_container_add (GTK_CONTAINER (grid), legal_button);
-
     content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (infobar));
-    gtk_container_add (GTK_CONTAINER (content_area), grid);
+    gtk_container_add (GTK_CONTAINER (content_area), infobar_label);
 
     css = gtk_css_provider_new ();
     error = NULL;
@@ -574,6 +564,24 @@
     return frame;
 }
 
+static GtkWidget *
+create_legal_button ()
+{
+    GtkWidget *buttonbox;
+    GtkWidget *link_button;
+
+    buttonbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+    gtk_button_box_set_layout (GTK_BUTTON_BOX (buttonbox), GTK_BUTTONBOX_END);
+
+    link_button = gtk_link_button_new_with_label ("help:web-credentials/legal-notice",
+                                                  _("Legal notice"));
+
+    gtk_container_add (GTK_CONTAINER (buttonbox), link_button);
+    gtk_widget_show_all (buttonbox);
+
+    return buttonbox;
+}
+
 static void
 ap_oauth_plugin_init (ApOAuthPlugin *self)
 {
@@ -655,6 +663,7 @@
     GtkWidget *grid;
     GtkWidget *infobar;
     GtkWidget *socket_frame;
+    GtkWidget *legal_button;
 
     grid = gtk_grid_new ();
     gtk_widget_set_hexpand (grid, TRUE);
@@ -679,6 +688,9 @@
     socket_frame = create_socket_frame (self);
     gtk_container_add (GTK_CONTAINER (grid), socket_frame);
 
+    legal_button = create_legal_button ();
+    gtk_container_add (GTK_CONTAINER (grid), legal_button);
+
     return grid;
 }
 
 
=== modified file 'src/cc-credentials-accounts-page.vala'
--- src/cc-credentials-accounts-page.vala	2012-09-26 05:59:52 +0000
+++ src/cc-credentials-accounts-page.vala	2012-09-26 16:03:23 +0000
@@ -98,9 +98,9 @@
         row_spacing = 6;
         column_spacing = 12;
 
-        this.attach (create_legal_button (), 0, 0, 2, 1);
-        this.attach (create_accounts_tree (), 0, 1, 1, 1);
-        this.attach (create_accounts_notebook (), 1, 1, 1, 1);
+        this.attach (create_accounts_tree (), 0, 0, 1, 1);
+        this.attach (create_accounts_notebook (), 1, 0, 1, 1);
+        this.attach (create_legal_button (), 0, 1, 2, 1);
 
         // Force handling of the changed signal.
         var selection = accounts_tree.get_selection ();