rpms/control-center/F-11 control-center.spec, 1.445, 1.446 gcc-pam-fprintd-avail.patch, 1.1, 1.2

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/control-center/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23718

Modified Files:
	control-center.spec gcc-pam-fprintd-avail.patch 
Log Message:
* Thu Apr 16 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.0-5
- Disable the fingerprint enrollment if gdm-plugin-fingerprint
  isn't installed



Index: control-center.spec
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-11/control-center.spec,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- control-center.spec	10 Apr 2009 02:21:08 -0000	1.445
+++ control-center.spec	16 Apr 2009 16:15:14 -0000	1.446
@@ -23,7 +23,7 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 2.26.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -360,6 +360,10 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Thu Apr 16 2009 - Bastien Nocera <bnocera at redhat.com> - 2.26.0-5
+- Disable the fingerprint enrollment if gdm-plugin-fingerprint
+  isn't installed
+
 * Thu Apr  9 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-4
 - Make mnemonics in display capplet work
 

gcc-pam-fprintd-avail.patch:

Index: gcc-pam-fprintd-avail.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/F-11/gcc-pam-fprintd-avail.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc-pam-fprintd-avail.patch	23 Jan 2009 11:21:08 -0000	1.1
+++ gcc-pam-fprintd-avail.patch	16 Apr 2009 16:15:14 -0000	1.2
@@ -1,8 +1,7 @@
-Index: capplets/about-me/gnome-about-me-fingerprint.c
-===================================================================
---- capplets/about-me/gnome-about-me-fingerprint.c	(revision 9203)
-+++ capplets/about-me/gnome-about-me-fingerprint.c	(working copy)
-@@ -92,6 +92,38 @@
+diff -up capplets/about-me/gnome-about-me-fingerprint.c gnome-control-center-2.26.0/capplets/about-me/gnome-about-me-fingerprint.c
+--- capplets/about-me/gnome-about-me-fingerprint.c	2009-04-16 16:51:51.000000000 +0100
++++ capplets/about-me/gnome-about-me-fingerprint.c	2009-04-16 16:56:49.000000000 +0100
+@@ -92,6 +92,40 @@ get_first_device (void)
  	return device;
  }
  
@@ -13,8 +12,10 @@
 +	gboolean ret;
 +	guint i;
 +
++	if (g_file_test ("/etc/pam.d/gdm-fingerprint", G_FILE_TEST_IS_REGULAR) == FALSE)
++		return FALSE;
 +	if (g_file_get_contents ("/etc/sysconfig/authconfig", &contents, NULL, NULL) == FALSE)
-+		return TRUE;
++		return FALSE;
 +
 +	lines = g_strsplit (contents, "\n", -1);
 +	g_free (contents);
@@ -41,7 +42,7 @@
  static const char *
  get_reason_for_error (const char *dbus_error)
  {
-@@ -146,29 +178,24 @@
+@@ -146,29 +180,24 @@ set_fingerprint_label (GtkWidget *enable
  	gtk_widget_set_no_show_all (enable, TRUE);
  	gtk_widget_set_no_show_all (disable, TRUE);
  
@@ -79,7 +80,7 @@
  		}
  		fingers = NULL;
  	}
-@@ -185,6 +212,11 @@
+@@ -185,6 +214,11 @@ set_fingerprint_label (GtkWidget *enable
  
  	g_strfreev (fingers);
  	g_object_unref (device);