Merge lp:~midori/midori/noWinforGcr into lp:midori

[Cris Dywan]

No Gcr on Win for the moment

[lp:~midori/midori/noWinforGcr]

6906. By Cris Dywan on 2015-03-24

Replace some HAVE_GCR with soup 2.34

And notably fix the misplaced #else in commit

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-03-23 22:07:04 +0000
+++ CMakeLists.txt	2015-03-24 23:03:55 +0000
@@ -187,7 +187,9 @@
     set(PKGS ${PKGS} zeitgeist-1.0)
 endif()
 
-if (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.34.0")
+if (WIN32)
+    add_definitions("-DGCR_VERSION=\"No\"")
+elseif (${DEPS_libsoup-gnome-2.4_VERSION} VERSION_GREATER "2.34.0")
     if (USE_GTK3)
         pkg_check_modules(GCR REQUIRED gcr-3>=2.32)
     else ()
 
=== modified file 'midori/midori-locationaction.c'
--- midori/midori-locationaction.c	2015-03-22 16:59:59 +0000
+++ midori/midori-locationaction.c	2015-03-24 23:03:55 +0000
@@ -1322,7 +1322,9 @@
     return message;
 }
 #endif
+#endif
 
+#ifdef HAVE_GCR
 typedef enum {
     MIDORI_CERT_TRUST,
     MIDORI_CERT_REVOKE,
@@ -1369,6 +1371,7 @@
     }
     gtk_widget_destroy (dialog);
 }
+#endif
 
 const gchar*
 midori_location_action_tls_flags_to_string (GTlsCertificateFlags tls_flags)
@@ -1418,6 +1421,7 @@
         return;
     }
 
+    #ifdef HAVE_GCR
     GByteArray* der_cert;
     GcrCertificate* gcr_cert;
 
@@ -1447,6 +1451,8 @@
     g_object_set_data_full (G_OBJECT (dialog), "gcr-cert", gcr_cert, (GDestroyNotify)g_object_unref);
     g_signal_connect (dialog, "response",
         G_CALLBACK (midori_location_action_cert_response_cb), gcr_cert);
+    #endif
+
     /* With GTK+2 the scrolled contents can't communicate a natural size to the window */
     #if !GTK_CHECK_VERSION (3, 0, 0)
     gtk_window_set_default_size (GTK_WINDOW (dialog), 250, 200);
@@ -1462,7 +1468,6 @@
 
     g_object_unref (tls_cert);
 }
-#endif
 
 static void
 midori_location_action_engine_activate_cb (GtkWidget*          menuitem,
@@ -1542,7 +1547,7 @@
         gtk_box_pack_start (GTK_BOX (hbox),
             gtk_label_new (gtk_entry_get_icon_tooltip_text (GTK_ENTRY (widget), icon_pos)), FALSE, FALSE, 0);
         gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
-        #if defined (HAVE_LIBSOUP_2_34_0)
+        #ifdef HAVE_LIBSOUP_2_34_0
         midori_location_action_show_page_info (widget, GTK_BOX (content_area), dialog);
         #endif
         g_signal_connect (dialog, "destroy", G_CALLBACK (gtk_widget_destroyed), &dialog);
 
=== modified file 'midori/midori-session.c'
--- midori/midori-session.c	2013-10-25 21:49:56 +0000
+++ midori/midori-session.c	2015-03-24 23:03:55 +0000
@@ -236,7 +236,7 @@
     g_signal_connect (settings, "notify::proxy-type",
         G_CALLBACK (soup_session_settings_notify_http_proxy_cb), session);
 
-    #if defined (HAVE_LIBSOUP_2_34_0)
+    #ifdef HAVE_LIBSOUP_2_34_0
     g_signal_connect (session, "request-started",
         G_CALLBACK (midori_soup_session_request_started_cb), session);
     #endif
 
=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2015-03-22 16:59:59 +0000
+++ midori/midori-view.c	2015-03-24 23:03:55 +0000
@@ -27,7 +27,7 @@
     #include <gcr/gcr.h>
 #endif
 
-#if !defined (HAVE_WEBKIT2) && defined (HAVE_LIBSOUP_2_29_91)
+#if !defined (HAVE_WEBKIT2) && defined (HAVE_LIBSOUP_2_34_0)
 SoupMessage*
 midori_map_get_message (SoupMessage* message);
 #endif
@@ -478,7 +478,7 @@
         midori_tab_set_load_status (MIDORI_TAB (view), load_status);
 }
 
-#if defined (HAVE_LIBSOUP_2_34_0)
+#ifdef HAVE_LIBSOUP_2_34_0
 /**
  * midori_view_get_tls_info
  * @view: a #MidoriView
@@ -591,7 +591,7 @@
         #endif
         return TRUE;
     }
-    #if defined (HAVE_LIBSOUP_2_34_0)
+    #ifdef HAVE_GCR
     else if (/* midori_tab_get_special (MIDORI_TAB (view)) && */ !strncmp (uri, "https", 5))
     {
         /* We show an error page if the certificate is invalid.
@@ -723,9 +723,9 @@
     g_object_set (view, "title", NULL, NULL);
     midori_view_unset_icon (view);
 
+    #ifdef HAVE_LIBSOUP_2_34_0
     if (!strncmp (uri, "https", 5))
     {
-        #if defined (HAVE_LIBSOUP_2_34_0)
         #ifdef HAVE_WEBKIT2
         void* request = NULL;
         #else
@@ -738,6 +738,7 @@
         gchar* hostname;
         if (midori_view_get_tls_info (view, request, &tls_cert, &tls_flags, &hostname))
             midori_tab_set_security (MIDORI_TAB (view), MIDORI_SECURITY_TRUSTED);
+        #ifdef HAVE_GCR
         else if (!midori_tab_get_special (MIDORI_TAB (view)) && tls_cert != NULL)
         {
             GcrCertificate* gcr_cert;
@@ -759,15 +760,16 @@
             }
             g_object_unref (gcr_cert);
         }
+        #endif
         else
-        #endif
             midori_tab_set_security (MIDORI_TAB (view), MIDORI_SECURITY_UNKNOWN);
-        #if defined (HAVE_LIBSOUP_2_34_0)
+        #ifdef HAVE_GCR
         if (tls_cert != NULL)
             g_object_unref (tls_cert);
         g_free (hostname);
         #endif
     }
+    #endif
     else
         midori_tab_set_security (MIDORI_TAB (view), MIDORI_SECURITY_NONE);