Updating branch refs/heads/master to 3ff0a33bc1d4a2abfec7f7e4f90eb39aa4384eb8 (commit) from 6fb2666083d96705794bb2578979fe8b35677f67 (commit)
commit 3ff0a33bc1d4a2abfec7f7e4f90eb39aa4384eb8 Author: Christian Dywan <christ...@twotoasts.de> Date: Sun Apr 7 21:42:07 2013 +0200 Fix compilation guards for midori_map_get_message midori/midori-view.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/midori/midori-view.c b/midori/midori-view.c index 90a0047..3c99d62 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -29,12 +29,12 @@ #ifdef HAVE_GCR #define GCR_API_SUBJECT_TO_CHANGE #include <gcr/gcr.h> +#endif -#ifndef HAVE_WEBKIT2 +#if !defined (HAVE_WEBKIT2) && defined (HAVE_LIBSOUP_2_29_91) SoupMessage* midori_map_get_message (SoupMessage* message); #endif -#endif #include <string.h> #include <stdlib.h> @@ -725,6 +725,7 @@ midori_view_update_load_status (MidoriView* view, #endif } +#if defined (HAVE_LIBSOUP_2_29_91) gboolean midori_view_get_tls_info (MidoriView* view, void* request, @@ -754,6 +755,7 @@ midori_view_get_tls_info (MidoriView* view, return FALSE; #endif } +#endif static gboolean midori_view_web_view_navigation_decision_cb (WebKitWebView* web_view, _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits