gdbus: Remove debug prints

31 files changed, 2 insertions, 160 deletions

diff --git a/daemon/daemon-main.c b/daemon/daemon-main.c
index 40d327ad..cca291c4 100644
--- a/daemon/daemon-main.c
+++ b/daemon/daemon-main.c
@@ -159,7 +159,6 @@ call_spawned_cb (GVfsDBusSpawner *proxy,
                   error->message, g_quark_to_string (error->domain), error->code);
       g_error_free (error);
     }
-  g_print ("call_spawned_cb\n");
   
   data->callback (data->user_data);
   g_free (data);
@@ -189,17 +188,13 @@ send_spawned (gboolean succeeded,
       return;
     }
 
-  g_print ("sending spawned.\n");
-  
   error = NULL;
-  g_print ("send_spawned: before proxy creation, spawner_id = '%s', spawner_path = '%s'\n", spawner_id, spawner_path);
   proxy = gvfs_dbus_spawner_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
                                                     G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS | G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
                                                     spawner_id,
                                                     spawner_path,
                                                     NULL,
                                                     &error);
-  g_print ("send_spawned: after proxy creation\n");
   if (proxy == NULL)
     {
       g_printerr ("Error creating proxy: %s (%s, %d)\n",
@@ -212,7 +207,6 @@ send_spawned (gboolean succeeded,
   data->callback = callback;
   data->user_data = user_data;
   
-  g_print ("send_spawned: before call_spawned\n");
   gvfs_dbus_spawner_call_spawned (proxy, 
                                   succeeded,
                                   error_message,
@@ -370,8 +364,6 @@ daemon_main (int argc,
   guint name_owner_id;
   DaemonData *data;
 
-  g_print ("daemon_main: mountable_name = '%s'\n", mountable_name);
-  
   data = g_new0 (DaemonData, 1);
   data->mountable_name = g_strdup (mountable_name);
   data->max_job_threads = max_job_threads;
@@ -395,8 +387,6 @@ daemon_main (int argc,
   name_owner_id = 0;
   if (mountable_name)
     {
-      g_print ("daemon_main: requesting name '%s'\n", mountable_name); 
-
       name_owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
                                       mountable_name,
                                       G_BUS_NAME_OWNER_FLAGS_NONE,
diff --git a/daemon/gvfsbackend.c b/daemon/gvfsbackend.c
index ad27f637..bb39fa47 100644
--- a/daemon/gvfsbackend.c
+++ b/daemon/gvfsbackend.c
@@ -608,8 +608,6 @@ create_mount_tracker_proxy (GVfsBackend *backend,
 {
   AsyncProxyCreate *data;
 
-  g_print ("create_mount_tracker_proxy\n");
-  
   data = g_new0 (AsyncProxyCreate, 1);
   data->callback = op_callback;
   data->callback_data = op_callback_data;
@@ -639,7 +637,6 @@ register_mount_got_proxy_cb (GObject *source_object,
   char *icon_str;
 
   proxy = gvfs_dbus_mount_tracker_proxy_new_for_bus_finish (res, &error);
-  g_print ("register_mount_got_proxy_cb, proxy = %p\n", proxy);
   if (proxy == NULL)
     {
       g_dbus_error_strip_remote_error (error);
@@ -671,8 +668,6 @@ register_mount_got_proxy_cb (GObject *source_object,
   else
    stable_name = backend->priv->display_name;
 
-  g_print ("g_vfs_backend_register_mount: calling register_mount() for object_path = '%s', display_name = '%s'\n", backend->priv->object_path, backend->priv->display_name);
-  
   gvfs_dbus_mount_tracker_call_register_mount (proxy,
                                                backend->priv->object_path,
                                                backend->priv->display_name,
@@ -697,8 +692,6 @@ g_vfs_backend_register_mount (GVfsBackend *backend,
                               GAsyncReadyCallback callback,
 			      gpointer user_data)
 {
-  g_print ("g_vfs_backend_register_mount\n");
-  
   create_mount_tracker_proxy (backend, callback, user_data, register_mount_got_proxy_cb);
 }
 
@@ -714,7 +707,6 @@ unregister_mount_got_proxy_cb (GObject *source_object,
   GVfsBackend *backend;
 
   proxy = gvfs_dbus_mount_tracker_proxy_new_for_bus_finish (res, &error);
-  g_print ("unregister_mount_got_proxy_cb, proxy = %p\n", proxy);
   if (proxy == NULL)
     {
       g_dbus_error_strip_remote_error (error);
@@ -743,8 +735,6 @@ g_vfs_backend_unregister_mount (GVfsBackend *backend,
                                 GAsyncReadyCallback callback,
 				gpointer user_data)
 {
-  g_print ("g_vfs_backend_unregister_mount\n");
-  
   create_mount_tracker_proxy (backend, callback, user_data, unregister_mount_got_proxy_cb);
 }
 
diff --git a/daemon/gvfsdaemon.c b/daemon/gvfsdaemon.c
index b6e19f8b..7de40726 100644
--- a/daemon/gvfsdaemon.c
+++ b/daemon/gvfsdaemon.c
@@ -192,8 +192,6 @@ name_appeared_handler (GDBusConnection *connection,
 {
   GVfsDaemon *daemon = G_VFS_DAEMON (user_data);
 
-  g_print ("gvfsdaemon: name_appeared_handler()\n");
-  
   if (strcmp (name, G_VFS_DBUS_DAEMON_NAME) == 0 &&
       *name_owner != 0 &&
       daemon->lost_main_daemon)
@@ -210,8 +208,6 @@ name_vanished_handler (GDBusConnection *connection,
 {
   GVfsDaemon *daemon = G_VFS_DAEMON (user_data);
 
-  g_print ("gvfsdaemon: name_vanished_handler()\n");
-
   /* Ensure we react only to really lost daemon */ 
   daemon->lost_main_daemon = TRUE;
 }
@@ -222,8 +218,6 @@ g_vfs_daemon_init (GVfsDaemon *daemon)
   GError *error;
   gint max_threads = 1; /* TODO: handle max threads */
 
-  g_print ("g_vfs_daemon_init\n");
-
   daemon->thread_pool = g_thread_pool_new (job_handler_callback,
 					   daemon,
 					   max_threads,
@@ -468,7 +462,6 @@ unref_skeleton (gpointer object)
 {
   GDBusInterfaceSkeleton *skeleton = object;
 
-  g_print ("unref_skeleton: unreffing skeleton %p\n", skeleton);
   g_dbus_interface_skeleton_unexport (skeleton);
   g_object_unref (skeleton);
 }
@@ -483,13 +476,11 @@ peer_register_skeleton (const gchar *obj_path,
   if (! g_hash_table_contains (reg_path->client_skeletons, dbus_conn))
     {
       skeleton = reg_path->callback (dbus_conn, obj_path, reg_path->data);
-      g_print ("registering '%s' on the %p connection\n", obj_path, dbus_conn);
-
       g_hash_table_insert (reg_path->client_skeletons, dbus_conn, skeleton);
     }
   else
     {
-      g_print ("interface skeleton '%s' already registered on the %p connection, skipping\n", obj_path, dbus_conn);
+      /* Interface skeleton has been already registered on the connection, skipping */
     }
 }
 
@@ -511,8 +502,6 @@ g_vfs_daemon_register_path (GVfsDaemon *daemon,
 {
   RegisteredPath *data;
 
-  g_print ("g_vfs_daemon_register_path: obj_path = '%s'\n", obj_path);
-
   data = g_new0 (RegisteredPath, 1);
   data->obj_path = g_strdup (obj_path);
   data->callback = callback;
@@ -607,7 +596,6 @@ peer_unregister_skeleton (const gchar *obj_path,
                           RegisteredPath *reg_path,
                           GDBusConnection *dbus_conn)
 {
-  g_print ("unregistering '%s' on the %p connection\n", obj_path, dbus_conn);
   g_hash_table_remove (reg_path->client_skeletons, dbus_conn);
 }
 
@@ -621,8 +609,6 @@ peer_connection_closed (GDBusConnection *connection,
   GList *l;
   GVfsDBusDaemon *daemon_skeleton;
 
-  g_print ("peer_connection_closed\n");
-  
   g_mutex_lock (&daemon->lock);
   for (l = daemon->jobs; l != NULL; l = l->next)
     {
@@ -679,8 +665,6 @@ daemon_peer_connection_setup (GVfsDaemon *daemon,
   g_hash_table_foreach (daemon->registered_paths, (GHFunc) peer_register_skeleton, dbus_conn);
   
   g_hash_table_insert (daemon->client_connections, g_object_ref (dbus_conn), NULL);
-  
-  g_print ("daemon_peer_connection_setup: interface registration complete.\n");
 
   g_signal_connect (data->conn, "closed", G_CALLBACK (peer_connection_closed), data->daemon);
 
@@ -825,8 +809,6 @@ daemon_new_connection_func (GDBusServer *server,
 
   daemon_peer_connection_setup (data->daemon, data->conn, data);
 
-  g_print ("daemon_new_connection_func: closing server\n");
-  
   /* Kill the server, no more need for it */
   g_dbus_server_stop (server);
   g_object_unref (server);
@@ -847,8 +829,6 @@ handle_get_connection (GVfsDBusDaemon *object,
   char *socket_dir;
   gchar *guid;
   
-  g_print ("called get_connection()\n");
-  
   generate_address (&address1, &socket_dir);
 
   data = g_new (NewConnectionData, 1);
@@ -876,8 +856,7 @@ handle_get_connection (GVfsDBusDaemon *object,
 
   g_dbus_server_start (server);
   data->server = server;
-  
-  g_print ("Server is listening at: %s\n", g_dbus_server_get_client_address (server));
+
   g_signal_connect (server, "new-connection", G_CALLBACK (daemon_new_connection_func), data);
   
   gvfs_dbus_daemon_complete_get_connection (object,
@@ -889,7 +868,6 @@ handle_get_connection (GVfsDBusDaemon *object,
   return TRUE;
 
  error_out:
-  g_print ("handle_get_connection: error_out\n"); 
   g_free (data);
   g_free (address1);
   if (socket_dir)
@@ -910,8 +888,6 @@ handle_cancel (GVfsDBusDaemon *object,
   GList *l;
   GVfsJob *job_to_cancel = NULL;
 
-  g_print ("called cancel(), should be on our private connection only\n");
-  
   g_mutex_lock (&daemon->lock);
   for (l = daemon->jobs; l != NULL; l = l->next)
     {
@@ -951,8 +927,6 @@ daemon_handle_mount (GVfsDBusMountable *object,
   GMountSpec *mount_spec;
   GMountSource *mount_source;
   
-  g_print ("called daemon_handle_mount()\n");
-  
   mount_spec = g_mount_spec_from_dbus (arg_mount_spec);
   if (mount_spec == NULL)
     g_dbus_method_invocation_return_error_literal (invocation,
@@ -985,8 +959,6 @@ g_vfs_daemon_initiate_mount (GVfsDaemon *daemon,
   GVfsJob *job;
   GVfsBackend *backend;
 
-  g_print ("g_vfs_daemon_initiate_mount\n");
-  
   type = g_mount_spec_get_type (mount_spec);
 
   backend_type = G_TYPE_INVALID;
@@ -1010,7 +982,6 @@ g_vfs_daemon_initiate_mount (GVfsDaemon *daemon,
 			  "daemon", daemon,
 			  "object-path", obj_path,
 			  NULL);
-  g_print ("g_vfs_daemon_initiate_mount: obj_path = '%s'\n", obj_path);
   g_free (obj_path);
   
   g_vfs_daemon_add_job_source (daemon, G_VFS_JOB_SOURCE (backend));
diff --git a/daemon/gvfsjobcopy.c b/daemon/gvfsjobcopy.c
index 6320ca04..78849f04 100644
--- a/daemon/gvfsjobcopy.c
+++ b/daemon/gvfsjobcopy.c
@@ -85,8 +85,6 @@ g_vfs_job_copy_new_handle (GVfsDBusMount *object,
   GVfsJobCopy *job;
   GVfsJobProgress *progress_job;
 
-  g_print ("called Copy()\n");
-
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
   
diff --git a/daemon/gvfsjobcreatemonitor.c b/daemon/gvfsjobcreatemonitor.c
index 4e3d772e..fbd09aa8 100644
--- a/daemon/gvfsjobcreatemonitor.c
+++ b/daemon/gvfsjobcreatemonitor.c
@@ -109,8 +109,6 @@ g_vfs_job_create_file_monitor_new_handle (GVfsDBusMount *object,
                                           guint arg_flags,
                                           GVfsBackend *backend)
 {
-  g_print ("called CreateFileMonitor()\n");
-  
   return create_monitor_new_handle (object, invocation, arg_path_data, arg_flags, backend, FALSE);
 }
 
@@ -122,8 +120,6 @@ g_vfs_job_create_directory_monitor_new_handle (GVfsDBusMount *object,
                                                guint arg_flags,
                                                GVfsBackend *backend)
 {
-  g_print ("called CreateDirectoryMonitor()\n");
-  
   return create_monitor_new_handle (object, invocation, arg_path_data, arg_flags, backend, TRUE);
 }
 
diff --git a/daemon/gvfsjobdbus.c b/daemon/gvfsjobdbus.c
index 57852a4f..6b9f4cdd 100644
--- a/daemon/gvfsjobdbus.c
+++ b/daemon/gvfsjobdbus.c
@@ -173,8 +173,6 @@ g_vfs_job_dbus_is_serial (GVfsJobDBus *job_dbus,
   message = g_dbus_method_invocation_get_message (job_dbus->invocation);
   message_connection = g_dbus_method_invocation_get_connection (job_dbus->invocation);
   
-  g_print ("g_vfs_job_dbus_is_serial: serial = %u, message serial = %u, connection = %p, message connection = %p\n", serial, g_dbus_message_get_serial (message), connection, message_connection);
-  
   return message_connection == connection &&
       g_dbus_message_get_serial (message) == serial;
 }
diff --git a/daemon/gvfsjobdelete.c b/daemon/gvfsjobdelete.c
index 51f59c3f..ce3aa5bc 100644
--- a/daemon/gvfsjobdelete.c
+++ b/daemon/gvfsjobdelete.c
@@ -79,8 +79,6 @@ g_vfs_job_delete_new_handle (GVfsDBusMount *object,
 {
   GVfsJobDelete *job;
 
-  g_print ("called Delete()\n");
-
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
 
diff --git a/daemon/gvfsjobenumerate.c b/daemon/gvfsjobenumerate.c
index 1dd25fac..89890761 100644
--- a/daemon/gvfsjobenumerate.c
+++ b/daemon/gvfsjobenumerate.c
@@ -90,8 +90,6 @@ g_vfs_job_enumerate_new_handle (GVfsDBusMount *object,
 {
   GVfsJobEnumerate *job;
 
-  g_print ("called Enumerate()\n");
-
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
   
@@ -123,8 +121,6 @@ create_enumerator_proxy (GVfsJobEnumerate *job)
   connection = g_dbus_method_invocation_get_connection (G_VFS_JOB_DBUS (job)->invocation);
   sender = g_dbus_method_invocation_get_sender (G_VFS_JOB_DBUS (job)->invocation);
 
-  g_print ("create_enumerator_proxy: sender = '%s', object_path = '%s'\n", sender, job->object_path);
-  
   return gvfs_dbus_enumerator_proxy_new_sync (connection,
                                               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
                                               sender,
@@ -228,8 +224,6 @@ send_done_cb (GVfsDBusEnumerator *proxy,
 {
   GError *error = NULL;
 
-  g_print ("send_done_cb\n");
-
   gvfs_dbus_enumerator_call_done_finish (proxy, res, &error);
   if (error != NULL)
     {
@@ -245,8 +239,6 @@ g_vfs_job_enumerate_done (GVfsJobEnumerate *job)
   
   g_assert (!G_VFS_JOB (job)->failed);
 
-  g_print ("g_vfs_job_enumerate_done: sending...\n");
-
   if (job->building_infos != NULL)
     send_infos (job);
 
@@ -259,8 +251,6 @@ g_vfs_job_enumerate_done (GVfsJobEnumerate *job)
                                   NULL);
   g_object_unref (proxy);
 
-  g_print ("g_vfs_job_enumerate_done: done.\n");
-
   g_vfs_job_emit_finished (G_VFS_JOB (job));
 }
 
diff --git a/daemon/gvfsjobmakedirectory.c b/daemon/gvfsjobmakedirectory.c
index c26430e2..489c99c5 100644
--- a/daemon/gvfsjobmakedirectory.c
+++ b/daemon/gvfsjobmakedirectory.c
@@ -79,8 +79,6 @@ g_vfs_job_make_directory_new_handle (GVfsDBusMount *object,
 {
   GVfsJobMakeDirectory *job;
 
-  g_print ("called MakeDirectory()\n");
-
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
   
diff --git a/daemon/gvfsjobmakesymlink.c b/daemon/gvfsjobmakesymlink.c
index a369c753..2c55e26b 100644
--- a/daemon/gvfsjobmakesymlink.c
+++ b/daemon/gvfsjobmakesymlink.c
@@ -81,8 +81,6 @@ g_vfs_job_make_symlink_new_handle (GVfsDBusMount *object,
 {
   GVfsJobMakeSymlink *job;
 
-  g_print ("called MakeSymlink()\n");
-
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
   
diff --git a/daemon/gvfsjobmountmountable.c b/daemon/gvfsjobmountmountable.c
index 8e14159f..cec49df4 100644
--- a/daemon/gvfsjobmountmountable.c
+++ b/daemon/gvfsjobmountmountable.c
@@ -88,8 +88,6 @@ g_vfs_job_mount_mountable_new_handle (GVfsDBusMount *object,
 {
   GVfsJobMountMountable *job;
 
-  g_print ("called MountMountable()\n");
-
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
   
diff --git a/daemon/gvfsjobmove.c b/daemon/gvfsjobmove.c
index c74f074f..07480553 100644
--- a/daemon/gvfsjobmove.c
+++ b/daemon/gvfsjobmove.c
@@ -85,8 +85,6 @@ g_vfs_job_move_new_handle (GVfsDBusMount *object,
   GVfsJobMove *job;
   GVfsJobProgress *progress_job;
 
-  g_print ("called Move()\n");
-
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
   
diff --git a/daemon/gvfsjobopenforread.c b/daemon/gvfsjobopenforread.c
index ec463741..32eaf59e 100644
--- a/daemon/gvfsjobopenforread.c
+++ b/daemon/gvfsjobopenforread.c
@@ -89,8 +89,6 @@ g_vfs_job_open_for_read_new_handle (GVfsDBusMount *object,
                                     GVfsBackend *backend)
 {
   GVfsJobOpenForRead *job;
-  
-  g_print ("called OpenForRead()\n");
 
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
diff --git a/daemon/gvfsjobopenforwrite.c b/daemon/gvfsjobopenforwrite.c
index 87a6ff1b..9544d51d 100644
--- a/daemon/gvfsjobopenforwrite.c
+++ b/daemon/gvfsjobopenforwrite.c
@@ -95,8 +95,6 @@ g_vfs_job_open_for_write_new_handle (GVfsDBusMount *object,
 {
   GVfsJobOpenForWrite *job;
   
-  g_print ("called OpenForWrite()\n");
-
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
   
diff --git a/daemon/gvfsjobopeniconforread.c b/daemon/gvfsjobopeniconforread.c
index 603ffc7c..bcb5361d 100644
--- a/daemon/gvfsjobopeniconforread.c
+++ b/daemon/gvfsjobopeniconforread.c
@@ -70,8 +70,6 @@ g_vfs_job_open_icon_for_read_new_handle (GVfsDBusMount *object,
 {
   GVfsJobOpenIconForRead *job;
   GVfsJobOpenForRead *job_open_for_read;
-  
-  g_print ("called OpenIconForRead()\n");
 
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
diff --git a/daemon/gvfsjobpollmountable.c b/daemon/gvfsjobpollmountable.c
index d9bbbbcb..ec32027e 100644
--- a/daemon/gvfsjobpollmountable.c
+++ b/daemon/gvfsjobpollmountable.c
@@ -78,8 +78,6 @@ g_vfs_job_poll_mountable_new_handle (GVfsDBusMount *object,
 {
   GVfsJobPollMountable *job;
 
-  g_print ("called PollMountable()\n");
-
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
 
diff --git a/daemon/gvfsjobpull.c b/daemon/gvfsjobpull.c
index 843d6f65..ffafedb6 100644
--- a/daemon/gvfsjobpull.c
+++ b/daemon/gvfsjobpull.c
@@ -87,8 +87,6 @@ g_vfs_job_pull_new_handle (GVfsDBusMount *object,
   GVfsJobPull *job;
   GVfsJobProgress *progress_job;
 
-  g_print ("called Pull()\n");
-
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
   
diff --git a/daemon/gvfsjobpush.c b/daemon/gvfsjobpush.c
index ffd3e979..ddbec43b 100644
--- a/daemon/gvfsjobpush.c
+++ b/daemon/gvfsjobpush.c
@@ -87,8 +87,6 @@ g_vfs_job_push_new_handle (GVfsDBusMount *object,
   GVfsJobPush *job;
   GVfsJobProgress *progress_job;
 
-  g_print ("called Push()\n");
-
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
   
diff --git a/daemon/gvfsjobqueryattributes.c b/daemon/gvfsjobqueryattributes.c
index ba7d7be2..dea6b3ba 100644
--- a/daemon/gvfsjobqueryattributes.c
+++ b/daemon/gvfsjobqueryattributes.c
@@ -81,8 +81,6 @@ g_vfs_job_query_settable_attributes_new_handle (GVfsDBusMount *object,
 {
   GVfsJobQueryAttributes *job;
 
-  g_print ("called QuerySettableAttributes()\n");
-
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
   
@@ -109,8 +107,6 @@ g_vfs_job_query_writable_namespaces_new_handle (GVfsDBusMount *object,
 {
   GVfsJobQueryAttributes *job;
 
-  g_print ("called QueryWritableNamespaces()\n");
-
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
   
diff --git a/daemon/gvfsjobqueryfsinfo.c b/daemon/gvfsjobqueryfsinfo.c
index e62769ba..f5f9791a 100644
--- a/daemon/gvfsjobqueryfsinfo.c
+++ b/daemon/gvfsjobqueryfsinfo.c
@@ -83,8 +83,6 @@ g_vfs_job_query_fs_info_new_handle (GVfsDBusMount *object,
 {
   GVfsJobQueryFsInfo *job;
   
-  g_print ("called QueryFsInfo()\n");
-  
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
 
diff --git a/daemon/gvfsjobqueryinfo.c b/daemon/gvfsjobqueryinfo.c
index ee26dc44..b963c2b9 100644
--- a/daemon/gvfsjobqueryinfo.c
+++ b/daemon/gvfsjobqueryinfo.c
@@ -88,8 +88,6 @@ g_vfs_job_query_info_new_handle (GVfsDBusMount *object,
 {
   GVfsJobQueryInfo *job;
 
-  g_print ("called QueryInfo()\n");
-
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
 
diff --git a/daemon/gvfsjobsetattribute.c b/daemon/gvfsjobsetattribute.c
index 4d3d9f42..943f79ca 100644
--- a/daemon/gvfsjobsetattribute.c
+++ b/daemon/gvfsjobsetattribute.c
@@ -87,8 +87,6 @@ g_vfs_job_set_attribute_new_handle (GVfsDBusMount *object,
   gchar *attribute;
   GFileAttributeType type;
   GDBusAttributeValue value;
- 
-  g_print ("called SetAttribute()\n");
 
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
diff --git a/daemon/gvfsjobsetdisplayname.c b/daemon/gvfsjobsetdisplayname.c
index 148f9c7a..bcc779c5 100644
--- a/daemon/gvfsjobsetdisplayname.c
+++ b/daemon/gvfsjobsetdisplayname.c
@@ -80,8 +80,6 @@ g_vfs_job_set_display_name_new_handle (GVfsDBusMount *object,
                                        GVfsBackend *backend)
 {
   GVfsJobSetDisplayName *job;
-  
-  g_print ("called SetDisplayName()\n");
 
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
diff --git a/daemon/gvfsjobstartmountable.c b/daemon/gvfsjobstartmountable.c
index 9b0dce54..264dac75 100644
--- a/daemon/gvfsjobstartmountable.c
+++ b/daemon/gvfsjobstartmountable.c
@@ -83,8 +83,6 @@ g_vfs_job_start_mountable_new_handle (GVfsDBusMount *object,
 {
   GVfsJobStartMountable *job;
 
-  g_print ("called StartMountable()\n");
-
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
   
diff --git a/daemon/gvfsjobstopmountable.c b/daemon/gvfsjobstopmountable.c
index f876e7ee..31a4f1d8 100644
--- a/daemon/gvfsjobstopmountable.c
+++ b/daemon/gvfsjobstopmountable.c
@@ -84,8 +84,6 @@ g_vfs_job_stop_mountable_new_handle (GVfsDBusMount *object,
 {
   GVfsJobStopMountable *job;
 
-  g_print ("called StopMountable()\n");
-
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
   
diff --git a/daemon/gvfsjobtrash.c b/daemon/gvfsjobtrash.c
index 5e2f8a9c..21d57baf 100644
--- a/daemon/gvfsjobtrash.c
+++ b/daemon/gvfsjobtrash.c
@@ -77,8 +77,6 @@ g_vfs_job_trash_new_handle (GVfsDBusMount *object,
                             GVfsBackend *backend)
 {
   GVfsJobTrash *job;
-  
-  g_print ("called Trash()\n");
 
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
diff --git a/daemon/gvfsjobunmount.c b/daemon/gvfsjobunmount.c
index ed78f5a1..2f2edf2c 100644
--- a/daemon/gvfsjobunmount.c
+++ b/daemon/gvfsjobunmount.c
@@ -84,8 +84,6 @@ g_vfs_job_unmount_new_handle (GVfsDBusMount *object,
 {
   GVfsJobUnmount *job;
 
-  g_print ("called Unmount()\n");
-
   if (g_vfs_backend_invocation_first_handler (object, invocation, backend))
     return TRUE;
 
diff --git a/daemon/gvfsjobunmountmountable.c b/daemon/gvfsjobunmountmountable.c
index a87de3bf..f9884dc6 100644
--- a/daemon/gvfsjobunmountmountable.c
+++ b/daemon/gvfsjobunmountmountable.c
@@ -114,8 +114,6 @@ g_vfs_job_unmount_mountable_new_handle (GVfsDBusMount *object,
                                         const gchar *arg_obj_path,
                                         GVfsBackend *backend)
 {
-  g_print ("called UnmountMountable()\n");
-
   return do_g_vfs_job_unmount_mountable_new_handle (object,
                                                     invocation,
                                                     arg_path_data,
@@ -135,8 +133,6 @@ g_vfs_job_eject_mountable_new_handle (GVfsDBusMount *object,
                                       const gchar *arg_obj_path,
                                       GVfsBackend *backend)
 {
-  g_print ("called EjectMountable()\n");
-
   return do_g_vfs_job_unmount_mountable_new_handle (object,
                                                     invocation,
                                                     arg_path_data,
diff --git a/daemon/gvfsmonitor.c b/daemon/gvfsmonitor.c
index 358be8f4..550eb8dd 100644
--- a/daemon/gvfsmonitor.c
+++ b/daemon/gvfsmonitor.c
@@ -159,8 +159,6 @@ subscriber_connection_closed (GDBusConnection *connection,
                               GError          *error,
                               Subscriber      *subscriber)
 {
-  g_print ("subscriber_connection_closed, connection = %p\n", connection);
-  
   unsubscribe (subscriber);
 }
 
@@ -172,8 +170,6 @@ handle_subscribe (GVfsDBusMonitor *object,
 {
   Subscriber *subscriber;
 
-  g_print ("handle_subscribe: adding connection %p\n", g_dbus_method_invocation_get_connection (invocation));
-  
   subscriber = g_new0 (Subscriber, 1);
   subscriber->connection = g_object_ref (g_dbus_method_invocation_get_connection (invocation));
   subscriber->id = g_strdup (g_dbus_method_invocation_get_sender (invocation));
@@ -198,8 +194,6 @@ handle_unsubscribe (GVfsDBusMonitor *object,
   Subscriber *subscriber;
   GList *l;
 
-  g_print ("handle_unsubscribe\n");
-
   g_object_ref (monitor); /* Keep alive during possible last remove */
   for (l = monitor->priv->subscribers; l != NULL; l = l->next)
     {
@@ -301,7 +295,6 @@ changed_cb (GVfsDBusMonitorClient *proxy,
 {
   GError *error = NULL;
 
-  g_print ("gvfsmonitor.c: changed_cb()\n");
   if (! gvfs_dbus_monitor_client_call_changed_finish (proxy, res, &error))
     {
       g_printerr ("Error calling org.gtk.vfs.MonitorClient.Changed(): %s (%s, %d)\n",
@@ -320,7 +313,6 @@ got_proxy_cb (GObject *source_object,
   GError *error = NULL;
   GVfsDBusMonitorClient *proxy;
   
-  g_print ("gvfsmonitor.c: got_proxy_cb()\n");
   proxy = gvfs_dbus_monitor_client_proxy_new_finish (res, &error);
   if (proxy == NULL)
     {
@@ -351,8 +343,6 @@ g_vfs_monitor_emit_event (GVfsMonitor       *monitor,
 {
   GList *l;
   Subscriber *subscriber;
-  
-  g_print ("g_vfs_monitor_emit_event: file_path = '%s', other_file_path = '%s'\n", file_path, other_file_path);
 
   for (l = monitor->priv->subscribers; l != NULL; l = l->next)
     {
@@ -366,8 +356,6 @@ g_vfs_monitor_emit_event (GVfsMonitor       *monitor,
       data->file_path = g_strdup (file_path);
       data->other_file_path = g_strdup (other_file_path);
 
-      g_print ("  subscriber %p: object_path = '%s', name = '%s'\n", subscriber, subscriber->object_path, subscriber->id);
-      
       gvfs_dbus_monitor_client_proxy_new (subscriber->connection,
                                           G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
                                           subscriber->id,
diff --git a/daemon/main.c b/daemon/main.c
index 4b52e34e..f565f415 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -69,7 +69,6 @@ on_name_acquired (GDBusConnection *connection,
 {
   gboolean no_fuse = GPOINTER_TO_UINT (user_data);
 
-  g_warning ("main.c: Acquired the name %s on the session message bus\n", name);
   already_acquired = TRUE;
 
   if (! mount_init ())
diff --git a/daemon/mount.c b/daemon/mount.c
index f16a897f..1703bcfc 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -260,8 +260,6 @@ mount_data_free (MountData *data)
   g_free (data->obj_path);
   g_clear_object (&data->spawner);
 
-  g_print ("mount_data_free\n");
-
   g_free (data);
 }
 
@@ -311,7 +309,6 @@ mountable_mount_proxy_cb (GObject *source_object,
   MountData *data = user_data;
   
   proxy = gvfs_dbus_mountable_proxy_new_for_bus_finish (res, &error);
-  g_print ("mountable_mount_proxy_cb: proxy = %p, error = %p\n", proxy, error);
 
   if (proxy == NULL)
     {
@@ -339,8 +336,6 @@ static void
 mountable_mount_with_name (MountData *data,
 			   const char *dbus_name)
 {
-  g_print ("mountable_mount_with_name: dbus_name = '%s'\n", dbus_name);
-  
   gvfs_dbus_mountable_proxy_new_for_bus (G_BUS_TYPE_SESSION,
                                          G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS | G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
                                          dbus_name,
@@ -360,8 +355,6 @@ spawn_mount_handle_spawned (GVfsDBusSpawner *object,
   MountData *data = user_data;
   GError *error;
 
-  g_print ("called org.gtk.vfs.Spawner.spawned(), sender = '%s', succeeded = %d\n", g_dbus_method_invocation_get_sender (invocation), arg_succeeded);
-  
   g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (data->spawner));
   
   if (!arg_succeeded)
@@ -427,12 +420,10 @@ spawn_mount (MountData *data)
       exec = g_strconcat (data->mountable->exec, " --spawner ", g_dbus_connection_get_unique_name (connection), " ", data->obj_path, NULL);
       if (!g_spawn_command_line_async (exec, &error))
 	{
-          g_print ("spawning failed.\n");
           g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (data->spawner));
 	  mount_finish (data, error);
 	  g_error_free (error);
 	}
-      g_print ("spawn okay.\n");
       
       /* TODO: Add a timeout here to detect spawned app crashing */
       
@@ -540,8 +531,6 @@ static void
 signal_mounted_unmounted (VfsMount *mount,
 			  gboolean mounted)
 {
-  g_print ("signal_mounted_unmounted: signalling %s\n", mounted ? "mount" : "umount");
-  
   if (mounted)
     gvfs_dbus_mount_tracker_emit_mounted (mount_tracker, vfs_mount_to_dbus (mount));
   else
@@ -574,8 +563,6 @@ name_vanished_cb (GDBusConnection *connection,
                   const gchar *name,
                   gpointer user_data)
 {
-  g_print ("name_vanished_cb: name = '%s'\n", name);
-  
   dbus_client_disconnected (name);
 }
 
@@ -597,8 +584,6 @@ handle_register_mount (GVfsDBusMountTracker *object,
   const char *id;
   GMountSpec *mount_spec;
 
-  g_print ("called handle_register_mount()\n");
-
   id = g_dbus_method_invocation_get_sender (invocation);
 
   if (find_vfs_mount (id, arg_obj_path) != NULL) {
@@ -653,8 +638,6 @@ handle_register_mount (GVfsDBusMountTracker *object,
       
       mounts = g_list_prepend (mounts, mount);
 
-      g_print ("handle_register_mount: dbus_id = '%s'\n", id);
-      
       /* watch the mount for being disconnected */
       mount->name_watcher_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
                                                  id,
@@ -666,7 +649,6 @@ handle_register_mount (GVfsDBusMountTracker *object,
 
       signal_mounted_unmounted (mount, TRUE);
 
-      g_print ("handle_register_mount: calling complete\n");
       gvfs_dbus_mount_tracker_complete_register_mount (object, invocation);
     }
   
@@ -765,8 +747,6 @@ handle_lookup_mount (GVfsDBusMountTracker *object,
 {
   GMountSpec *spec;
 
-  g_print ("called lookup_mount(), sender = '%s', obj_path = '%s'\n", g_dbus_method_invocation_get_sender (invocation), g_dbus_method_invocation_get_object_path (invocation));
-
   spec = g_mount_spec_from_dbus (arg_mount_spec);
 
   if (spec != NULL)
@@ -790,8 +770,6 @@ handle_lookup_mount_by_fuse_path (GVfsDBusMountTracker *object,
 {
   VfsMount *mount;
 
-  g_print ("called lookup_mount_by_fuse_path()\n");
-
   mount = find_vfs_mount_by_fuse_path (arg_fuse_path);
 
   if (mount == NULL)
@@ -815,8 +793,6 @@ handle_list_mounts (GVfsDBusMountTracker *object,
   GList *l;
   GVariantBuilder mounts_array;
 
-  g_print ("called list_mounts()\n");
-
   g_variant_builder_init (&mounts_array, G_VARIANT_TYPE (VFS_MOUNT_ARRAY_DBUS_STRUCT_TYPE));
   for (l = mounts; l != NULL; l = l->next)
     g_variant_builder_add_value (&mounts_array, vfs_mount_to_dbus (l->data));
@@ -853,8 +829,6 @@ handle_mount_location (GVfsDBusMountTracker *object,
   GMountSpec *spec;
   VfsMountable *mountable;
 
-  g_print ("called mount_location()\n");
-
   spec = g_mount_spec_from_dbus (arg_mount_spec);
   if (spec == NULL)
     g_dbus_method_invocation_return_error_literal (invocation,
@@ -910,8 +884,6 @@ handle_list_mount_types (GVfsDBusMountTracker *object,
   GPtrArray *types;
   GList *l;
 
-  g_print ("called list_mount_types()\n");
-
   types = g_ptr_array_new ();
   for (l = mountables; l != NULL; l = l->next)
     {
@@ -935,8 +907,6 @@ handle_list_mountable_info (GVfsDBusMountTracker *object,
   GList *l;
   GVariantBuilder mountables_array;
   
-  g_print ("called list_mountable_info()\n");
-  
   g_variant_builder_init (&mountables_array, G_VARIANT_TYPE (VFS_MOUNTABLE_ARRAY_DBUS_STRUCT_TYPE));
   for (l = mountables; l != NULL; l = l->next) {
     g_variant_builder_add_value (&mountables_array, vfs_mountable_to_dbus (l->data));
@@ -953,8 +923,6 @@ handle_register_fuse (GVfsDBusMountTracker *object,
                       GDBusMethodInvocation *invocation,
                       gpointer user_data)
 {
-  g_print ("called register_fuse()\n");
-  
   fuse_available = TRUE;
   gvfs_dbus_mount_tracker_complete_register_fuse (object, invocation);