summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRomero Malaquias <[email protected]>2015-12-21 13:09:53 -0300
committerWolfgang Ulbrich <[email protected]>2016-01-10 17:53:32 +0100
commitc6437bda0a9e7e26477c27fc355d9119b65d9d0d (patch)
tree1f75c3edd2239e93dacf7408aa2b800356183cca
parent740898e85fc9b8339a3aca0c5f6dd897b2c69fcf (diff)
downloadmarco-c6437bda0a9e7e26477c27fc355d9119b65d9d0d.tar.bz2
marco-c6437bda0a9e7e26477c27fc355d9119b65d9d0d.tar.xz
Avoiding conditional directives that break statements.
-rw-r--r--src/core/screen.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/core/screen.c b/src/core/screen.c
index 66461d4a..14fa9953 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -774,15 +774,19 @@ meta_screen_manage_all_windows (MetaScreen *screen)
{
WindowInfo *info = list->data;
MetaWindow *window;
+ gboolean test_window_owner;
window = meta_window_new_with_attrs (screen->display, info->xwindow, TRUE,
&info->attrs);
- if (info->xwindow == screen->no_focus_window ||
- info->xwindow == screen->flash_window ||
+ test_window_owner = info->xwindow == screen->no_focus_window ||
+ info->xwindow == screen->flash_window ||
+ info->xwindow == screen->wm_sn_selection_window;
+
#ifdef HAVE_COMPOSITE_EXTENSIONS
- info->xwindow == screen->wm_cm_selection_window ||
+ test_window_owner = test_window_owner || info->xwindow == screen->wm_cm_selection_window;
#endif
- info->xwindow == screen->wm_sn_selection_window) {
+ if (test_window_owner)
+ {
meta_verbose ("Not managing our own windows\n");
continue;
}