Hooked in clutter options.

src/ui/ui.c

@@ -36,12 +36,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef WITH_CLUTTER
-#include <clutter/clutter.h>
-#include <clutter/x11/clutter-x11.h>
-#include "compositor.h"
-#endif
-
 static void meta_stock_icons_init (void);
 static void meta_ui_accelerator_parse (const char      *accel,
                                        guint           *keysym,
@@ -61,25 +55,6 @@ meta_ui_init (int *argc, char ***argv)
   if (!gtk_init_check (argc, argv))
     meta_fatal ("Unable to open X display %s\n", XDisplayName (NULL));
 
-#ifdef WITH_CLUTTER
-  /*
-   * NB: clutter must be initialized *after* the display connection is opened
-   *     and *before* we enable the compositor.
-   */
-  clutter_x11_set_display (gdk_display);
-  clutter_x11_disable_event_retrieval ();
-  if (clutter_init (argc, argv) != CLUTTER_INIT_SUCCESS)
-    {
-      g_message ("Unable to initialize Clutter; falling back on Xrender\n");
-      meta_compositor_can_use_clutter__ = 0;
-    }
-  else
-    {
-      meta_compositor_can_use_clutter__ = 1;
-    }
-#endif
-
-
   meta_stock_icons_init ();
 }