Build fix for < Gtk 2.12 and Glib < 2.16

diff --git a/midori/compat.c b/midori/compat.c
index 5bd73b70807c725362891d765a75f5fcd175b254..a1e90621a73d39e356bdf8fc7e16f1b7ac5c9032 100644 (file)
--- a/midori/compat.c
+++ b/midori/compat.c
@@ -95,6 +95,13 @@ gdk_pixbuf_new_from_stream (GInputStream* stream,
 
 #if !GTK_CHECK_VERSION(2, 12, 0)
 
+void
+gtk_widget_set_has_tooltip (GtkWidget* widget,
+                            gboolean   has_tooltip)
+{
+    /* Do nothing */
+}
+
 void
 gtk_widget_set_tooltip_text (GtkWidget*   widget,
                              const gchar* text)

diff --git a/midori/compat.h b/midori/compat.h
index 415b6b74c5e668e59ad28af684a62bbaa1ca21fb..5aec6163ab1e684eec47e05581ac97561b0d0edd 100644 (file)
--- a/midori/compat.h
+++ b/midori/compat.h
@@ -35,6 +35,10 @@ gdk_pixbuf_new_from_stream (GInputStream* stream,
 
 #if !GTK_CHECK_VERSION(2, 12, 0)
 
+void
+gtk_widget_set_has_tooltip             (GtkWidget*         widget,
+                                        gboolean           has_tooltip);
+
 void
 gtk_widget_set_tooltip_text            (GtkWidget*         widget,
                                         const gchar*       text);

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 03511b799d222feba2d0451037be94c8fc002e5c..ed61d53142f7cf708e6d4b28709f24cd946d1c35 100644 (file)
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -1843,10 +1843,10 @@ _action_source_view_activate (GtkAction*     action,
     uri = midori_web_view_get_display_uri (MIDORI_WEB_VIEW (web_view));
 
     contents = NULL;
-    tag = NULL;
 
     #if GLIB_CHECK_VERSION (2, 16, 0)
     file = g_file_new_for_uri (uri);
+    tag = NULL;
     #ifdef HAVE_GTKSOURCEVIEW
     content_type = NULL;
     #endif