summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/display.c7
-rw-r--r--src/core/window.c7
2 files changed, 10 insertions, 4 deletions
diff --git a/src/core/display.c b/src/core/display.c
index d6c44d10..8169541b 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -4920,8 +4920,11 @@ prefs_changed_callback (MetaPreference pref,
while (tmp != NULL)
{
MetaWindow *w = tmp->data;
- meta_display_grab_focus_window_button (display, w);
- meta_display_grab_window_buttons (display, w->xwindow);
+ if (w->type != META_WINDOW_DOCK)
+ {
+ meta_display_grab_focus_window_button (display, w);
+ meta_display_grab_window_buttons (display, w->xwindow);
+ }
tmp = tmp->next;
}
diff --git a/src/core/window.c b/src/core/window.c
index 2b03b54a..e4bb13b6 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -659,8 +659,11 @@ meta_window_new_with_attrs (MetaDisplay *display,
meta_window_ensure_frame (window);
meta_window_grab_keys (window);
- meta_display_grab_window_buttons (window->display, window->xwindow);
- meta_display_grab_focus_window_button (window->display, window);
+ if (window->type != META_WINDOW_DOCK)
+ {
+ meta_display_grab_window_buttons (window->display, window->xwindow);
+ meta_display_grab_focus_window_button (window->display, window);
+ }
if (window->type == META_WINDOW_DESKTOP ||
window->type == META_WINDOW_DOCK)