diff options
Diffstat (limited to 'managers/simple/matchbox-window-manager-2-simple.c')
| -rw-r--r-- | managers/simple/matchbox-window-manager-2-simple.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/managers/simple/matchbox-window-manager-2-simple.c b/managers/simple/matchbox-window-manager-2-simple.c index 5b68cde..5a3472a 100644 --- a/managers/simple/matchbox-window-manager-2-simple.c +++ b/managers/simple/matchbox-window-manager-2-simple.c @@ -1,10 +1,6 @@ #include <matchbox/matchbox.h> #include <signal.h> -#if ENABLE_CLUTTER_COMPOSITE_MANAGER -# include <clutter/x11/clutter-x11.h> -#endif - #if USE_GTK #include <gdk/gdkx.h> #endif @@ -98,31 +94,9 @@ main(int argc, char **argv) dpy = GDK_DISPLAY(); #endif -#if ENABLE_CLUTTER_COMPOSITE_MANAGER - /* - * If using clutter, we share the display connection, and hook - * our xevent handler into the clutter main loop. - * - * If we are also doing gtk integration, we need to make clutter to - * use the gtk display connection. - */ - if (dpy) - clutter_x11_set_display (dpy); - -#if USE_GTK - clutter_x11_disable_event_retrieval (); -#endif - - clutter_init (&argc, &argv); - - if (!dpy) - dpy = clutter_x11_get_default_display (); - -#endif - wm = mb_wm_new_with_dpy (argc, argv, dpy); mb_wm_init (wm); - + if (wm == NULL) mb_wm_util_fatal_error("OOM?"); |