← Back to branch summary

~ubuntu-branches/ubuntu/precise/metacity/precise

« back to all changes in this revision

Viewing changes to debian/patches/07_fix_wm_cm_selection_timestamp.patch

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2009-12-03 00:32:57 UTC
  • mfrom: (2.1.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091203003257-ixn0ozsghxbrnec4
Tags: 1:2.28.0-2ubuntu1
https://launchpad.net/bugs/490214
* Sync with Debian unstable, remaining changes: (LP: #490214)
* debian/metacity-common.gconf-defaults:
  - Default to two workspaces
  - Fix default keybinding for shift-alt-tab
* debian/patches/03_strict_focus.patch:
  - Strict focus
* debian/patches/04_worspaces_default_name.patch:
  - Use "Desk" instead of "Workspace" for default workspaces naming.
* debian/patches/05_raise_on_click_for_click_mode.patch:
  - Use raise on click option
* debian/patches/06_drop_Werror.patch
  - Build without -Werror in CFLAGS which fixes FTBFS on armel
* debian/patches/07_fix_wm_cm_selection_timestamp.patch
  - Fix metacity to give up the compositing manager
* debian/watch:
  - Watch for unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/07_fix_wm_cm_selection_timestamp.patch
 
1
#
 
2
# Ubuntu: https://bugs.launchpad.net/bugs/178953
 
3
# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=530702
 
4
# Patch: http://bugzilla.gnome.org/attachment.cgi?id=141537
 
5
# Description: fix metacity to give up the compositing manager 
 
6
#
 
7
diff -Nur -x '*.orig' -x '*~' metacity-2.27.1/src/core/screen.c metacity-2.27.1.new/src/core/screen.c
 
8
--- metacity-2.27.1/src/core/screen.c   2009-09-09 06:55:35.000000000 +1000
 
9
+++ metacity-2.27.1.new/src/core/screen.c       2009-09-10 16:47:03.000000000 +1000
 
10
@@ -2791,11 +2791,14 @@
 
11
   char selection[32];
 
12
   Atom a;
 
13
 
 
14
+  screen->wm_cm_timestamp = meta_display_get_current_time_roundtrip (
 
15
+                                                               screen->display);
 
16
+
 
17
   g_snprintf (selection, sizeof(selection), "_NET_WM_CM_S%d", screen->number);
 
18
   meta_verbose ("Setting selection: %s\n", selection);
 
19
   a = XInternAtom (screen->display->xdisplay, selection, FALSE);
 
20
   XSetSelectionOwner (screen->display->xdisplay, a, 
 
21
-                      screen->wm_cm_selection_window, CurrentTime);
 
22
+                      screen->wm_cm_selection_window, screen->wm_cm_timestamp);
 
23
 }
 
24
 
 
25
 void
 
26
@@ -2806,6 +2809,7 @@
 
27
 
 
28
   g_snprintf (selection, sizeof(selection), "_NET_WM_CM_S%d", screen->number);
 
29
   a = XInternAtom (screen->display->xdisplay, selection, FALSE);
 
30
-  XSetSelectionOwner (screen->display->xdisplay, a, None, CurrentTime);
 
31
+  XSetSelectionOwner (screen->display->xdisplay, a,
 
32
+                      None, screen->wm_cm_timestamp);
 
33
 }
 
34
 #endif /* HAVE_COMPOSITE_EXTENSIONS */
 
35
diff -Nur -x '*.orig' -x '*~' metacity-2.27.1/src/core/screen-private.h metacity-2.27.1.new/src/core/screen-private.h
 
36
--- metacity-2.27.1/src/core/screen-private.h   2009-09-09 06:55:35.000000000 +1000
 
37
+++ metacity-2.27.1.new/src/core/screen-private.h       2009-09-10 16:47:03.000000000 +1000
 
38
@@ -113,6 +113,7 @@
 
39
 
 
40
 #ifdef HAVE_COMPOSITE_EXTENSIONS
 
41
   Window wm_cm_selection_window;
 
42
+  guint32 wm_cm_timestamp;
 
43
 #endif
 
44
 
 
45
   guint work_area_idle;