gvfs r1369 - in trunk: . daemon

[gicmo svn gnome org]

Author: gicmo
Date: Mon Feb 25 15:05:40 2008
New Revision: 1369
URL: http://svn.gnome.org/viewvc/gvfs?rev=1369&view=rev

Log:
2008-02-25  Christian Kellner  <gicmo gnome org>

	* daemon/gvfsbackenddav.c: 
	* daemon/gvfsbackendhttp.c:
	* daemon/gvfsbackendhttp.h:
	Add a SoupSessionAsync to be used for SoupInputStream doesn't
	yet work with SoupSessionSync. Also make sure we share
	authentication.


Modified:
   trunk/ChangeLog
   trunk/daemon/gvfsbackenddav.c
   trunk/daemon/gvfsbackendhttp.c
   trunk/daemon/gvfsbackendhttp.h

Modified: trunk/daemon/gvfsbackenddav.c
==============================================================================
--- trunk/daemon/gvfsbackenddav.c	(original)
+++ trunk/daemon/gvfsbackenddav.c	Mon Feb 25 15:05:40 2008
@@ -1069,6 +1069,13 @@
                     G_CALLBACK (soup_authenticate_from_data),
                     info);
 
+  /* also auth the workaround async session we need for SoupInputStream */
+  g_signal_connect (G_VFS_BACKEND_HTTP (backend)->session_async, "authenticate",
+                    G_CALLBACK (soup_authenticate_from_data),
+                    info);
+
+
+
   g_vfs_job_succeeded (G_VFS_JOB (job));
   g_print ("- mount\n");
 }

Modified: trunk/daemon/gvfsbackendhttp.c
==============================================================================
--- trunk/daemon/gvfsbackendhttp.c	(original)
+++ trunk/daemon/gvfsbackendhttp.c	Mon Feb 25 15:05:40 2008
@@ -67,6 +67,10 @@
   soup_session_abort (backend->session);
   g_object_unref (backend->session);
 
+  soup_session_abort (backend->session_async);
+  g_object_unref (backend->session_async);
+
+
   if (G_OBJECT_CLASS (g_vfs_backend_http_parent_class)->finalize)
     (*G_OBJECT_CLASS (g_vfs_backend_http_parent_class)->finalize) (object);
 }
@@ -77,6 +81,7 @@
   g_vfs_backend_set_user_visible (G_VFS_BACKEND (backend), FALSE);  
 
   backend->session = soup_session_sync_new ();
+  backend->session_async = soup_session_async_new ();
 }
 
 
@@ -226,7 +231,6 @@
 }
 
 
-
 /* ************************************************************************* */
 /* virtual functions overrides */
 
@@ -329,7 +333,7 @@
   op_backend = G_VFS_BACKEND_HTTP (backend);
   msg = message_new_from_filename (backend, "GET", filename);
 
-  stream = soup_input_stream_new (op_backend->session, msg);
+  stream = soup_input_stream_new (op_backend->session_async, msg);
   g_object_unref (msg);
 
   soup_input_stream_send_async (stream,

Modified: trunk/daemon/gvfsbackendhttp.h
==============================================================================
--- trunk/daemon/gvfsbackendhttp.h	(original)
+++ trunk/daemon/gvfsbackendhttp.h	Mon Feb 25 15:05:40 2008
@@ -50,6 +50,8 @@
 
   SoupURI     *mount_base;
   SoupSession *session;
+
+  SoupSession *session_async;
 };
 
 GType        g_vfs_backend_http_get_type    (void) G_GNUC_CONST;