debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libsoup 2.27.91 is good enough for GNOME password manager

Browse source
This commit is contained in:
Christian Dywan 2009-09-06 00:56:11 +02:00
parent 3b111c6e1a
commit ccc76f3fc6
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
katze/katze-http-auth.c
View file

@ -37,7 +37,7 @@ G_DEFINE_TYPE_WITH_CODE (KatzeHttpAuth, katze_http_auth, G_TYPE_OBJECT,
G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE, G_IMPLEMENT_INTERFACE (SOUP_TYPE_SESSION_FEATURE,
katze_http_auth_session_feature_iface_init)); katze_http_auth_session_feature_iface_init));
#ifdef HAVE_LIBSOUP_2_27_92 #ifdef HAVE_LIBSOUP_2_27_91
static void static void
authentication_message_got_headers_cb (SoupMessage* msg, authentication_message_got_headers_cb (SoupMessage* msg,
SoupAuth* auth) SoupAuth* auth)
@ -73,7 +73,7 @@ authentication_dialog_response_cb (GtkWidget* dialog,
soup_auth_authenticate (auth, soup_auth_authenticate (auth,
gtk_entry_get_text (GTK_ENTRY (username)), gtk_entry_get_text (GTK_ENTRY (username)),
gtk_entry_get_text (GTK_ENTRY (password))); 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_object_set_data_full (G_OBJECT (msg), "username",
g_strdup (gtk_entry_get_text (GTK_ENTRY (username))), g_free); g_strdup (gtk_entry_get_text (GTK_ENTRY (username))), g_free);
g_object_set_data_full (G_OBJECT (msg), "password", g_object_set_data_full (G_OBJECT (msg), "password",
@ -103,7 +103,7 @@ katze_http_auth_session_authenticate_cb (SoupSession* session,
GtkWidget* label; GtkWidget* label;
GtkWidget* align; GtkWidget* align;
GtkWidget* entry; GtkWidget* entry;
#ifdef HAVE_LIBSOUP_2_27_92 #ifdef HAVE_LIBSOUP_2_27_91
GSList* users; GSList* users;
#endif #endif
@ -157,7 +157,7 @@ katze_http_auth_session_authenticate_cb (SoupSession* session,
gtk_size_group_add_widget (sizegroup, align); gtk_size_group_add_widget (sizegroup, align);
gtk_box_pack_start (GTK_BOX (hbox), align, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), align, TRUE, TRUE, 0);
entry = gtk_entry_new (); entry = gtk_entry_new ();
#ifdef HAVE_LIBSOUP_2_27_92 #ifdef HAVE_LIBSOUP_2_27_91
users = soup_auth_get_saved_users (auth); users = soup_auth_get_saved_users (auth);
if (users) if (users)
gtk_entry_set_text (GTK_ENTRY (entry), users->data); 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_size_group_add_widget (sizegroup, align);
gtk_box_pack_start (GTK_BOX (hbox), align, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), align, TRUE, TRUE, 0);
entry = gtk_entry_new_with_max_length (32); entry = gtk_entry_new_with_max_length (32);
#ifdef HAVE_LIBSOUP_2_27_92 #ifdef HAVE_LIBSOUP_2_27_91
if (users) if (users)
{ {
gtk_entry_set_text (GTK_ENTRY (entry), gtk_entry_set_text (GTK_ENTRY (entry),

2
midori/main.c
View file

@ -1117,7 +1117,7 @@ midori_soup_session_prepare (SoupSession* session,
if (g_module_supported ()) if (g_module_supported ())
if ((module = g_module_open ("libsoup-gnome-2.4.so", G_MODULE_BIND_LOCAL))) 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); GType (*get_type_function) (void);
if (g_module_symbol (module, "soup_password_manager_gnome_get_type", if (g_module_symbol (module, "soup_password_manager_gnome_get_type",
(void*) &get_type_function)) (void*) &get_type_function))

2
wscript
View file

@ -210,7 +210,7 @@ def configure (conf):
check_pkg ('webkit-1.0', '1.1.1', args=args) check_pkg ('webkit-1.0', '1.1.1', args=args)
check_pkg ('libsoup-2.4', '2.25.2') check_pkg ('libsoup-2.4', '2.25.2')
conf.define ('HAVE_LIBSOUP_2_25_2', 1) 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') check_pkg ('libxml-2.0', '2.6')
if option_enabled ('hildon'): if option_enabled ('hildon'):