← Back to branch summary

~gnome3-team/gnome-screensaver/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/02_keep_unlock_raised.patch

  • Committer: Robert Ancell
  • Date: 2010-12-08 04:40:34 UTC
  • Revision ID: robert.ancell@canonical.com-20101208044034-oxr91iinkcn9xfn6
* New upstream release
* debian/control:
  - Bump build-depends on libgtk3.0-dev, libgnome-desktop-3-dev,
    libgnotify4-dev
  - Use standards-version 3.9.1
  - Update Vcs-Bzr link
* debian/patches/00git_gnome_bg.patch:
* debian/patches/00git_gnome_rr.patch:
* debian/patches/00git_size_request.patch:
  - Git patches to build against latest GTK+ and libgnome-desktop

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_keep_unlock_raised.patch
1
1
Description: ?
2
2
Author: ?
3
3
 
4
 
diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.29.90/src/gs-window-x11.c gnome-screensaver-2.29.90.new/src/gs-window-x11.c
5
 
--- gnome-screensaver-2.29.90/src/gs-window-x11.c       2010-02-08 15:49:59.000000000 +0000
6
 
+++ gnome-screensaver-2.29.90.new/src/gs-window-x11.c   2010-02-09 19:50:21.692599167 +0000
7
 
@@ -806,8 +806,15 @@
 
4
Index: gnome-screensaver-2.91.0/src/gs-window-x11.c
 
5
===================================================================
 
6
--- gnome-screensaver-2.91.0.orig/src/gs-window-x11.c   2010-10-01 00:32:20.000000000 +1000
 
7
+++ gnome-screensaver-2.91.0/src/gs-window-x11.c        2010-12-08 14:41:30.677450001 +1100
 
8
@@ -719,8 +719,15 @@
8
9
         case ConfigureNotify:
9
10
                 {
10
11
                         XConfigureEvent *xce = &ev->xconfigure;
11
12
+                       gboolean our_window;
12
13
+                       gboolean we_are_showing_lock_box;
13
14
+                       gboolean own_raise_event;
14
 
+
 
15
 
 
16
-                        if (! x11_window_is_ours (xce->window)) {
15
17
+                       our_window = x11_window_is_ours (xce->window);
16
18
+                       we_are_showing_lock_box = window->priv->lock_box;
17
 
+                       own_raise_event = GDK_WINDOW_XID (GTK_WIDGET (window)->window) == xce->window;
18
 
 
19
 
-                        if (! x11_window_is_ours (xce->window)) {
 
19
+                       own_raise_event = GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window))) == xce->window;
 
20
+
20
21
+                        if (!our_window || (we_are_showing_lock_box && !own_raise_event)) {
21
22
                                 gs_window_raise (window);
22
23
                         } else {