Hello community,
here is the log from the commit of package gnome-screensaver for openSUSE:Factory
checked in at Fri Jan 14 16:48:08 CET 2011.
--------
--- GNOME/gnome-screensaver/gnome-screensaver.changes 2010-09-29 01:39:29.000000000 +0200
+++ gnome-screensaver/gnome-screensaver.changes 2011-01-11 22:54:00.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Jan 11 22:51:55 CET 2011 - hpj@novell.com
+
+- Update gnome-screensaver-xvkbd-on-lock.patch, fixing the case
+ where on tablets, xvkbd would persist after the screensaver was
+ unlocked (bnc#395843).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-screensaver.spec ++++++
--- /var/tmp/diff_new_pack.dvGhiv/_old 2011-01-14 16:47:24.000000000 +0100
+++ /var/tmp/diff_new_pack.dvGhiv/_new 2011-01-14 16:47:24.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package gnome-screensaver (Version 2.30.2)
+# spec file for package gnome-screensaver
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
Name: gnome-screensaver
Version: 2.30.2
-Release: 1
+Release: 2
Url: http://www.gnome.org/
Group: System/GUI/GNOME
License: GPLv2+
++++++ gnome-screensaver-xvkbd-on-lock.patch ++++++
--- /var/tmp/diff_new_pack.dvGhiv/_old 2011-01-14 16:47:24.000000000 +0100
+++ /var/tmp/diff_new_pack.dvGhiv/_new 2011-01-14 16:47:24.000000000 +0100
@@ -1,7 +1,14 @@
-diff -upr gnome-screensaver-2.20.0-orig/src/gnome-screensaver-dialog.c gnome-screensaver-2.20.0/src/gnome-screensaver-dialog.c
---- gnome-screensaver-2.20.0-orig/src/gnome-screensaver-dialog.c 2007-09-17 23:15:11.000000000 +0200
-+++ gnome-screensaver-2.20.0/src/gnome-screensaver-dialog.c 2007-10-04 12:43:28.000000000 +0200
-@@ -109,10 +109,17 @@ response_ok (void)
+commit a6180a624e2f325f32edecd284fa8c394a25ec45
+Author: Hans Petter Jansson
+Date: Tue Jan 11 22:31:04 2011 +0100
+
+ Patch 7: gnome-screensaver-xvkbd-on-lock.patch
+
+diff --git a/src/gnome-screensaver-dialog.c b/src/gnome-screensaver-dialog.c
+index 9d72fcb..2db1e9b 100644
+--- a/src/gnome-screensaver-dialog.c
++++ b/src/gnome-screensaver-dialog.c
+@@ -115,10 +115,19 @@ response_ok (void)
fflush (stdout);
}
@@ -13,24 +20,52 @@
{
response_ok ();
+
-+ if (xvkbd_running)
++ if (xvkbd_running) {
++ xvkbd_running = FALSE;
+ kill (xvkbd_pid, 9);
++ }
+
gtk_main_quit ();
return FALSE;
}
-@@ -121,6 +128,10 @@ static gboolean
+@@ -127,6 +136,12 @@ static gboolean
quit_response_cancel (void)
{
response_cancel ();
+
-+ if (xvkbd_running)
++ if (xvkbd_running) {
++ xvkbd_running = FALSE;
+ kill (xvkbd_pid, 9);
++ }
+
gtk_main_quit ();
return FALSE;
}
-@@ -566,10 +577,27 @@ main (int argc,
+@@ -418,6 +433,14 @@ popup_dialog_idle (void)
+ return FALSE;
+ }
+
++static void
++handle_sigterm (int sig)
++{
++ if (xvkbd_running)
++ kill (xvkbd_pid, 9);
++
++ exit (0);
++}
+
+ /*
+ * Copyright (c) 1991-2004 Jamie Zawinski
+@@ -578,6 +601,8 @@ main (int argc,
+ exit (1);
+ }
+
++ signal (SIGTERM, handle_sigterm);
++
+ if (show_version) {
+ g_print ("%s %s\n", argv [0], VERSION);
+ exit (1);
+@@ -594,10 +619,27 @@ main (int argc,
gs_debug_init (verbose, FALSE);
@@ -58,13 +93,11 @@
gs_profile_end (NULL);
gs_debug_shutdown ();
-Only in gnome-screensaver-2.20.0/src: gnome-screensaver-dialog.c~
-Only in gnome-screensaver-2.20.0/src: gs-lock-plug.c~
-Only in gnome-screensaver-2.20.0/src: gs-lock-plug.c.orig
-diff -upr gnome-screensaver-2.20.0-orig/src/gs-window-x11.c gnome-screensaver-2.20.0/src/gs-window-x11.c
---- gnome-screensaver-2.20.0-orig/src/gs-window-x11.c 2007-09-17 23:15:11.000000000 +0200
-+++ gnome-screensaver-2.20.0/src/gs-window-x11.c 2007-10-04 00:09:24.000000000 +0200
-@@ -647,6 +647,49 @@ x11_window_is_ours (Window window)
+diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
+index 4216ea4..3b6b1f7 100644
+--- a/src/gs-window-x11.c
++++ b/src/gs-window-x11.c
+@@ -769,6 +769,49 @@ x11_window_is_ours (Window window)
return ret;
}
@@ -114,7 +147,7 @@
#ifdef HAVE_SHAPE_EXT
static void
unshape_window (GSWindow *window)
-@@ -669,6 +712,16 @@ gs_window_xevent (GSWindow *window,
+@@ -791,6 +834,16 @@ gs_window_xevent (GSWindow *window,
/* MapNotify is used to tell us when new windows are mapped.
ConfigureNofify is used to tell us when windows are raised. */
switch (ev->xany.type) {
@@ -131,7 +164,7 @@
case MapNotify:
{
XMapEvent *xme = &ev->xmap;
-@@ -686,7 +739,7 @@ gs_window_xevent (GSWindow *window,
+@@ -808,7 +861,7 @@ gs_window_xevent (GSWindow *window,
XConfigureEvent *xce = &ev->xconfigure;
if (! x11_window_is_ours (xce->window)) {
@@ -140,5 +173,3 @@
} else {
gs_debug ("not raising our windows");
}
-Only in gnome-screensaver-2.20.0/src: gs-window-x11.c~
-Only in gnome-screensaver-2.20.0/src: gs-window-x11.c.orig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org