Hello community, here is the log from the commit of package gnome-screensaver checked in at Tue Oct 28 00:03:45 CET 2008. -------- --- GNOME/gnome-screensaver/gnome-screensaver.changes 2008-10-23 12:55:20.000000000 +0200 +++ /d/STABLE/gnome-screensaver/gnome-screensaver.changes 2008-10-27 17:37:27.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 27 17:40:35 CEST 2008 - thoenig@suse.de + +- Updated gnome-screensaver-finger-print.patch to fix some issues + as stated in bnc#438624 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-screensaver.spec ++++++ --- /var/tmp/diff_new_pack.xI6264/_old 2008-10-28 00:03:02.000000000 +0100 +++ /var/tmp/diff_new_pack.xI6264/_new 2008-10-28 00:03:02.000000000 +0100 @@ -29,7 +29,7 @@ BuildRequires: dbus-1-devel dbus-1-glib %endif Version: 2.24.0 -Release: 2 +Release: 3 Url: http://www.gnome.org/ Group: System/GUI/GNOME License: GPL v2 or later @@ -149,6 +149,9 @@ %files lang -f %{name}.lang %changelog +* Mon Oct 27 2008 thoenig@suse.de +- Updated gnome-screensaver-finger-print.patch to fix some issues + as stated in bnc#438624 * Thu Oct 23 2008 rodrigo@novell.com - Added gnome-screensaver-finger-print.patch for finger print authentication on lock screen dialog (fate#301953) ++++++ gnome-screensaver-finger-print.patch ++++++ --- /var/tmp/diff_new_pack.xI6264/_old 2008-10-28 00:03:02.000000000 +0100 +++ /var/tmp/diff_new_pack.xI6264/_new 2008-10-28 00:03:02.000000000 +0100 @@ -1,8 +1,6 @@ -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -917,6 +917,21 @@ if test "x$have_libnotify" = "xyes"; the +--- configure.ac 2008-10-27 05:38:10.000000000 -0400 ++++ configure.ac 2008-10-27 05:38:22.000000000 -0400 +@@ -917,6 +917,21 @@ fi dnl --------------------------------------------------------------------------- @@ -24,10 +22,8 @@ dnl Finish dnl --------------------------------------------------------------------------- -Index: src/gnome-screensaver-dialog.c -=================================================================== ---- src/gnome-screensaver-dialog.c.orig -+++ src/gnome-screensaver-dialog.c +--- 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 @@ #include <sys/wait.h> #include <unistd.h> @@ -40,7 +36,7 @@ #include <glib/gi18n.h> #include <gdk/gdkx.h> #include <gtk/gtk.h> -@@ -66,6 +71,12 @@ static GOptionEntry entries [] = { +@@ -66,6 +71,12 @@ { NULL } }; @@ -53,7 +49,7 @@ static char * get_id_string (GtkWidget *widget) { -@@ -333,19 +344,132 @@ response_cb (GSLockPlug *plug, +@@ -333,12 +344,119 @@ } } @@ -101,7 +97,7 @@ + gboolean retry; + struct fp_img *img = NULL; + -+ auth_message_handler_idle (_("Scan your finger now"), plug); ++ auth_message_handler_idle (_("Please enter password or swipe your finger"), plug); + + do { + int r; @@ -173,21 +169,7 @@ again = TRUE; res = do_auth_check (plug); - - if (res) { - again = FALSE; -- g_idle_add ((GSourceFunc)quit_response_ok, NULL); -+ -+#ifdef WITH_LIBFPRINT -+ if (fprint_thread != -1) -+ pthread_kill (fprint_thread, SIGKILL); -+#endif -+ -+ g_idle_add ((GSourceFunc) quit_response_ok, NULL); - } else { - loop_counter++; - -@@ -529,6 +653,22 @@ lock_initialization (int *argc, +@@ -529,6 +647,22 @@ return TRUE; } @@ -210,7 +192,7 @@ int main (int argc, char **argv) -@@ -548,6 +688,34 @@ main (int argc, +@@ -548,6 +682,34 @@ g_thread_init (NULL); } @@ -245,7 +227,7 @@ g_type_init (); gs_profile_start (NULL); -@@ -603,6 +771,14 @@ main (int argc, +@@ -603,6 +765,14 @@ if (xvkbd_running) kill (xvkbd_pid, 9); @@ -260,11 +242,9 @@ gs_profile_end (NULL); gs_debug_shutdown (); -Index: src/Makefile.am -=================================================================== ---- src/Makefile.am.orig -+++ src/Makefile.am -@@ -31,6 +31,7 @@ INCLUDES = \ +--- 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 @@ $(DBUS_CFLAGS) \ $(LIBGNOMEKBDUI_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ @@ -272,7 +252,7 @@ $(NULL) bin_PROGRAMS = \ -@@ -150,6 +151,7 @@ gnome_screensaver_dialog_LDADD = \ +@@ -150,6 +151,7 @@ $(AUTH_LIBS) \ $(LIBGNOMEKBDUI_LIBS) \ $(LIBNOTIFY_LIBS) \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de