Hello community,
here is the log from the commit of package gnome-screensaver
checked in at Tue Nov 25 16:19:05 CET 2008.
--------
--- GNOME/gnome-screensaver/gnome-screensaver.changes 2008-11-11 11:51:03.000000000 +0100
+++ /mounts/work_src_done/STABLE/gnome-screensaver/gnome-screensaver.changes 2008-11-24 13:58:35.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Nov 24 13:54:03 CET 2008 - thoenig@suse.de
+
+- don't bail out if fingerprint reader device is busy (bnc#448166)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-screensaver.spec ++++++
--- /var/tmp/diff_new_pack.K12261/_old 2008-11-25 16:18:32.000000000 +0100
+++ /var/tmp/diff_new_pack.K12261/_new 2008-11-25 16:18:32.000000000 +0100
@@ -29,7 +29,7 @@
BuildRequires: dbus-1-devel dbus-1-glib
%endif
Version: 2.24.0
-Release: 6
+Release: 7
Url: http://www.gnome.org/
Group: System/GUI/GNOME
License: GPL v2 or later
@@ -148,6 +148,8 @@
%files lang -f %{name}.lang
%changelog
+* Mon Nov 24 2008 thoenig@suse.de
+- don't bail out if fingerprint reader device is busy (bnc#448166)
* Mon Nov 10 2008 rodrigo@novell.com
- Add upstream patch for bgo#555701
* Mon Nov 03 2008 vuntz@novell.com
++++++ gnome-screensaver-finger-print.patch ++++++
--- /var/tmp/diff_new_pack.K12261/_old 2008-11-25 16:18:33.000000000 +0100
+++ /var/tmp/diff_new_pack.K12261/_new 2008-11-25 16:18:33.000000000 +0100
@@ -1,6 +1,10 @@
---- configure.ac 2008-10-27 05:38:10.000000000 -0400
-+++ configure.ac 2008-10-27 05:38:22.000000000 -0400
-@@ -917,6 +917,21 @@
+Index: configure.ac
+===================================================================
+--- configure.ac.orig
++++ configure.ac
+@@ -915,10 +915,25 @@ if test "x$have_libnotify" = "xyes"; the
+ AC_SUBST(LIBNOTIFY_LIBS)
+ AC_DEFINE(WITH_LIBNOTIFY, 1, [Define for libnotify support])
fi
dnl ---------------------------------------------------------------------------
@@ -22,9 +26,15 @@
dnl Finish
dnl ---------------------------------------------------------------------------
---- src/gnome-screensaver-dialog.c 2008-10-27 05:38:10.000000000 -0400
-+++ src/gnome-screensaver-dialog.c 2008-10-27 05:41:09.000000000 -0400
-@@ -30,6 +30,11 @@
+ AC_SUBST(AUTH_LIBS)
+ AC_SUBST(SAVER_LIBS)
+Index: src/gnome-screensaver-dialog.c
+===================================================================
+--- src/gnome-screensaver-dialog.c.orig
++++ src/gnome-screensaver-dialog.c
+@@ -28,10 +28,15 @@
+ #include
+ #include
#include
#include
@@ -36,7 +46,11 @@
#include
#include
#include
-@@ -66,6 +71,12 @@
+
+ #include "gs-lock-plug.h"
+@@ -64,10 +69,16 @@ static GOptionEntry entries [] = {
+ { "away-message", 0, 0, G_OPTION_ARG_STRING, &away_message,
+ N_("Message to show in the dialog"), N_("MESSAGE") },
{ NULL }
};
@@ -49,7 +63,11 @@
static char *
get_id_string (GtkWidget *widget)
{
-@@ -333,12 +344,119 @@
+ char *id = NULL;
+
+@@ -331,16 +342,122 @@ response_cb (GSLockPlug *plug,
+ (response_id == GTK_RESPONSE_DELETE_EVENT)) {
+ quit_response_cancel ();
}
}
@@ -92,7 +110,7 @@
+{
+ GSLockPlug *plug = (GSLockPlug *) user_data;
+
-+ if (fp_dev) {
++ if (fp_dev && fp_data) {
+ gboolean result = FALSE;
+ gboolean retry;
+ struct fp_img *img = NULL;
@@ -138,7 +156,6 @@
+ retry = TRUE;
+ g_debug ("Finger print verification failed with error: %d", r);
+ break;
-+
+ }
+ } while (retry);
+
@@ -160,7 +177,7 @@
+#ifdef WITH_LIBFPRINT
+ static pthread_t fprint_thread = -1;
+
-+ if (fprint_thread == -1) {
++ if (fp_dev && fp_data && fprint_thread == -1) {
+ if (pthread_create (&fprint_thread, NULL, fprint_thread_func, plug)) {
+ gs_debug ("Thread creation for finger print auth failed");
+ }
@@ -169,7 +186,11 @@
again = TRUE;
res = do_auth_check (plug);
-@@ -529,6 +647,22 @@
+
+ if (res) {
+@@ -527,10 +644,26 @@ lock_initialization (int *argc,
+ #endif /* NO_LOCKING */
+
return TRUE;
}
@@ -181,7 +202,7 @@
+ struct fp_driver *drv;
+ if (!ddev)
+ return NULL;
-+
++
+ drv = fp_dscv_dev_get_driver (ddev);
+ g_debug ("Found device claimed by %s driver\n", fp_driver_get_full_name (drv));
+
@@ -192,42 +213,63 @@
int
main (int argc,
char **argv)
-@@ -548,6 +682,34 @@
+ {
+ GError *error = NULL;
+@@ -546,10 +679,38 @@ main (int argc,
+
+ if (! g_thread_supported ()) {
g_thread_init (NULL);
}
+#ifdef WITH_LIBFPRINT
+ /* Initialize fprint for fingerprint reading for authentication */
+ if (fp_init () < 0) {
-+ fprintf (stderr, "Failed to initialize libfprint");
-+ exit (1);
-+ }
-+
-+ fp_discovered_devs = fp_discover_devs ();
-+ if (fp_discovered_devs) {
-+ fp_ddev = discover_fingerprint_device (fp_discovered_devs);
-+ if (fp_ddev) {
-+ fp_dev = fp_dev_open (fp_ddev);
-+ if (fp_dev) {
-+ if (fp_print_data_load (fp_dev, RIGHT_INDEX, &fp_data) == 0) {
-+ } else {
-+ fprintf (stderr, "Failed to load fingerprint");
-+ fprintf (stderr, "Did you remember to enroll your right index finger first ?");
-+ }
-+ } else
-+ fprintf (stderr, "Could not open fingerprint device");
-+ } else
-+ g_debug ("No fingerprint devices detected");
-+
-+ fp_dscv_devs_free (fp_discovered_devs);
-+ } else
-+ g_debug ("Could not discover fingerprint devices");
++ g_debug ("Failed to initialize libfprint");
++ } else {
++ fp_data = NULL;
++ fp_discovered_devs = fp_discover_devs ();
++ if (fp_discovered_devs) {
++ fp_ddev = discover_fingerprint_device (fp_discovered_devs);
++ if (fp_ddev) {
++ fp_dev = fp_dev_open (fp_ddev);
++ if (fp_dev) {
++ if (fp_print_data_load (fp_dev, RIGHT_INDEX, &fp_data) == 0) {
++ } else {
++ g_debug ("Failed to load fingerprint");
++ g_debug ("Did you remember to enroll your right index finger first?");
++ }
++ } else
++ g_debug ("Could not open fingerprint device");
++ } else
++ g_debug ("No fingerprint devices detected");
++
++ fp_dscv_devs_free (fp_discovered_devs);
++ } else
++ g_debug ("Could not discover fingerprint devices");
++ }
+#endif
+
g_type_init ();
gs_profile_start (NULL);
-@@ -603,6 +765,14 @@
+
+ if (! privileged_initialization (&argc, argv, verbose)) {
+@@ -558,11 +719,11 @@ main (int argc,
+ }
+
+ error = NULL;
+ if (! gtk_init_with_args (&argc, &argv, NULL, entries, NULL, &error)) {
+ if (error != NULL) {
+- fprintf (stderr, "%s", error->message);
++ g_debug ("%s", error->message);
+ g_error_free (error);
+ }
+ exit (1);
+ }
+
+@@ -601,10 +762,18 @@ main (int argc,
+ gtk_main ();
+
if (xvkbd_running)
kill (xvkbd_pid, 9);
@@ -242,9 +284,15 @@
gs_profile_end (NULL);
gs_debug_shutdown ();
---- src/Makefile.am 2008-10-27 05:38:10.000000000 -0400
-+++ src/Makefile.am 2008-10-27 05:38:22.000000000 -0400
-@@ -31,6 +31,7 @@
+ return 0;
+ }
+Index: src/Makefile.am
+===================================================================
+--- src/Makefile.am.orig
++++ src/Makefile.am
+@@ -29,10 +29,11 @@ INCLUDES = \
+ $(AUTH_CFLAGS) \
+ $(DEBUG_CFLAGS) \
$(DBUS_CFLAGS) \
$(LIBGNOMEKBDUI_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
@@ -252,7 +300,11 @@
$(NULL)
bin_PROGRAMS = \
-@@ -150,6 +151,7 @@
+ gnome-screensaver \
+ gnome-screensaver-command \
+@@ -148,10 +149,11 @@ gnome_screensaver_dialog_LDADD = \
+ $(GNOME_SCREENSAVER_DIALOG_LIBS)\
+ $(SAVER_LIBS) \
$(AUTH_LIBS) \
$(LIBGNOMEKBDUI_LIBS) \
$(LIBNOTIFY_LIBS) \
@@ -260,3 +312,5 @@
$(NULL)
BUILT_SOURCES = \
+ gs-marshal.c \
+ gs-marshal.h \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org