gvfs r1158 - in trunk: . daemon

[alexl svn gnome org]

Author: alexl
Date: Mon Jan 21 14:45:23 2008
New Revision: 1158
URL: http://svn.gnome.org/viewvc/gvfs?rev=1158&view=rev

Log:
2008-01-21  Alexander Larsson  <alexl redhat com>

        * NEWS:
	Update for release
	
        * daemon/Makefile.am:
        * daemon/main.c:
	Autospawn fuse on daemon start.
	
        * daemon/mount.c:
        (read_mountable_config):
	Remove debug spew



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/daemon/Makefile.am
   trunk/daemon/main.c
   trunk/daemon/mount.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Jan 21 14:45:23 2008
@@ -1,3 +1,14 @@
+Major changes in 0.1.3:
+* Various fixes to hal volume monitor
+* Make gvfsd reload config on SIGUSR1
+* Updates to http/dav backends
+* Port http backend to libsoup 2.4.
+* Initial burn:/// backend
+* Add ssh: alias for sftp:
+* Fix fuse mount
+* Automount fuse on startup of daemon
+* Various bugfixes
+
 Major changes in 0.1.2:
 * Switch to intltool fro translation setup
 * Update to latest gio APIS

Modified: trunk/daemon/Makefile.am
==============================================================================
--- trunk/daemon/Makefile.am	(original)
+++ trunk/daemon/Makefile.am	Mon Jan 21 14:45:23 2008
@@ -9,6 +9,7 @@
 	-I$(top_builddir)			\
 	$(GLIB_CFLAGS) $(DBUS_CFLAGS) 		\
 	-DDBUS_API_SUBJECT_TO_CHANGE		\
+	-DLIBEXEC_DIR=\"$(libexecdir)/\" 	\
 	-DMOUNTABLE_DIR=\"$(mountdir)/\" 	\
 	-DG_DISABLE_DEPRECATED
 

Modified: trunk/daemon/main.c
==============================================================================
--- trunk/daemon/main.c	(original)
+++ trunk/daemon/main.c	Mon Jan 21 14:45:23 2008
@@ -24,6 +24,7 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
+#include <glib/gstdio.h>
 #include <dbus/dbus.h>
 #include "gvfsdaemon.h"
 #include "gvfsbackendtest.h"
@@ -36,10 +37,12 @@
   GMainLoop *loop;
   GVfsDaemon *daemon;
   gboolean replace;
+  gboolean no_fuse;
   GError *error;
   GOptionContext *context;
   const GOptionEntry options[] = {
     { "replace", 'r', 0, G_OPTION_ARG_NONE, &replace,  N_("Replace old daemon."), NULL },
+    { "no-fuse", 0, 0, G_OPTION_ARG_NONE, &no_fuse,  N_("Don't start fuse."), NULL },
     { NULL }
   };
 
@@ -53,6 +56,7 @@
   g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
 
   replace = FALSE;
+  no_fuse = FALSE;
   error = NULL;
   if (!g_option_context_parse (context, &argc, &argv, &error))
     {
@@ -73,7 +77,34 @@
   
   loop = g_main_loop_new (NULL, FALSE);
 
-  g_print ("Entering mainloop\n");
+
+#ifdef HAVE_FUSE
+  if (!no_fuse)
+    {
+      char *fuse_path;
+      char *argv[3];
+      
+      fuse_path = g_build_filename (g_get_home_dir (), ".gvfs", NULL);
+      
+      if (!g_file_test (fuse_path, G_FILE_TEST_EXISTS))
+	g_mkdir (fuse_path, 0700);
+      
+      argv[0] = LIBEXEC_DIR "/gvfs-fuse-daemon";
+      argv[1] = fuse_path;
+      argv[2] = NULL;
+      
+      g_spawn_async (NULL,
+		     argv,
+		     NULL,
+		     G_SPAWN_STDOUT_TO_DEV_NULL |
+		     G_SPAWN_STDERR_TO_DEV_NULL, 
+		     NULL, NULL,
+		     NULL, NULL);
+      
+      g_free (fuse_path);
+    }
+#endif
+  
   g_main_loop_run (loop);
   
   return 0;

Modified: trunk/daemon/mount.c
==============================================================================
--- trunk/daemon/mount.c	(original)
+++ trunk/daemon/mount.c	Mon Jan 21 14:45:23 2008
@@ -497,8 +497,6 @@
 			  mountable->dbus_name = g_key_file_get_string (keyfile, "Mount", "DBusName", NULL);
 			  mountable->automount = g_key_file_get_boolean (keyfile, "Mount", "AutoMount", NULL);
 			  
-
-			  g_print ("Mountables type=%s\n", mountable->type);
 			  mountables = g_list_prepend (mountables, mountable);
 			}
 		    }