brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into bob/clutter

Browse Source 
Conflicts:

	src/core/prefs.c
	src/include/prefs.h
This commit is contained in:
Robert Bragg
2008-10-06 12:54:34 +01:00
parent f67f9bbf23 a49f986c67
commit f65d898f80
11 changed files with 1456 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/window.c
View File

@@ -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)