summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorVictor Kareh <[email protected]>2017-10-23 16:31:52 -0400
committerraveit65 <[email protected]>2017-11-10 19:51:41 +0100
commit99e0041e07bb3efe3f4253d995a58e7f214df35f (patch)
tree3322e35b6a2f2572ae0301d1e478ad611173b2cc /src/core
parentb5d6dd0341c31e5ce5c528180774d4dce54ee0a9 (diff)
downloadmarco-99e0041e07bb3efe3f4253d995a58e7f214df35f.tar.bz2
marco-99e0041e07bb3efe3f4253d995a58e7f214df35f.tar.xz
Add stricter logic for running without XPresent support
Diffstat (limited to 'src/core')
-rw-r--r--src/core/display.c4
-rw-r--r--src/core/screen.c9
2 files changed, 4 insertions, 9 deletions
diff --git a/src/core/display.c b/src/core/display.c
index a721def4..9601b4ed 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -69,10 +69,6 @@
#include <X11/extensions/Xrender.h>
#endif
-#ifdef HAVE_PRESENT
- #include <X11/extensions/Xpresent.h>
-#endif
-
#ifdef HAVE_XKB
#include <X11/XKBlib.h>
#endif
diff --git a/src/core/screen.c b/src/core/screen.c
index 308795e3..28d2febf 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -740,16 +740,15 @@ list_windows (MetaScreen *screen)
children[i], &info->attrs);
if (meta_error_trap_pop_with_return (screen->display, TRUE))
- {
+ {
meta_verbose ("Failed to get attributes for window 0x%lx\n",
children[i]);
- g_free (info);
- continue;
+ g_free (info);
}
else
{
- info->xwindow = children[i];
- }
+ info->xwindow = children[i];
+ }
result = g_list_prepend (result, info);
}