Patchwork [meta-gnome/meta-oe/meta-xfce/V2,19/20] xfwm4: don't turn into unusablity after setting system time backwards

login
register
mail settings
Submitter Andreas Müller
Date June 19, 2013, 5:29 p.m.
Message ID <1371662967-31734-20-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/52053/
State Accepted
Commit 96f7caf0608cc1d407f8d9ec1732e7290ab8e5ea
Headers show

Comments

Andreas Müller - June 19, 2013, 5:29 p.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...-display-events-when-time-is-set-backward.patch |   33 ++++++++++++++++++++
 meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.1.bb       |    1 +
 2 files changed, 34 insertions(+), 0 deletions(-)
 create mode 100644 meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch

Patch

diff --git a/meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch b/meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch
new file mode 100644
index 0000000..08fd76b
--- /dev/null
+++ b/meta-xfce/recipes-xfce/xfwm4/files/0001-don-t-block-display-events-when-time-is-set-backward.patch
@@ -0,0 +1,33 @@ 
+From e87977696f03b0c9f72884f8e3e3ec3248dfd80a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Tue, 18 Jun 2013 12:46:42 +0200
+Subject: [PATCH] don't block display events when time is set backwards
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Submitted [1]
+
+[1] https://bugzilla.xfce.org/show_bug.cgi?id=10184
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/display.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/display.c b/src/display.c
+index 00318d5..651bc7a 100644
+--- a/src/display.c
++++ b/src/display.c
+@@ -733,7 +733,7 @@ myDisplayUpdateCurrentTime (DisplayInfo *display, XEvent *ev)
+             break;
+     }
+ 
+-    if ((timestamp != (guint32) CurrentTime) && TIMESTAMP_IS_BEFORE(display->current_time, timestamp))
++    if ((timestamp != (guint32) CurrentTime) /*&& TIMESTAMP_IS_BEFORE(display->current_time, timestamp)*/)
+     {
+         display->current_time = timestamp;
+     }
+-- 
+1.7.6.5
+
diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.1.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.1.bb
index 687339b..86ac20e 100644
--- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.1.bb
+++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.10.1.bb
@@ -8,6 +8,7 @@  inherit xfce update-alternatives
 
 SRC_URI[md5sum] = "10de50c79ed944cbb9c87741062c2a76"
 SRC_URI[sha256sum] = "380c44fba6eb779e34be0fe94f3726cfa131803014d6073c45aec8a1257fa740"
+SRC_URI += "file://0001-don-t-block-display-events-when-time-is-set-backward.patch"
 
 python populate_packages_prepend () {
     themedir = d.expand('${datadir}/themes')