metacity r3664 - in trunk: . src/core
- From: tthurman svn gnome org
- To: svn-commits-list gnome org
- Subject: metacity r3664 - in trunk: . src/core
- Date: Wed, 26 Mar 2008 13:32:59 +0000 (GMT)
Author: tthurman
Date: Wed Mar 26 13:32:58 2008
New Revision: 3664
URL: http://svn.gnome.org/viewvc/metacity?rev=3664&view=rev
Log:
2008-03-26 Thomas Thurman <tthurman gnome org>
* src/core/display.c (event_callback): meta_display_screen_for_root
is quite capable of returning NULL.
Modified:
trunk/ChangeLog
trunk/src/core/display.c
Modified: trunk/src/core/display.c
==============================================================================
--- trunk/src/core/display.c (original)
+++ trunk/src/core/display.c Wed Mar 26 13:32:58 2008
@@ -1798,8 +1798,10 @@
"Syncing to old stack positions.\n");
screen =
meta_display_screen_for_root (display, event->xany.window);
- meta_stack_set_positions (screen->stack,
- display->grab_old_window_stacking);
+
+ if (screen!=NULL)
+ meta_stack_set_positions (screen->stack,
+ display->grab_old_window_stacking);
}
meta_display_end_grab_op (display,
event->xbutton.time);
@@ -1988,16 +1990,15 @@
* screen; this will make keybindings and workspace-launched items
* actually appear on the right screen.
*/
- if (display->active_screen !=
- meta_display_screen_for_root (display, event->xcrossing.root))
- {
- MetaScreen *new_screen;
- new_screen = meta_display_screen_for_root (display,
- event->xcrossing.root);
+ {
+ MetaScreen *new_screen =
+ meta_display_screen_for_root (display, event->xcrossing.root);
+
+ if (new_screen != NULL && display->active_screen != new_screen)
meta_workspace_focus_default_window (new_screen->active_workspace,
NULL,
event->xcrossing.time);
- }
+ }
/* Check if we've entered a window; do this even if window->has_focus to
* avoid races.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]