[Xfce4-commits] <midori:master> Add another gtk_init_with_args variant to avoid warnings

[Christian Dywan]

Updating branch refs/heads/master
         to 7fdfab9efac9ef5b6d1ac9169a419f13fc15dcd0 (commit)
       from f191d97d205db0529810228888cfe92516bc1ca4 (commit)

commit 7fdfab9efac9ef5b6d1ac9169a419f13fc15dcd0
Author: Christian Dywan <christian at twotoasts.de>
Date:   Mon Nov 12 22:08:59 2012 +0100

    Add another gtk_init_with_args variant to avoid warnings

 extensions/delayed-load.vala |    1 -
 midori/midori-app.c          |    7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/extensions/delayed-load.vala b/extensions/delayed-load.vala
index 066a245..2cc2b31 100644
--- a/extensions/delayed-load.vala
+++ b/extensions/delayed-load.vala
@@ -106,7 +106,6 @@ namespace DelayedLoad {
 
     private class Manager : Midori.Extension {
         private int timeout = 0;
-        private bool timeout_handler = false;
         private HashTable<Midori.Browser, TabShaker> tasks;
 
         public signal void preferences_changed ();
diff --git a/midori/midori-app.c b/midori/midori-app.c
index 05fc559..6cfffa1 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -1436,12 +1436,15 @@ midori_app_setup (gint               *argc,
     textdomain (GETTEXT_PACKAGE);
     #endif
 
-    #ifdef HAVE_GRANITE
+    #ifdef HAVE_GRANITE_CLUTTER
     success = gtk_clutter_init_with_args (argc, argument_vector, _("[Addresses]"),
                                           (GOptionEntry*)entries, GETTEXT_PACKAGE, error);
-    #else
+    #elif GTK_CHECK_VERSION (3, 0, 0)
     success = gtk_init_with_args (argc, argument_vector, _("[Addresses]"),
                                   entries, GETTEXT_PACKAGE, error);
+    #else
+    success = gtk_init_with_args (argc, argument_vector, _("[Addresses]"),
+                                  (GOptionEntry*)entries, GETTEXT_PACKAGE, error);
     #endif
 
     factory = gtk_icon_factory_new ();