[gnome-control-center] user-accounts: replace deprecated stuff

[Ondrej Holy <oholy src gnome org>]

commit 320f6e617bb78f1ecea0ef974e90430daf3329c5
Author: Ondrej Holy <oholy redhat com>
Date:   Thu Nov 6 19:28:19 2014 +0100

    user-accounts: replace deprecated stuff

 panels/user-accounts/data/account-dialog.ui       |    4 +--
 panels/user-accounts/data/password-dialog.ui      |    2 -
 panels/user-accounts/data/user-accounts-dialog.ui |   27 ++++++++------------
 panels/user-accounts/um-user-panel.c              |    6 ++--
 4 files changed, 15 insertions(+), 24 deletions(-)
---
diff --git a/panels/user-accounts/data/account-dialog.ui b/panels/user-accounts/data/account-dialog.ui
index 07de2ab..81a6c46 100644
--- a/panels/user-accounts/data/account-dialog.ui
+++ b/panels/user-accounts/data/account-dialog.ui
@@ -192,7 +192,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="xalign">0</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -206,7 +205,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="xalign">0</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">local-password-login-radio</property>
@@ -601,10 +599,10 @@
                     <property name="can_focus">False</property>
                     <property name="icon_name">network-offline-symbolic</property>
                     <property name="pixel_size">64</property>
-                    <property name="yalign">1</property>
                     <property name="vexpand">True</property>
                     <property name="hexpand">True</property>
                     <property name="margin_bottom">6</property>
+                    <property name="valign">end</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
diff --git a/panels/user-accounts/data/password-dialog.ui b/panels/user-accounts/data/password-dialog.ui
index c4c1f85..82a1cb3 100644
--- a/panels/user-accounts/data/password-dialog.ui
+++ b/panels/user-accounts/data/password-dialog.ui
@@ -238,7 +238,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="xalign">0</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -252,7 +251,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="xalign">0</property>
                         <property name="active">True</property>
                         <property name="draw_indicator">True</property>
                         <property name="group">action-login-radio</property>
diff --git a/panels/user-accounts/data/user-accounts-dialog.ui 
b/panels/user-accounts/data/user-accounts-dialog.ui
index 8514ea5..54b4252 100644
--- a/panels/user-accounts/data/user-accounts-dialog.ui
+++ b/panels/user-accounts/data/user-accounts-dialog.ui
@@ -202,7 +202,8 @@
                           <object class="GtkLabel" id="login-options-label">
                             <property name="visible">True</property>
                             <property name="xalign">1</property>
-                            <property name="ypad">5</property>
+                            <property name="margin-top">5</property>
+                            <property name="margin-bottom">5</property>
                             <property name="label" translatable="yes">Login Options</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>
@@ -322,19 +323,14 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkAlignment" id="user-icon-nonbutton">
-                                <property name="xscale">0</property>
-                                <property name="yscale">0</property>
-                                <child>
-                                  <object class="GtkImage" id="user-icon-image">
-                                    <property name="visible">True</property>
-                                    <property name="icon_name">avatar-default</property>
-                                    <property name="icon-size">6</property>
-                                    <child internal-child="accessible">
-                                      <object class="AtkObject" id="user-icon-image-a11y">
-                                        <property name="accessible-name" translatable="yes">User 
Icon</property>
-                                      </object>
-                                    </child>
+                              <object class="GtkImage" id="user-icon-image">
+                                <property name="visible">True</property>
+                                <property name="icon_name">avatar-default</property>
+                                <property name="icon-size">6</property>
+                                <property name="halign">end</property>
+                                <child internal-child="accessible">
+                                  <object class="AtkObject" id="user-icon-image-a11y">
+                                    <property name="accessible-name" translatable="yes">User Icon</property>
                                   </object>
                                 </child>
                               </object>
@@ -449,7 +445,6 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="xalign">1</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -489,7 +484,7 @@
     <property name="mode">both</property>
     <widgets>
       <widget name="user-icon-button"/>
-      <widget name="user-icon-nonbutton"/>
+      <widget name="user-icon-image"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="label-sizegroup">
diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
index f3a929f..3941b2e 100644
--- a/panels/user-accounts/um-user-panel.c
+++ b/panels/user-accounts/um-user-panel.c
@@ -1431,7 +1431,7 @@ on_permission_changed (GPermission *permission,
 
         if (is_authorized || self_selected) {
                 gtk_widget_show (get_widget (d, "user-icon-button"));
-                gtk_widget_hide (get_widget (d, "user-icon-nonbutton"));
+                gtk_widget_hide (get_widget (d, "user-icon-image"));
 
                 um_editable_button_set_editable (UM_EDITABLE_BUTTON (get_widget (d, 
"account-language-button")), TRUE);
                 remove_unlock_tooltip (get_widget (d, "account-language-button"));
@@ -1444,7 +1444,7 @@ on_permission_changed (GPermission *permission,
         }
         else {
                 gtk_widget_hide (get_widget (d, "user-icon-button"));
-                gtk_widget_show (get_widget (d, "user-icon-nonbutton"));
+                gtk_widget_show (get_widget (d, "user-icon-image"));
 
                 um_editable_button_set_editable (UM_EDITABLE_BUTTON (get_widget (d, 
"account-language-button")), FALSE);
                 add_unlock_tooltip (get_widget (d, "account-language-button"));
@@ -1628,7 +1628,7 @@ setup_main_window (CcUserPanel *self)
         button = get_widget (d, "remove-user-toolbutton");
         g_signal_connect (button, "clicked", G_CALLBACK (delete_user), self);
 
-        button = get_widget (d, "user-icon-nonbutton");
+        button = get_widget (d, "user-icon-image");
         add_unlock_tooltip (button);
 
         button = get_widget (d, "full-name-entry");