summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2002-01-02 17:42:14 +0000
committerHavoc Pennington <hp@src.gnome.org>2002-01-02 17:42:14 +0000
commit86e9191d34570535e59f0fd73c39a1697cceac40 (patch)
treeee75dfded0beb919ab4a0dca8043b20d2b32ef48
parentedb4d0a8c470233f4299c0d4929d8345a3765dc8 (diff)
downloadmetacity-86e9191d34570535e59f0fd73c39a1697cceac40.tar.gz
metacity-86e9191d34570535e59f0fd73c39a1697cceac40.tar.bz2
add a server grab here since we were failing to have one when calling the
2001-12-21 Havoc Pennington <hp@redhat.com> * src/frame.c (meta_window_ensure_frame): add a server grab here since we were failing to have one when calling the function
-rw-r--r--ChangeLog5
-rw-r--r--src/frame.c7
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d2d4351..99ab90d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-21 Havoc Pennington <hp@redhat.com>
+
+ * src/frame.c (meta_window_ensure_frame): add a server grab
+ here since we were failing to have one when calling the function
+
2001-12-27 Duarte Loreto <happyguy_pt@hotmail.com>
* configure.in: Added portuguese to ALL_LINGUAS
diff --git a/src/frame.c b/src/frame.c
index 0599c84..41a78b8 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -36,11 +36,12 @@ meta_window_ensure_frame (MetaWindow *window)
{
MetaFrame *frame;
XSetWindowAttributes attrs;
-
- g_return_if_fail (window->display->server_grab_count > 0);
if (window->frame)
return;
+
+ /* See comment below for why this is required. */
+ meta_display_grab (window->display);
frame = g_new (MetaFrame, 1);
@@ -127,6 +128,8 @@ meta_window_ensure_frame (MetaWindow *window)
/* Move keybindings to frame instead of window */
meta_window_grab_keys (window);
+
+ meta_display_ungrab (window->display);
}
void