From: Christian Dywan <christian@twotoasts.de>
Date: Sat, 5 Sep 2009 22:56:11 +0000 (+0200)
Subject: libsoup 2.27.91 is good enough for GNOME password manager
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccc76f3fc67f275e8354f6c02262aa08d5165ef4;p=midori

libsoup 2.27.91 is good enough for GNOME password manager
---

diff --git a/katze/katze-http-auth.c b/katze/katze-http-auth.c
index 2149df5e..59770e73 100644
--- a/katze/katze-http-auth.c
+++ b/katze/katze-http-auth.c
@@ -37,7 +37,7 @@ G_DEFINE_TYPE_WITH_CODE (KatzeHttpAuth, katze_http_auth, G_TYPE_OBJECT,
                          G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE,
                          katze_http_auth_session_feature_iface_init));
 
-#ifdef HAVE_LIBSOUP_2_27_92
+#ifdef HAVE_LIBSOUP_2_27_91
 static void
 authentication_message_got_headers_cb (SoupMessage* msg,
                                        SoupAuth*    auth)
@@ -73,7 +73,7 @@ authentication_dialog_response_cb (GtkWidget* dialog,
         soup_auth_authenticate (auth,
             gtk_entry_get_text (GTK_ENTRY (username)),
             gtk_entry_get_text (GTK_ENTRY (password)));
-        #ifdef HAVE_LIBSOUP_2_27_92
+        #ifdef HAVE_LIBSOUP_2_27_91
         g_object_set_data_full (G_OBJECT (msg), "username",
             g_strdup (gtk_entry_get_text (GTK_ENTRY (username))), g_free);
         g_object_set_data_full (G_OBJECT (msg), "password",
@@ -103,7 +103,7 @@ katze_http_auth_session_authenticate_cb (SoupSession* session,
     GtkWidget* label;
     GtkWidget* align;
     GtkWidget* entry;
-    #ifdef HAVE_LIBSOUP_2_27_92
+    #ifdef HAVE_LIBSOUP_2_27_91
     GSList* users;
     #endif
 
@@ -157,7 +157,7 @@ katze_http_auth_session_authenticate_cb (SoupSession* session,
     gtk_size_group_add_widget (sizegroup, align);
     gtk_box_pack_start (GTK_BOX (hbox), align, TRUE, TRUE, 0);
     entry = gtk_entry_new ();
-    #ifdef HAVE_LIBSOUP_2_27_92
+    #ifdef HAVE_LIBSOUP_2_27_91
     users = soup_auth_get_saved_users (auth);
     if (users)
         gtk_entry_set_text (GTK_ENTRY (entry), users->data);
@@ -173,7 +173,7 @@ katze_http_auth_session_authenticate_cb (SoupSession* session,
     gtk_size_group_add_widget (sizegroup, align);
     gtk_box_pack_start (GTK_BOX (hbox), align, TRUE, TRUE, 0);
     entry = gtk_entry_new_with_max_length (32);
-    #ifdef HAVE_LIBSOUP_2_27_92
+    #ifdef HAVE_LIBSOUP_2_27_91
     if (users)
     {
         gtk_entry_set_text (GTK_ENTRY (entry),
diff --git a/midori/main.c b/midori/main.c
index 7608ad42..c5a5457f 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1117,7 +1117,7 @@ midori_soup_session_prepare (SoupSession*       session,
     if (g_module_supported ())
         if ((module = g_module_open ("libsoup-gnome-2.4.so", G_MODULE_BIND_LOCAL)))
         {
-            #ifdef HAVE_LIBSOUP_2_27_92
+            #ifdef HAVE_LIBSOUP_2_27_91
             GType (*get_type_function) (void);
             if (g_module_symbol (module, "soup_password_manager_gnome_get_type",
                                  (void*) &get_type_function))
diff --git a/wscript b/wscript
index d0a29b10..50fd8dc8 100644
--- a/wscript
+++ b/wscript
@@ -210,7 +210,7 @@ def configure (conf):
     check_pkg ('webkit-1.0', '1.1.1', args=args)
     check_pkg ('libsoup-2.4', '2.25.2')
     conf.define ('HAVE_LIBSOUP_2_25_2', 1)
-    check_pkg ('libsoup-2.4', '2.27.92', False, var='LIBSOUP_2_27_92')
+    check_pkg ('libsoup-2.4', '2.27.91', False, var='LIBSOUP_2_27_91')
     check_pkg ('libxml-2.0', '2.6')
 
     if option_enabled ('hildon'):