[gnome-online-accounts/gnome-3-6] Fix the alignment with the closing button in the dialogs

[Debarshi Ray <debarshir src gnome org>]

commit 6927d539d36ffe38be38a5b75268a22ce384a6e3
Author: Debarshi Ray <debarshir gnome org>
Date:   Fri Sep 14 18:21:11 2012 +0200

    Fix the alignment with the closing button in the dialogs
    
    Imitate the same pattern used in this gnome-control-center commit:
    b40c1fb2cfcfe70f7c84d7c825d99f7cb4c23f00

 src/goabackend/goaexchangeprovider.c |   22 +++++++++++++---------
 src/goabackend/goakerberosprovider.c |   18 +++++++++++-------
 src/goabackend/goaoauth2provider.c   |   15 +++++++++++++--
 src/goabackend/goaoauthprovider.c    |   30 +++++++++++++++++++++++-------
 4 files changed, 60 insertions(+), 25 deletions(-)
---
diff --git a/src/goabackend/goaexchangeprovider.c b/src/goabackend/goaexchangeprovider.c
index 1f2c06c..e7bf281 100644
--- a/src/goabackend/goaexchangeprovider.c
+++ b/src/goabackend/goaexchangeprovider.c
@@ -442,7 +442,7 @@ create_account_details_ui (GoaProvider    *provider,
                            gboolean        new_account,
                            AddAccountData *data)
 {
-  GtkWidget *header_grid;
+  GtkWidget *grid0;
   GtkWidget *grid1;
   GtkWidget *grid2;
   GtkWidget *hbox;
@@ -450,23 +450,27 @@ create_account_details_ui (GoaProvider    *provider,
 
   goa_utils_set_dialog_title (provider, dialog, new_account);
 
+  grid0 = gtk_grid_new ();
+  gtk_container_set_border_width (GTK_CONTAINER (grid0), 5);
+  gtk_widget_set_margin_bottom (grid0, 6);
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (grid0), GTK_ORIENTATION_VERTICAL);
+  gtk_grid_set_row_spacing (GTK_GRID (grid0), 12);
+  gtk_container_add (GTK_CONTAINER (vbox), grid0);
+
   data->cluebar = gtk_info_bar_new ();
   gtk_info_bar_set_message_type (GTK_INFO_BAR (data->cluebar), GTK_MESSAGE_ERROR);
+  gtk_widget_set_hexpand (data->cluebar, TRUE);
   gtk_widget_set_no_show_all (data->cluebar, TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), data->cluebar, FALSE, FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (grid0), data->cluebar);
 
   data->cluebar_label = gtk_label_new ("");
   gtk_label_set_line_wrap (GTK_LABEL (data->cluebar_label), TRUE);
   gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (data->cluebar))),
                      data->cluebar_label);
 
-  header_grid = gtk_grid_new ();
-  gtk_orientable_set_orientation (GTK_ORIENTABLE (header_grid), GTK_ORIENTATION_HORIZONTAL);
-  gtk_box_pack_start (vbox, header_grid, FALSE, FALSE, 0);
-
   data->spinner = gtk_spinner_new ();
   gtk_widget_set_no_show_all (data->spinner, TRUE);
-  gtk_container_add (GTK_CONTAINER (header_grid), data->spinner);
+  gtk_container_add (GTK_CONTAINER (grid0), data->spinner);
 
   grid1 = gtk_grid_new ();
   gtk_orientable_set_orientation (GTK_ORIENTABLE (grid1), GTK_ORIENTATION_VERTICAL);
@@ -480,7 +484,7 @@ create_account_details_ui (GoaProvider    *provider,
   gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE);
   gtk_box_pack_start (GTK_BOX (hbox), grid1, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), grid2, TRUE, TRUE, 0);
-  gtk_box_pack_start (vbox, hbox, FALSE, FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (grid0), hbox);
 
   add_entry (grid1, grid2, _("_E-mail"), &data->email_address);
   add_entry (grid1, grid2, _("_Password"), &data->password);
@@ -489,7 +493,7 @@ create_account_details_ui (GoaProvider    *provider,
       data->expander = gtk_expander_new_with_mnemonic (_("_Custom"));
       gtk_expander_set_expanded (GTK_EXPANDER (data->expander), FALSE);
       gtk_expander_set_resize_toplevel (GTK_EXPANDER (data->expander), TRUE);
-      gtk_box_pack_start (vbox, data->expander, FALSE, FALSE, 0);
+      gtk_container_add (GTK_CONTAINER (grid0), data->expander);
 
       grid1 = gtk_grid_new ();
       gtk_orientable_set_orientation (GTK_ORIENTABLE (grid1), GTK_ORIENTATION_VERTICAL);
diff --git a/src/goabackend/goakerberosprovider.c b/src/goabackend/goakerberosprovider.c
index a2b73d5..82c2537 100644
--- a/src/goabackend/goakerberosprovider.c
+++ b/src/goabackend/goakerberosprovider.c
@@ -972,7 +972,7 @@ create_account_details_ui (GoaKerberosProvider *self,
                            gboolean             new_account,
                            SignInRequest       *request)
 {
-  GtkWidget *header_grid;
+  GtkWidget *grid0;
   GtkWidget *grid1;
   GtkWidget *grid2;
   GtkWidget *hbox;
@@ -980,18 +980,22 @@ create_account_details_ui (GoaKerberosProvider *self,
 
   goa_utils_set_dialog_title (GOA_PROVIDER (self), dialog, new_account);
 
-  header_grid = gtk_grid_new ();
-  gtk_orientable_set_orientation (GTK_ORIENTABLE (header_grid), GTK_ORIENTATION_HORIZONTAL);
-  gtk_box_pack_start (GTK_BOX (vbox), header_grid, FALSE, FALSE, 0);
+  grid0 = gtk_grid_new ();
+  gtk_container_set_border_width (GTK_CONTAINER (grid0), 5);
+  gtk_widget_set_margin_bottom (grid0, 6);
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (grid0), GTK_ORIENTATION_VERTICAL);
+  gtk_grid_set_row_spacing (GTK_GRID (grid0), 12);
+  gtk_container_add (GTK_CONTAINER (vbox), grid0);
 
   request->spinner = gtk_spinner_new ();
   gtk_widget_set_no_show_all (request->spinner, TRUE);
-  gtk_container_add (GTK_CONTAINER (header_grid), request->spinner);
+  gtk_container_add (GTK_CONTAINER (grid0), request->spinner);
 
   request->cluebar = gtk_info_bar_new ();
   gtk_info_bar_set_message_type (GTK_INFO_BAR (request->cluebar), GTK_MESSAGE_ERROR);
+  gtk_widget_set_hexpand (request->cluebar, TRUE);
   gtk_widget_set_no_show_all (request->cluebar, TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), request->cluebar, FALSE, FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (grid0), request->cluebar);
 
   request->cluebar_label = gtk_label_new ("");
   gtk_label_set_line_wrap (GTK_LABEL (request->cluebar_label), TRUE);
@@ -1010,7 +1014,7 @@ create_account_details_ui (GoaKerberosProvider *self,
   gtk_box_set_homogeneous (GTK_BOX (hbox), FALSE);
   gtk_box_pack_start (GTK_BOX (hbox), grid1, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), grid2, TRUE, TRUE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+  gtk_container_add (GTK_CONTAINER (grid0), hbox);
 
   request->realm_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_OBJECT);
   add_combo_box (grid1,
diff --git a/src/goabackend/goaoauth2provider.c b/src/goabackend/goaoauth2provider.c
index fb0578f..8ae3ef4 100644
--- a/src/goabackend/goaoauth2provider.c
+++ b/src/goabackend/goaoauth2provider.c
@@ -832,6 +832,7 @@ get_tokens_and_identity (GoaOAuth2Provider  *provider,
 {
   gboolean ret;
   gchar *url;
+  GtkWidget *grid;
   IdentifyData data;
   gchar *escaped_redirect_uri;
   gchar *escaped_client_id;
@@ -866,6 +867,13 @@ get_tokens_and_identity (GoaOAuth2Provider  *provider,
 
   goa_utils_set_dialog_title (GOA_PROVIDER (provider), dialog, add_account);
 
+  grid = gtk_grid_new ();
+  gtk_container_set_border_width (GTK_CONTAINER (grid), 5);
+  gtk_widget_set_margin_bottom (grid, 6);
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_VERTICAL);
+  gtk_grid_set_row_spacing (GTK_GRID (grid), 12);
+  gtk_container_add (GTK_CONTAINER (vbox), grid);
+
   if (goa_oauth2_provider_get_use_external_browser (provider))
     {
       GtkWidget *label;
@@ -908,6 +916,8 @@ get_tokens_and_identity (GoaOAuth2Provider  *provider,
       GtkWidget *embed;
 
       web_view = goa_web_view_new ();
+      gtk_widget_set_hexpand (web_view, TRUE);
+      gtk_widget_set_vexpand (web_view, TRUE);
       embed = goa_web_view_get_view (GOA_WEB_VIEW (web_view));
 
       if (goa_oauth2_provider_get_use_mobile_browser (provider))
@@ -923,9 +933,10 @@ get_tokens_and_identity (GoaOAuth2Provider  *provider,
                         G_CALLBACK (on_web_view_navigation_policy_decision_requested),
                         &data);
 
-      gtk_container_add (GTK_CONTAINER (vbox), web_view);
-      gtk_widget_show_all (web_view);
+      gtk_container_add (GTK_CONTAINER (grid), web_view);
     }
+
+  gtk_widget_show_all (GTK_WIDGET (vbox));
   gtk_dialog_run (GTK_DIALOG (dialog));
 
   /* we can have either the auth code, with which we'll obtain the token, or
diff --git a/src/goabackend/goaoauthprovider.c b/src/goabackend/goaoauthprovider.c
index e63d8fe..7fe9adf 100644
--- a/src/goabackend/goaoauthprovider.c
+++ b/src/goabackend/goaoauthprovider.c
@@ -766,6 +766,7 @@ get_tokens_and_identity (GoaOAuthProvider *provider,
   RestProxy *proxy;
   RestProxyCall *call;
   GHashTable *f;
+  GtkWidget *grid;
   GtkWidget *spinner;
   gboolean use_external_browser;
   gchar **request_params;
@@ -817,14 +818,25 @@ get_tokens_and_identity (GoaOAuthProvider *provider,
 
   goa_utils_set_dialog_title (GOA_PROVIDER (provider), dialog, add_account);
 
+  grid = gtk_grid_new ();
+  gtk_container_set_border_width (GTK_CONTAINER (grid), 5);
+  gtk_widget_set_margin_bottom (grid, 6);
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_VERTICAL);
+  gtk_grid_set_row_spacing (GTK_GRID (grid), 12);
+  gtk_container_add (GTK_CONTAINER (vbox), grid);
+
   spinner = gtk_spinner_new ();
+  gtk_widget_set_hexpand (spinner, TRUE);
+  gtk_widget_set_halign (spinner, GTK_ALIGN_CENTER);
+  gtk_widget_set_vexpand (spinner, TRUE);
+  gtk_widget_set_valign (spinner, GTK_ALIGN_CENTER);
   gtk_widget_set_size_request (GTK_WIDGET (spinner), 24, 24);
   gtk_spinner_start (GTK_SPINNER (spinner));
-  gtk_box_pack_start (vbox, spinner, TRUE, FALSE, 0);
-  gtk_widget_show (spinner);
+  gtk_container_add (GTK_CONTAINER (grid), spinner);
+  gtk_widget_show_all (GTK_WIDGET (vbox));
 
   g_main_loop_run (data.loop);
-  gtk_container_remove (GTK_CONTAINER (vbox), spinner);
+  gtk_container_remove (GTK_CONTAINER (grid), spinner);
 
   if (rest_proxy_call_get_status_code (call) != 200)
     {
@@ -874,10 +886,10 @@ get_tokens_and_identity (GoaOAuthProvider *provider,
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label), markup);
       g_free (markup);
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
+      gtk_container_add (GTK_CONTAINER (grid), label);
       entry = gtk_entry_new ();
       gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
-      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, TRUE, 0);
+      gtk_container_add (GTK_CONTAINER (grid), entry);
       gtk_widget_grab_focus (entry);
       gtk_widget_show_all (GTK_WIDGET (vbox));
 
@@ -900,6 +912,8 @@ get_tokens_and_identity (GoaOAuthProvider *provider,
       GtkWidget *embed;
 
       web_view = goa_web_view_new ();
+      gtk_widget_set_hexpand (web_view, TRUE);
+      gtk_widget_set_vexpand (web_view, TRUE);
       embed = goa_web_view_get_view (GOA_WEB_VIEW (web_view));
 
       if (goa_oauth_provider_get_use_mobile_browser (provider))
@@ -915,10 +929,12 @@ get_tokens_and_identity (GoaOAuthProvider *provider,
                         G_CALLBACK (on_web_view_navigation_policy_decision_requested),
                         &data);
 
-      gtk_container_add (GTK_CONTAINER (vbox), web_view);
-      gtk_widget_show_all (web_view);
+      gtk_container_add (GTK_CONTAINER (grid), web_view);
     }
+
+  gtk_widget_show_all (GTK_WIDGET (vbox));
   gtk_dialog_run (GTK_DIALOG (dialog));
+
   if (data.oauth_verifier == NULL)
     {
       if (data.error == NULL)