Merge branch 'master' into bob/clutter

Conflicts:

	src/core/prefs.c
	src/include/prefs.h
This commit is contained in:
Robert Bragg
2008-10-06 12:54:34 +01:00
11 changed files with 1456 additions and 555 deletions

View File

@@ -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;
}