[sushi/wip/cosimoc/no-clutter: 20/36] Remove remaining clutter bits

[Cosimo Cecchi <cosimoc src gnome org>]

commit 45fa315778bd384fe03b9e7547eda9aedd929119
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Apr 3 12:45:16 2017 -0700

    Remove remaining clutter bits
    
    This commit drops completely the clutter dependency.

 configure.ac               |    6 ------
 src/Makefile-sushi.am      |    1 -
 src/js/ui/mainWindow.js    |    3 ---
 src/libsushi/sushi-utils.h |    1 -
 src/main.c                 |   23 +++--------------------
 5 files changed, 3 insertions(+), 31 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 05fb615..b10a1a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,11 +44,9 @@ AC_CACHE_SAVE
 GJS_JS_DIR=`$PKG_CONFIG --variable=datadir gjs-1.0`/gjs-1.0
 AC_SUBST(GJS_JS_DIR)
 
-CLUTTER_MIN_VERSION=1.11.4
 GLIB_MIN_VERSION=2.29.14
 GTK_MIN_VERSION=3.13.2
 GJS_MIN_VERSION=1.38.0
-CLUTTER_GTK_MIN_VERSION=1.0.1
 GOBJECT_INTROSPECTION_MIN_VERSION=0.9.6
 GDK_PIXBUF_MIN_VERSION=2.23.0
 HARFBUZZ_MIN_VERSION=0.9.9
@@ -60,11 +58,7 @@ PKG_CHECK_MODULES(SUSHI,
                   gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
                   gjs-1.0 >= $GJS_MIN_VERSION
                   gobject-2.0 >= $GLIB_MIN_VERSION
-                  clutter-1.0 >= $CLUTTER_MIN_VERSION
-                  clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
                   gtk+-3.0 >= $GTK_MIN_VERSION
-                  clutter-gtk-1.0 >= $CLUTTER_GTK_MIN_VERSION
-                  clutter-gst-3.0
                   gstreamer-1.0
                   gstreamer-pbutils-1.0
                   gstreamer-tag-1.0
diff --git a/src/Makefile-sushi.am b/src/Makefile-sushi.am
index d904485..5c111b5 100644
--- a/src/Makefile-sushi.am
+++ b/src/Makefile-sushi.am
@@ -98,7 +98,6 @@ Sushi_1_0_gir_LIBS = libsushi-1.0.la
 Sushi_1_0_gir_CFLAGS = $(AM_CPPFLAGS) $(sushi_cflags)
 Sushi_1_0_gir_SCANNERFLAGS = --warn-all --symbol-prefix=sushi --identifier-prefix=Sushi
 Sushi_1_0_gir_INCLUDES = \
-    Clutter-1.0 \
     GstPbutils-1.0 \
     GstTag-1.0 \
     GdkPixbuf-2.0 \
diff --git a/src/js/ui/mainWindow.js b/src/js/ui/mainWindow.js
index 95649f8..8214a90 100644
--- a/src/js/ui/mainWindow.js
+++ b/src/js/ui/mainWindow.js
@@ -25,14 +25,11 @@
 
 imports.gi.versions.GdkX11 = '3.0';
 
-const Clutter = imports.gi.Clutter;
-const ClutterGdk = imports.gi.ClutterGdk;
 const Gdk = imports.gi.Gdk;
 const GdkX11 = imports.gi.GdkX11;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Gtk = imports.gi.Gtk;
-const GtkClutter = imports.gi.GtkClutter;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Pango = imports.gi.Pango;
diff --git a/src/libsushi/sushi-utils.h b/src/libsushi/sushi-utils.h
index 21c6c26..8be1b92 100644
--- a/src/libsushi/sushi-utils.h
+++ b/src/libsushi/sushi-utils.h
@@ -26,7 +26,6 @@
 #ifndef __SUSHI_UTILS_H__
 #define __SUSHI_UTILS_H__
 
-#include <clutter/clutter.h>
 #include <evince-document.h>
 #include <gdk/gdk.h>
 
diff --git a/src/main.c b/src/main.c
index 948441f..578f2b5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -34,17 +34,9 @@
 
 #include <gjs/gjs.h>
 
+#include <gst/gst.h>
 #include <gtk/gtk.h>
 
-#ifdef GDK_WINDOWING_X11
-#include <X11/Xlib.h>
-#endif
-
-#include <clutter/clutter.h>
-#include <clutter/x11/clutter-x11.h>
-#include <clutter-gst/clutter-gst.h>
-#include <clutter-gtk/clutter-gtk.h>
-
 static void
 parse_options (int *argc, char ***argv)
 {
@@ -106,17 +98,8 @@ main (int argc, char **argv)
   GjsContext *js_context;
   GError *error;
 
-#ifdef GDK_WINDOWING_X11
-  XInitThreads ();
-#endif
-
-  clutter_x11_set_use_argb_visual (TRUE);
-
-  if (gtk_clutter_init (&argc, &argv) < 0)
-    return EXIT_FAILURE;
-
-  clutter_gst_init (0, NULL);
-
+  gst_init (&argc, &argv);
+  gtk_init (&argc, &argv);
   parse_options (&argc, &argv);
 
   js_context = gjs_context_new_with_search_path (NULL);