[control-center/f13/master] * Thu Aug 19 2010 Bastien Nocera <bnocera at redhat.com> 2.30.1-3 - Fix enrollment on UPEK Eikon II dev

[Bastien Nocera]

commit 75bb3e3157a8c12f8f363851fcc5e856bc10eb89
Author: Bastien Nocera <hadess at hadess.net>
Date:   Thu Aug 19 17:31:38 2010 +0100

    * Thu Aug 19 2010 Bastien Nocera <bnocera at redhat.com> 2.30.1-3
    - Fix enrollment on UPEK Eikon II devices

 ...ing-with-Upek-Eikon-II-fingerprint-reader.patch |   58 ++++++++++++++++++++
 control-center.spec                                |   10 +++-
 2 files changed, 66 insertions(+), 2 deletions(-)
---
diff --git a/0001-Fix-enrolling-with-Upek-Eikon-II-fingerprint-reader.patch b/0001-Fix-enrolling-with-Upek-Eikon-II-fingerprint-reader.patch
new file mode 100644
index 0000000..19bcb71
--- /dev/null
+++ b/0001-Fix-enrolling-with-Upek-Eikon-II-fingerprint-reader.patch
@@ -0,0 +1,58 @@
+From 788bfe5b500c33d182dd1c7c48a49b1232e7a57e Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess at hadess.net>
+Date: Wed, 18 Aug 2010 11:42:33 +0100
+Subject: [PATCH] Fix enrolling with Upek Eikon II fingerprint reader
+
+https://bugzilla.gnome.org/show_bug.cgi?id=627249
+---
+ capplets/about-me/gnome-about-me-fingerprint.c  |    2 +-
+ capplets/about-me/gnome-about-me-fingerprint.ui |   20 ++++++++++++++++++++
+ 2 files changed, 21 insertions(+), 1 deletions(-)
+
+diff --git a/capplets/about-me/gnome-about-me-fingerprint.c b/capplets/about-me/gnome-about-me-fingerprint.c
+index b285503..88b1d4f 100644
+--- a/capplets/about-me/gnome-about-me-fingerprint.c
++++ b/capplets/about-me/gnome-about-me-fingerprint.c
+@@ -25,7 +25,7 @@
+ #include "capplet-util.h"
+ 
+ /* This must match the number of images on the 2nd page in the UI file */
+-#define MAX_ENROLL_STAGES 3
++#define MAX_ENROLL_STAGES 5
+ 
+ static DBusGProxy *manager = NULL;
+ static DBusGConnection *connection = NULL;
+diff --git a/capplets/about-me/gnome-about-me-fingerprint.ui b/capplets/about-me/gnome-about-me-fingerprint.ui
+index d94a5e8..7f15433 100644
+--- a/capplets/about-me/gnome-about-me-fingerprint.ui
++++ b/capplets/about-me/gnome-about-me-fingerprint.ui
+@@ -219,6 +219,26 @@
+               </packing>
+             </child>
+             <child>
++              <object class="GtkImage" id="image4">
++                <property name="visible">True</property>
++                <property name="stock">gtk-no</property>
++                <property name="icon-size">6</property>
++              </object>
++              <packing>
++                <property name="position">4</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkImage" id="image5">
++                <property name="visible">True</property>
++                <property name="stock">gtk-no</property>
++                <property name="icon-size">6</property>
++              </object>
++              <packing>
++                <property name="position">5</property>
++              </packing>
++            </child>
++            <child>
+               <placeholder/>
+             </child>
+           </object>
+-- 
+1.7.0.1
+
diff --git a/control-center.spec b/control-center.spec
index 148448a..3df0291 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -24,7 +24,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.30.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -51,6 +51,9 @@ Patch52: shell-markup.patch
 
 Patch56: best-shapes.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=627249
+Patch57: 0001-Fix-enrolling-with-Upek-Eikon-II-fingerprint-reader.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: gnome-control-center-2.25.2-passwd.patch
 Patch96: gnome-control-center-2.25.2-gecos.patch
@@ -182,7 +185,7 @@ for the GNOME desktop.
 %patch30 -p1 -b .default-layout-toggle
 %patch52 -p1 -b .shell-markup
 %patch56 -p1 -b .best-shapes
-
+%patch57 -p1 -b .more-enroll
 # vendor configuration patches
 %patch95 -p1 -b .passwd
 #%patch96 -p1 -b .gecos
@@ -347,6 +350,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
+* Thu Aug 19 2010 Bastien Nocera <bnocera at redhat.com> 2.30.1-3
+- Fix enrollment on UPEK Eikon II devices
+
 * Tue May 11 2010 Matthias Clasen <mclasen at redhat.com> 2.30.1-2
 - Install the PolicyKit policy for setting the default background
   in the right location