summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2001-11-27 03:41:43 +0000
committerHavoc Pennington <hp@src.gnome.org>2001-11-27 03:41:43 +0000
commit420c29dea98c52610bd74adcbc05973ddb465cdd (patch)
treeca7b710843d4d02af7d3c7a970e25c4173016a95
parent5ccb32efed1b12c06cfdd6de872d7a91cbf14250 (diff)
downloadmetacity-420c29dea98c52610bd74adcbc05973ddb465cdd.tar.gz
metacity-420c29dea98c52610bd74adcbc05973ddb465cdd.tar.bz2
add error trap
2001-11-26 Havoc Pennington <hp@redhat.com> * src/window.c (window_query_root_pointer): add error trap
-rw-r--r--ChangeLog4
-rw-r--r--src/window.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 58c47c0..b8b510e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-26 Havoc Pennington <hp@redhat.com>
+
+ * src/window.c (window_query_root_pointer): add error trap
+
2001-11-27 Jesus Bravo Alvarez <jba@pobox.com>
* configure.in: Added gl (Galician) to ALL_LINGUAS.
diff --git a/src/window.c b/src/window.c
index c7a3b7e..41b002d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5021,6 +5021,8 @@ window_query_root_pointer (MetaWindow *window,
int win_x_return, win_y_return;
unsigned int mask_return;
+ meta_error_trap_push (window->display);
+
XQueryPointer (window->display->xdisplay,
window->xwindow,
&root_return,
@@ -5031,6 +5033,8 @@ window_query_root_pointer (MetaWindow *window,
&win_y_return,
&mask_return);
+ meta_error_trap_pop (window->display);
+
if (x)
*x = root_x_return;
if (y)