[sushi/wip/cosimoc/no-clutter: 24/50] Drop dependency on Clutter

[Cosimo Cecchi <cosimoc src gnome org>]

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

    Drop dependency on Clutter
    
    Remove the last remaining bits to drop the Clutter dependency.

 meson.build                |  3 ---
 src/js/ui/mainWindow.js    |  6 ------
 src/libsushi/meson.build   |  1 -
 src/libsushi/sushi-utils.h |  1 -
 src/main.c                 | 23 +++--------------------
 src/meson.build            |  3 ---
 6 files changed, 3 insertions(+), 34 deletions(-)
---
diff --git a/meson.build b/meson.build
index 6a94156..7007bc1 100644
--- a/meson.build
+++ b/meson.build
@@ -5,9 +5,6 @@ project(
   meson_version: '>=0.42.0'
 )
 
-clutter_dep = dependency('clutter-1.0', version: '>=1.11.4')
-clutter_gst_dep = dependency('clutter-gst-3.0')
-clutter_gtk_dep = dependency('clutter-gtk-1.0', version: '>=1.0.1')
 epoxy_dep = dependency('epoxy')
 evince_document_dep = dependency('evince-document-3.0')
 evince_view_dep = dependency('evince-view-3.0')
diff --git a/src/js/ui/mainWindow.js b/src/js/ui/mainWindow.js
index 5c9fa5a..3cba38c 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;
@@ -75,9 +72,6 @@ var MainWindow = new Lang.Class({
                                              decoration_layout: 'menu:close' });
         this._gtkWindow.set_titlebar(this._titlebar);
 
-        let screen = Gdk.Screen.get_default();
-        this._gtkWindow.set_visual(screen.get_rgba_visual());
-
         this._gtkWindow.connect('delete-event',
                                 Lang.bind(this, this._onDeleteEvent));
         this._gtkWindow.connect('key-press-event',
diff --git a/src/libsushi/meson.build b/src/libsushi/meson.build
index 970cf05..bfa6a7e 100644
--- a/src/libsushi/meson.build
+++ b/src/libsushi/meson.build
@@ -66,7 +66,6 @@ gnome.generate_gir(
   symbol_prefix: 'sushi',
   identifier_prefix: 'Sushi',
   includes: [
-    'Clutter-1.0',
     'GstPbutils-1.0',
     'GstTag-1.0',
     'GdkPixbuf-2.0',
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 5057d89..ec15051 100644
--- a/src/main.c
+++ b/src/main.c
@@ -32,17 +32,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)
 {
@@ -104,17 +96,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);
diff --git a/src/meson.build b/src/meson.build
index 9400566..10a25ca 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -5,9 +5,6 @@ sushi_sources = [
 ]
 
 deps = [
-  clutter_dep,
-  clutter_gst_dep,
-  clutter_gtk_dep,
   epoxy_dep,
   evince_document_dep,
   evince_view_dep,