gvfs r2298 - in trunk: . daemon

[alexl svn gnome org]

Author: alexl
Date: Fri Mar  6 16:08:54 2009
New Revision: 2298
URL: http://svn.gnome.org/viewvc/gvfs?rev=2298&view=rev

Log:
2009-03-06  Alexander Larsson  <alexl redhat com>

        * ChangeLog:
        * daemon/daemon-main.c:
	Only spew g_debug if backend started with --debug



Modified:
   trunk/ChangeLog
   trunk/daemon/daemon-main.c

Modified: trunk/daemon/daemon-main.c
==============================================================================
--- trunk/daemon/daemon-main.c	(original)
+++ trunk/daemon/daemon-main.c	Fri Mar  6 16:08:54 2009
@@ -38,7 +38,17 @@
 static char *spawner_id = NULL;
 static char *spawner_path = NULL;
 
+static gboolean print_debug = FALSE;
 
+static void
+log_debug (const gchar   *log_domain,
+	   GLogLevelFlags log_level,
+	   const gchar   *message,
+	   gpointer	      unused_data)
+{
+  if (print_debug)
+    g_print ("%s", message);
+}
 
 void
 daemon_init (void)
@@ -56,6 +66,9 @@
   g_thread_init (NULL);
   g_type_init ();
 
+  g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, log_debug, NULL);
+
+  
   dbus_error_init (&derror);
   connection = dbus_bus_get (DBUS_BUS_SESSION, &derror);
   if (connection == NULL)
@@ -122,6 +135,13 @@
 daemon_parse_args (int argc, char *argv[], const char *default_type)
 {
   GMountSpec *mount_spec;
+
+  if (argc > 1 && strcmp (argv[1], "--debug") == 0)
+    {
+      print_debug = TRUE;
+      argc--;
+      argv++;
+    }
   
   mount_spec = NULL;
   if (argc > 1 && strcmp (argv[1], "--spawner") == 0)