[gnome-control-center/wip/feborges/new-users-panel: 2/6] user-accounts: move spinner to header in Add User dialog

[Felipe Borges <felipeborges src gnome org>]

commit 900a1244b4f2da3c0193fcf045884912ce7c7b73
Author: Felipe Borges <felipeborges gnome org>
Date:   Tue May 24 14:20:22 2016 +0200

    user-accounts: move spinner to header in Add User dialog
    
    https://wiki.gnome.org/Design/SystemSettings/UserAccounts

 panels/user-accounts/data/account-dialog.ui |   11 -----------
 panels/user-accounts/um-account-dialog.c    |   12 ++++++++----
 2 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/panels/user-accounts/data/account-dialog.ui b/panels/user-accounts/data/account-dialog.ui
index 7cbb2b8..44e0b84 100644
--- a/panels/user-accounts/data/account-dialog.ui
+++ b/panels/user-accounts/data/account-dialog.ui
@@ -668,17 +668,6 @@
                 <property name="position">0</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkSpinner" id="spinner">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/panels/user-accounts/um-account-dialog.c b/panels/user-accounts/um-account-dialog.c
index 6bee2c1..ee8efdf 100644
--- a/panels/user-accounts/um-account-dialog.c
+++ b/panels/user-accounts/um-account-dialog.c
@@ -1469,15 +1469,19 @@ um_account_dialog_init (UmAccountDialog *self)
         widget = GTK_WIDGET (gtk_builder_get_object (builder, "enterprise-button"));
         self->enterprise_button = widget;
 
-        widget = GTK_WIDGET (gtk_builder_get_object (builder, "spinner"));
-        gtk_widget_hide (widget);
-        self->spinner = GTK_SPINNER (widget);
-
         gtk_dialog_add_button (dialog, _("_Cancel"), GTK_RESPONSE_CANCEL);
         widget = gtk_dialog_add_button (dialog, _("_Add"), GTK_RESPONSE_OK);
         gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
         gtk_widget_grab_default (widget);
 
+        widget = gtk_spinner_new ();
+        gtk_widget_hide (widget);
+        self->spinner = GTK_SPINNER (widget);
+
+        widget = gtk_dialog_get_header_bar (dialog);
+        gtk_header_bar_pack_end (GTK_HEADER_BAR (widget), GTK_WIDGET (self->spinner));
+        gtk_container_child_set (GTK_CONTAINER (widget), GTK_WIDGET (self->spinner), "position", 2, NULL);
+
         widget = (GtkWidget *) gtk_builder_get_object (builder, "account-dialog");
         gtk_container_add (GTK_CONTAINER (content), widget);
         self->container_widget = widget;