From 8337af6b8f0437556198b5eba99a0d05ba545630 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Mon, 21 Jan 2008 14:45:23 +0000
Subject: Update for release

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


svn path=/trunk/; revision=1158
---
 ChangeLog          | 13 +++++++++++++
 NEWS               | 11 +++++++++++
 daemon/Makefile.am |  1 +
 daemon/main.c      | 33 ++++++++++++++++++++++++++++++++-
 daemon/mount.c     |  2 --
 5 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1b921b61..310cadaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+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
+
 2008-01-21  Alexander Larsson  <alexl@redhat.com>
 
 	* client/gvfsfusedaemon.c:
diff --git a/NEWS b/NEWS
index 222a3757..a095c7d3 100644
--- a/NEWS
+++ b/NEWS
@@ -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
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 5543f22a..d33d7fbf 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES =					\
 	-I$(top_builddir)			\
 	$(GLIB_CFLAGS) $(DBUS_CFLAGS) 		\
 	-DDBUS_API_SUBJECT_TO_CHANGE		\
+	-DLIBEXEC_DIR=\"$(libexecdir)/\" 	\
 	-DMOUNTABLE_DIR=\"$(mountdir)/\" 	\
 	-DG_DISABLE_DEPRECATED
 
diff --git a/daemon/main.c b/daemon/main.c
index 524bb5bc..3b912a7b 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -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 @@ main (int argc, char *argv[])
   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 @@ main (int argc, char *argv[])
   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 @@ main (int argc, char *argv[])
   
   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;
diff --git a/daemon/mount.c b/daemon/mount.c
index 96ac6684..705452f6 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -497,8 +497,6 @@ read_mountable_config (void)
 			  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);
 			}
 		    }
-- 
cgit v1.2.1