summaryrefslogtreecommitdiffstats
path: root/Stop-confusing-GDK-s-grab-tracking.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Stop-confusing-GDK-s-grab-tracking.patch')
-rw-r--r--Stop-confusing-GDK-s-grab-tracking.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/Stop-confusing-GDK-s-grab-tracking.patch b/Stop-confusing-GDK-s-grab-tracking.patch
index abcca67..c289453 100644
--- a/Stop-confusing-GDK-s-grab-tracking.patch
+++ b/Stop-confusing-GDK-s-grab-tracking.patch
@@ -1,5 +1,5 @@
-From c81be0bc98ff79fcdba7d60276ae63048e53b7c8 Mon Sep 17 00:00:00 2001
-From: Owen W. Taylor <otaylor@fishsoup.net>
+From ab0428a82f8233829c36e2a3ac0ed0848571c59d Mon Sep 17 00:00:00 2001
+From: "Owen W. Taylor" <otaylor@fishsoup.net>
Date: Wed, 9 Jun 2010 19:38:35 -0400
Subject: [PATCH] Stop confusing GDK's grab tracking
@@ -22,10 +22,10 @@ http://bugzilla.gnome.org/show_bug.cgi?id=599181
2 files changed, 138 insertions(+), 0 deletions(-)
diff --git a/src/core/display-private.h b/src/core/display-private.h
-index 19287f3..8bc00fb 100644
+index fee321c..7f779fd 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
-@@ -223,6 +223,13 @@ struct _MetaDisplay
+@@ -232,6 +232,13 @@ struct _MetaDisplay
/* Closing down the display */
int closing;
@@ -40,7 +40,7 @@ index 19287f3..8bc00fb 100644
GHashTable *groups_by_leader;
diff --git a/src/core/display.c b/src/core/display.c
-index 4c7b4c0..bdd3016 100644
+index 5bcf025..0c5f61d 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -77,6 +77,7 @@
@@ -51,9 +51,9 @@ index 4c7b4c0..bdd3016 100644
#define GRAB_OP_IS_WINDOW_SWITCH(g) \
(g == META_GRAB_OP_KEYBOARD_TABBING_NORMAL || \
-@@ -1396,6 +1397,133 @@ handle_net_restack_window (MetaDisplay* display,
+@@ -1362,6 +1363,133 @@ meta_display_queue_autoraise_callback (MetaDisplay *display,
+ display->autoraise_window = window;
}
- #endif
+/* We do some of our event handling in core/frames.c, which expects
+ * GDK events delivered by GTK+. However, since the transition to
@@ -185,7 +185,7 @@ index 4c7b4c0..bdd3016 100644
/**
* This is the most important function in the whole program. It is the heart,
* it is the nexus, it is the Grand Central Station of Metacity's world.
-@@ -2403,6 +2531,9 @@ event_callback (XEvent *event,
+@@ -2387,6 +2515,9 @@ event_callback (XEvent *event,
event,
window);
}
@@ -196,5 +196,5 @@ index 4c7b4c0..bdd3016 100644
display->current_time = CurrentTime;
return filter_out_event;
--
-1.7.0.1
+1.7.9