gvfs r1567 - in trunk: . daemon hal

[otte svn gnome org]

Author: otte
Date: Wed Mar  5 19:24:40 2008
New Revision: 1567
URL: http://svn.gnome.org/viewvc/gvfs?rev=1567&view=rev

Log:
2008-03-05  Benjamin Otte  <otte gnome org>

	* daemon/gvfsbackendftp.c: (do_mount):
	set anonymous login to FALSE, no uninitialized variables please.
	* hal/ghalvolumemonitor.c: (adopt_orphan_mount):
	fix warning due to glib changes



Modified:
   trunk/ChangeLog
   trunk/daemon/gvfsbackendftp.c
   trunk/hal/ghalvolumemonitor.c

Modified: trunk/daemon/gvfsbackendftp.c
==============================================================================
--- trunk/daemon/gvfsbackendftp.c	(original)
+++ trunk/daemon/gvfsbackendftp.c	Wed Mar  5 19:24:40 2008
@@ -1161,7 +1161,10 @@
 				     &username,
 				     NULL,
 				     &password))
+    {
+      anonymous = FALSE;
       goto try_login;
+    }
 
   while (TRUE)
     {

Modified: trunk/hal/ghalvolumemonitor.c
==============================================================================
--- trunk/hal/ghalvolumemonitor.c	(original)
+++ trunk/hal/ghalvolumemonitor.c	Wed Mar  5 19:24:40 2008
@@ -489,7 +489,7 @@
 }
 
 static GVolume *
-adopt_orphan_mount (GMount *mount)
+adopt_orphan_mount (GMount *mount, GVolumeMonitor *monitor)
 {
   GList *l;
   GFile *mount_root;