[gnome-control-center] user-accounts: Fix fingerprint assistant

[Bastien Nocera <hadess src gnome org>]

commit 5ffae5b569dd80543b4466daec9abef4be06d36a
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jun 10 17:57:29 2011 +0100

    user-accounts: Fix fingerprint assistant
    
    https://bugzilla.gnome.org/show_bug.cgi?id=649678

 panels/user-accounts/data/account-fingerprint.ui |   11 ++++-----
 panels/user-accounts/um-fingerprint-dialog.c     |   26 ++-------------------
 2 files changed, 8 insertions(+), 29 deletions(-)
---
diff --git a/panels/user-accounts/data/account-fingerprint.ui b/panels/user-accounts/data/account-fingerprint.ui
index 0c8a706..b651759 100644
--- a/panels/user-accounts/data/account-fingerprint.ui
+++ b/panels/user-accounts/data/account-fingerprint.ui
@@ -184,9 +184,8 @@
         <child>
           <object class="GtkHBox" id="enroll_hbox">
             <property name="visible">True</property>
-            <child>
-              <placeholder/>
-            </child>
+            <property name="margin-top">24</property>
+            <property name="margin-bottom">24</property>
             <child>
               <object class="GtkImage" id="image1">
                 <property name="visible">True</property>
@@ -237,17 +236,17 @@
                 <property name="position">5</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="status-label">
             <property name="visible">True</property>
+            <property name="wrap">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/panels/user-accounts/um-fingerprint-dialog.c b/panels/user-accounts/um-fingerprint-dialog.c
index f25f72f..07ca6d8 100644
--- a/panels/user-accounts/um-fingerprint-dialog.c
+++ b/panels/user-accounts/um-fingerprint-dialog.c
@@ -502,21 +502,6 @@ assistant_prepare (GtkAssistant *ass, GtkWidget *page, EnrollData *data)
 }
 
 static void
-align_image (GtkWidget *child, gpointer data)
-{
-        if (GTK_IS_IMAGE (child)) {
-                gtk_misc_set_alignment (GTK_MISC (child), 0, 0.5);
-                gtk_misc_set_padding (GTK_MISC (child), 10, 10);
-        }
-
-        if (GTK_IS_LABEL (child)) {
-                gtk_label_set_use_markup (GTK_LABEL (child), TRUE);
-                gtk_widget_override_font (child, NULL);
-                gtk_misc_set_padding (GTK_MISC (child), 68, 10);
-        }
-}
-
-static void
 enroll_fingerprints (GtkWindow *parent,
                      GtkWidget *label1,
                      GtkWidget *label2,
@@ -530,7 +515,6 @@ enroll_fingerprints (GtkWindow *parent,
         const char *filename;
         char *msg;
         GError *error = NULL;
-        gchar *title;
 
         device = NULL;
 
@@ -624,13 +608,9 @@ enroll_fingerprints (GtkWindow *parent,
 
         gtk_assistant_set_page_complete (GTK_ASSISTANT (ass), WID("page1"), TRUE);
 
-        title = g_strdup_printf (_("Enrolling fingerprints for\n<b><big>%s</big></b>"), um_user_get_real_name (user));
-
-        gtk_assistant_set_page_title (GTK_ASSISTANT (ass), WID("page1"), title);
-        gtk_assistant_set_page_title (GTK_ASSISTANT (ass), WID("page2"), title);
-        gtk_assistant_set_page_title (GTK_ASSISTANT (ass), WID("page3"), title);
-        gtk_container_forall (GTK_CONTAINER (ass), align_image, NULL);
-        g_free (title);
+        gtk_assistant_set_page_title (GTK_ASSISTANT (ass), WID("page1"), _("Selecting finger"));
+        gtk_assistant_set_page_title (GTK_ASSISTANT (ass), WID("page2"), _("Enrolling fingerprints"));
+        gtk_assistant_set_page_title (GTK_ASSISTANT (ass), WID("page3"), _("Summary"));
 
         /* Page 2 */
         g_object_set_data (G_OBJECT (WID("page2")), "name", "enroll");