Merge lp:~midori/midori/lessClutter into lp:midori

[Cris Dywan]

Drop forgotten clutter init and obsolete header declarations

[gue5t gue5t (gue5t)]

review: Approve

=== modified file 'midori/midori-app.c'
--- midori/midori-app.c	2014-03-05 18:43:15 +0000
+++ midori/midori-app.c	2014-03-16 12:13:43 +0000
@@ -1210,10 +1210,7 @@
     textdomain (GETTEXT_PACKAGE);
     #endif
 
-    #ifdef HAVE_GRANITE_CLUTTER
-    success = gtk_clutter_init_with_args (argc, argument_vector, _("[Addresses]"),
-                                          (GOptionEntry*)entries, GETTEXT_PACKAGE, &error);
-    #elif GTK_CHECK_VERSION (3, 0, 0)
+    #if GTK_CHECK_VERSION (3, 0, 0)
     success = gtk_init_with_args (argc, argument_vector, _("[Addresses]"),
                                   entries, GETTEXT_PACKAGE, &error);
     #else
 
=== modified file 'midori/midori-view.h'
--- midori/midori-view.h	2013-11-04 16:08:35 +0000
+++ midori/midori-view.h	2014-03-16 12:13:43 +0000
@@ -17,10 +17,6 @@
 
 #include <katze/katze.h>
 
-#ifdef HAVE_GRANITE
-    #include <granite/granite.h>
-#endif
-
 G_BEGIN_DECLS
 
 typedef enum
@@ -128,15 +124,6 @@
 PangoEllipsizeMode
 midori_view_get_label_ellipsize        (MidoriView*        view);
 
-#ifdef HAVE_GRANITE
-GraniteWidgetsTab*
-midori_view_get_tab                    (MidoriView*        view);
-
-void
-midori_view_set_tab                    (MidoriView*        view,
-                                        GraniteWidgetsTab* tab);
-#endif
-
 GtkWidget*
 midori_view_get_proxy_tab_label        (MidoriView*        view);