rpms/gnome-screensaver/devel gnome-screensaver-2.26.0-securitytoken.patch, 1.1, 1.2

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2931

Modified Files:
	gnome-screensaver-2.26.0-securitytoken.patch 
Log Message:
fix build


gnome-screensaver-2.26.0-securitytoken.patch:

Index: gnome-screensaver-2.26.0-securitytoken.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver-2.26.0-securitytoken.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-screensaver-2.26.0-securitytoken.patch	19 Mar 2009 04:29:57 -0000	1.1
+++ gnome-screensaver-2.26.0-securitytoken.patch	19 Mar 2009 04:47:07 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up gnome-screensaver-2.26.0/configure.ac.securitytoken gnome-screensaver-2.26.0/configure.ac
 --- gnome-screensaver-2.26.0/configure.ac.securitytoken	2009-03-18 13:20:20.000000000 -0400
-+++ gnome-screensaver-2.26.0/configure.ac	2009-03-19 00:10:49.586195203 -0400
++++ gnome-screensaver-2.26.0/configure.ac	2009-03-19 00:20:36.625194934 -0400
 @@ -45,6 +45,7 @@ GNOME_DESKTOP_REQUIRED_VERSION=2.23.2
  
  GLADE_REQUIRED_VERSION=2.5.0
@@ -44,7 +44,7 @@
  dnl ---------------------------------------------------------------------------
 diff -up gnome-screensaver-2.26.0/src/gs-auth-pam.c.securitytoken gnome-screensaver-2.26.0/src/gs-auth-pam.c
 --- gnome-screensaver-2.26.0/src/gs-auth-pam.c.securitytoken	2009-03-18 11:39:58.000000000 -0400
-+++ gnome-screensaver-2.26.0/src/gs-auth-pam.c	2009-03-19 00:10:49.588195131 -0400
++++ gnome-screensaver-2.26.0/src/gs-auth-pam.c	2009-03-19 00:20:36.632207149 -0400
 @@ -354,6 +354,13 @@ close_pam_handle (int status)
                                     status2,
                                     (status2 == PAM_SUCCESS ? "Success" : "Failure"));
@@ -61,7 +61,7 @@
          if (message_handled_condition != NULL) {
 diff -up gnome-screensaver-2.26.0/src/gs-monitor.c.securitytoken gnome-screensaver-2.26.0/src/gs-monitor.c
 --- gnome-screensaver-2.26.0/src/gs-monitor.c.securitytoken	2009-03-18 11:39:58.000000000 -0400
-+++ gnome-screensaver-2.26.0/src/gs-monitor.c	2009-03-19 00:18:11.671197701 -0400
++++ gnome-screensaver-2.26.0/src/gs-monitor.c	2009-03-19 00:46:39.466197461 -0400
 @@ -41,10 +41,15 @@
  #include "gs-prefs.h"
  #include "gs-debug.h"
@@ -227,7 +227,7 @@
          disconnect_watcher_signals (monitor);
          disconnect_listener_signals (monitor);
          disconnect_manager_signals (monitor);
-@@ -486,3 +540,34 @@ gs_monitor_start (GSMonitor *monitor,
+@@ -486,3 +540,30 @@ gs_monitor_start (GSMonitor *monitor,
  
          return TRUE;
  }
@@ -235,10 +235,6 @@
 +static void     
 +gs_monitor_simulate_user_activity (GSMonitor *monitor)
 +{
-+        /* in case the screen isn't blanked reset the
-+           idle watcher */
-+        gs_watcher_reset (monitor->priv->watcher);
-+
 +        /* request that the manager unlock -
 +           will pop up a dialog if necessary */
 +        gs_manager_request_unlock (monitor->priv->manager);
@@ -264,7 +260,7 @@
 +}
 diff -up gnome-screensaver-2.26.0/src/Makefile.am.securitytoken gnome-screensaver-2.26.0/src/Makefile.am
 --- gnome-screensaver-2.26.0/src/Makefile.am.securitytoken	2009-03-18 11:39:58.000000000 -0400
-+++ gnome-screensaver-2.26.0/src/Makefile.am	2009-03-19 00:10:49.593200016 -0400
++++ gnome-screensaver-2.26.0/src/Makefile.am	2009-03-19 00:20:36.635194085 -0400
 @@ -51,6 +51,18 @@ noinst_PROGRAMS = 	\
  	test-window	\
  	$(NULL)
@@ -294,7 +290,7 @@
  gnome_screensaver_LDFLAGS = -export-dynamic
 diff -up /dev/null gnome-screensaver-2.26.0/src/securitytoken.c
 --- /dev/null	2009-03-18 22:51:48.055015100 -0400
-+++ gnome-screensaver-2.26.0/src/securitytoken.c	2009-03-19 00:10:49.616204607 -0400
++++ gnome-screensaver-2.26.0/src/securitytoken.c	2009-03-19 00:20:36.637204629 -0400
 @@ -0,0 +1,680 @@
 +/* securitytoken.c - security token
 + * 
@@ -978,7 +974,7 @@
 +#endif
 diff -up /dev/null gnome-screensaver-2.26.0/src/securitytoken.h
 --- /dev/null	2009-03-18 22:51:48.055015100 -0400
-+++ gnome-screensaver-2.26.0/src/securitytoken.h	2009-03-19 00:10:49.617205095 -0400
++++ gnome-screensaver-2.26.0/src/securitytoken.h	2009-03-19 00:20:36.638249327 -0400
 @@ -0,0 +1,94 @@
 +/* securitytoken.h - api for reading and writing data to a security token 
 + *
@@ -1076,7 +1072,7 @@
 +#endif				/* SC_SECURITY_TOKEN_H */
 diff -up /dev/null gnome-screensaver-2.26.0/src/securitytokenmonitor.c
 --- /dev/null	2009-03-18 22:51:48.055015100 -0400
-+++ gnome-screensaver-2.26.0/src/securitytokenmonitor.c	2009-03-19 00:10:49.620212286 -0400
++++ gnome-screensaver-2.26.0/src/securitytokenmonitor.c	2009-03-19 00:20:36.641220270 -0400
 @@ -0,0 +1,1743 @@
 +/* securitytokenmonitor.c - monitor for security token insertion and
 + *                          removal events
@@ -2823,7 +2819,7 @@
 +#endif
 diff -up /dev/null gnome-screensaver-2.26.0/src/securitytokenmonitor.h
 --- /dev/null	2009-03-18 22:51:48.055015100 -0400
-+++ gnome-screensaver-2.26.0/src/securitytokenmonitor.h	2009-03-19 00:10:49.622199713 -0400
++++ gnome-screensaver-2.26.0/src/securitytokenmonitor.h	2009-03-19 00:20:36.643204483 -0400
 @@ -0,0 +1,84 @@
 +/* securitytokenmonitor.h - monitor for security token insertion and
 + *                          removal events