Author: gicmo
Date: Sat Feb 16 13:04:50 2008
New Revision: 1283
URL: http://svn.gnome.org/viewvc/gvfs?rev=1283&view=rev
Log:
2008-02-16 Christian Kellner <[EMAIL PROTECTED]>
* daemon/gvfsbackenddav.c:
* daemon/gvfsbackendhttp.c:
* daemon/soup-input-stream.c:
* daemon/soup-output-stream.c:
Use SoupSessionSync instead of SoupSessionAsync and
convert SoupStreams and authentication logic.
Modified:
trunk/ChangeLog
trunk/daemon/gvfsbackenddav.c
trunk/daemon/gvfsbackendhttp.c
trunk/daemon/soup-input-stream.c
trunk/daemon/soup-output-stream.c
Modified: trunk/daemon/gvfsbackenddav.c
==============================================================================
--- trunk/daemon/gvfsbackenddav.c (original)
+++ trunk/daemon/gvfsbackenddav.c Sat Feb 16 13:04:50 2008
@@ -720,11 +720,6 @@
char *last_good_path;
- /* general authentication */
-
- SoupMessage *message;
- SoupAuth *auth;
-
/* for server authentication */
char *username;
char *password;
@@ -748,12 +743,6 @@
if (data->mount_source)
g_object_unref (data->mount_source);
- if (data->message)
- g_object_unref (data->message);
-
- if (data->auth)
- g_object_unref (data->auth);
-
g_free (data->username);
g_free (data->password);
g_free (data->last_realm);
@@ -764,57 +753,28 @@
}
static void
-ask_password_ready (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
-{
- MountOpData *data;
- char *username;
- char *password;
- gboolean aborted;
- gboolean res;
-
- data = (MountOpData *) user_data;
- username = password = NULL;
-
- res = g_mount_source_ask_password_finish (data->mount_source,
- result,
- &aborted,
- &password,
- &username,
- NULL);
-
- if (res && !aborted)
- soup_auth_authenticate (data->auth, username, password);
-
- soup_session_unpause_message (data->session, data->message);
-
- g_free (username);
- g_free (password);
-
- g_object_unref (data->message);
- g_object_unref (data->auth);
-
- data->message = NULL;
- data->auth = NULL;
-}
-
-static void
soup_authenticate (SoupSession *session,
SoupMessage *msg,
SoupAuth *auth,
gboolean retrying,
gpointer user_data)
{
- MountOpData *data;
- const char *username;
- const char *password;
- char *prompt;
+ MountOpData *data;
+ const char *username;
+ const char *password;
+ gboolean res;
+ gboolean aborted;
+ char *new_username;
+ char *new_password;
+ char *prompt;
g_print ("+ soup_authenticate \n");
data = (MountOpData *) user_data;
+ new_username = NULL;
+ new_password = NULL;
+
if (soup_auth_is_for_proxy (auth))
{
username = data->proxy_user;
@@ -848,19 +808,25 @@
prompt = g_strdup_printf (_("Enter password for %s"), auth_realm);
}
- data->auth = g_object_ref (auth);
- data->message = g_object_ref (msg);
-
soup_session_pause_message (data->session, msg);
- g_mount_source_ask_password_async (data->mount_source,
+ res = g_mount_source_ask_password (data->mount_source,
prompt,
username,
NULL,
G_ASK_PASSWORD_NEED_PASSWORD |
G_ASK_PASSWORD_NEED_USERNAME,
- ask_password_ready,
- data);
+ &aborted,
+ &new_password,
+ &new_username,
+ NULL);
+ if (res && !aborted)
+ soup_auth_authenticate (auth, new_username, new_password);
+
+ g_free (new_password);
+ g_free (new_username);
+
+
g_print ("- soup_authenticate \n");
g_free (prompt);
}
Modified: trunk/daemon/gvfsbackendhttp.c
==============================================================================
--- trunk/daemon/gvfsbackendhttp.c (original)
+++ trunk/daemon/gvfsbackendhttp.c Sat Feb 16 13:04:50 2008
@@ -76,7 +76,7 @@
{
g_vfs_backend_set_user_visible (G_VFS_BACKEND (backend), FALSE);
- backend->session = soup_session_async_new ();
+ backend->session = soup_session_sync_new ();
}
SoupURI *
Modified: trunk/daemon/soup-input-stream.c
==============================================================================
--- trunk/daemon/soup-input-stream.c (original)
+++ trunk/daemon/soup-input-stream.c Sat Feb 16 13:04:50 2008
@@ -207,7 +207,6 @@
SoupInputStream *stream;
SoupInputStreamPrivate *priv;
- g_return_val_if_fail (SOUP_IS_SESSION_ASYNC (session), NULL);
g_return_val_if_fail (SOUP_IS_MESSAGE (msg), NULL);
stream = g_object_new (SOUP_TYPE_INPUT_STREAM, NULL);
Modified: trunk/daemon/soup-output-stream.c
==============================================================================
--- trunk/daemon/soup-output-stream.c (original)
+++ trunk/daemon/soup-output-stream.c Sat Feb 16 13:04:50 2008
@@ -163,7 +163,6 @@
SoupOutputStream *stream;
SoupOutputStreamPrivate *priv;
- g_return_val_if_fail (SOUP_IS_SESSION_ASYNC (session), NULL);
g_return_val_if_fail (SOUP_IS_MESSAGE (msg), NULL);
stream = g_object_new (SOUP_TYPE_OUTPUT_STREAM, NULL);
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list
Want to limit the commits to a few modules? Go to above URL, log in to edit
your options and select the modules ('topics') you want.
Module maintainer? It is possible to set the reply-to to your development
mailing list. Email [EMAIL PROTECTED] if interested.
