diff options
40 files changed, 3 insertions, 391 deletions
diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c index dac616dd..144104b1 100644 --- a/client/gdaemonfile.c +++ b/client/gdaemonfile.c @@ -498,7 +498,6 @@ typedef struct { static void async_proxy_create_free (AsyncProxyCreate *data) { - g_print ("async_proxy_create_free\n"); if (data->notify) data->notify (data->callback_data); @@ -526,7 +525,6 @@ async_proxy_new_cb (GObject *source_object, GSimpleAsyncResult *result; proxy = gvfs_dbus_mount_proxy_new_finish (res, &error); - g_print ("async_proxy_new_cb, proxy = %p\n", proxy); if (proxy == NULL) { _g_simple_async_result_take_error_stripped (data->result, error); @@ -600,8 +598,6 @@ async_got_connection_cb (GDBusConnection *connection, { AsyncProxyCreate *data = callback_data; - g_print ("async_got_connection_cb, connection = %p\n", connection); - if (connection == NULL) { /* TODO: we should probably test if we really want a session bus; @@ -622,8 +618,6 @@ async_got_mount_info (GMountInfo *mount_info, GError *error) { AsyncProxyCreate *data = _data; - - g_print ("async_got_mount_info, mount_info = %p\n", mount_info); if (error != NULL) { @@ -654,8 +648,6 @@ create_proxy_for_file_async (GFile *file, GDaemonFile *daemon_file = G_DAEMON_FILE (file); AsyncProxyCreate *data; - g_print ("create_proxy_for_file_async\n"); - data = g_new0 (AsyncProxyCreate, 1); data->result = g_simple_async_result_new (G_OBJECT (file), @@ -691,8 +683,6 @@ g_daemon_file_enumerate_children (GFile *file, gboolean res; GError *local_error = NULL; - g_print ("g_daemon_file_enumerate_children\n"); - enumerator = g_daemon_file_enumerator_new (file, attributes, TRUE); proxy = create_proxy_for_file (file, NULL, &path, &connection, cancellable, error); @@ -710,8 +700,6 @@ g_daemon_file_enumerate_children (GFile *file, uri, cancellable, &local_error); - - g_print ("g_daemon_file_enumerate_children: done, res = %d\n", res); if (! res) { @@ -816,8 +804,6 @@ g_daemon_file_query_info (GFile *file, gboolean res; GError *local_error = NULL; - g_print ("g_daemon_file_query_info\n"); - proxy = create_proxy_for_file (file, NULL, &path, NULL, cancellable, error); if (proxy == NULL) return NULL; @@ -834,8 +820,6 @@ g_daemon_file_query_info (GFile *file, cancellable, &local_error); - g_print ("g_daemon_file_query_info: done, res = %d\n", res); - if (! res) { if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) @@ -892,7 +876,6 @@ query_info_async_cb (GVfsDBusMount *proxy, GFileInfo *info; GFile *file; - g_print ("query_info_async_cb\n"); orig_result = data->result; if (! gvfs_dbus_mount_call_query_info_finish (proxy, &iter_info, res, &error)) @@ -936,8 +919,6 @@ query_info_async_get_proxy_cb (GVfsDBusMount *proxy, AsyncCallQueryInfo *data = callback_data; char *uri; - g_print ("query_info_async_get_proxy_cb, proxy = %p\n", proxy); - uri = g_file_get_uri (data->file); data->result = g_object_ref (result); @@ -966,8 +947,6 @@ g_daemon_file_query_info_async (GFile *file, { AsyncCallQueryInfo *data; - g_print ("g_daemon_file_query_info_async\n"); - data = g_new0 (AsyncCallQueryInfo, 1); data->file = g_object_ref (file); data->attributes = g_strdup (attributes); @@ -1036,7 +1015,6 @@ read_async_cb (GVfsDBusMount *proxy, guint fd_id; GFileInputStream *stream; - g_print ("read_async_cb\n"); orig_result = data->result; if (! gvfs_dbus_mount_call_open_for_read_finish (proxy, &fd_id_val, &can_seek, &fd_list, res, &error)) @@ -1082,8 +1060,6 @@ file_read_async_get_proxy_cb (GVfsDBusMount *proxy, AsyncCallFileReadWrite *data = callback_data; guint32 pid; - g_print ("file_read_async_get_proxy_cb, proxy = %p\n", proxy); - pid = get_pid_for_file (data->file); data->result = g_object_ref (result); @@ -1107,8 +1083,6 @@ g_daemon_file_read_async (GFile *file, { AsyncCallFileReadWrite *data; - g_print ("g_daemon_file_read_async\n"); - data = g_new0 (AsyncCallFileReadWrite, 1); data->file = g_object_ref (file); data->io_priority = io_priority; @@ -1152,8 +1126,6 @@ g_daemon_file_read (GFile *file, guint32 pid; GError *local_error = NULL; - g_print ("g_daemon_file_read\n"); - pid = get_pid_for_file (file); proxy = create_proxy_for_file (file, NULL, &path, NULL, cancellable, error); @@ -1169,8 +1141,6 @@ g_daemon_file_read (GFile *file, &fd_list, cancellable, &local_error); - - g_print ("g_daemon_file_read: done, res = %d\n", res); if (! res) { @@ -1243,8 +1213,6 @@ file_open_write (GFile *file, &fd_list, cancellable, &local_error); - - g_print ("file_open_write: done, res = %d\n", res); if (! res) { @@ -1280,8 +1248,6 @@ g_daemon_file_append_to (GFile *file, GCancellable *cancellable, GError **error) { - g_print ("g_daemon_file_append_to\n"); - return file_open_write (file, 1, "", FALSE, flags, cancellable, error); } @@ -1291,8 +1257,6 @@ g_daemon_file_create (GFile *file, GCancellable *cancellable, GError **error) { - g_print ("g_daemon_file_create\n"); - return file_open_write (file, 0, "", FALSE, flags, cancellable, error); } @@ -1304,8 +1268,6 @@ g_daemon_file_replace (GFile *file, GCancellable *cancellable, GError **error) { - g_print ("g_daemon_file_replace\n"); - return file_open_write (file, 2, etag, make_backup, flags, cancellable, error); } @@ -1335,8 +1297,6 @@ mount_mountable_location_mounted_cb (GObject *source_object, GSimpleAsyncResult *result = user_data; GError *error = NULL; - g_print ("mount_mountable_location_mounted_cb\n"); - if (!g_file_mount_enclosing_volume_finish (G_FILE (source_object), res, &error)) { _g_simple_async_result_take_error_stripped (result, error); @@ -1361,7 +1321,6 @@ mount_mountable_async_cb (GVfsDBusMount *proxy, GFile *file; GMountSpec *mount_spec; - g_print ("mount_mountable_async_cb\n"); orig_result = data->result; data->result = NULL; @@ -1436,8 +1395,6 @@ mount_mountable_got_proxy_cb (GVfsDBusMount *proxy, GMountSource *mount_source; const char *dbus_id, *obj_path; - g_print ("mount_mountable_got_proxy_cb, proxy = %p\n", proxy); - data->result = g_object_ref (result); mount_source = g_mount_operation_dbus_wrap (data->mount_operation, _g_daemon_vfs_get_async_bus ()); @@ -1466,8 +1423,6 @@ g_daemon_file_mount_mountable (GFile *file, gpointer user_data) { AsyncMountOp *data; - - g_print ("g_daemon_file_mount_mountable\n"); data = g_new0 (AsyncMountOp, 1); data->flags = flags; @@ -1506,7 +1461,6 @@ start_mountable_async_cb (GVfsDBusMount *proxy, GSimpleAsyncResult *orig_result; GError *error = NULL; - g_print ("start_mountable_async_cb\n"); orig_result = data->result; if (! gvfs_dbus_mount_call_start_mountable_finish (proxy, res, &error)) @@ -1532,8 +1486,6 @@ start_mountable_got_proxy_cb (GVfsDBusMount *proxy, GMountSource *mount_source; const char *dbus_id, *obj_path; - g_print ("start_mountable_got_proxy_cb, proxy = %p\n", proxy); - data->result = g_object_ref (result); mount_source = g_mount_operation_dbus_wrap (data->mount_operation, _g_daemon_vfs_get_async_bus ()); @@ -1563,8 +1515,6 @@ g_daemon_file_start_mountable (GFile *file, { AsyncMountOp *data; - g_print ("g_daemon_file_start_mountable\n"); - data = g_new0 (AsyncMountOp, 1); data->flags = flags; data->mount_operation = g_object_ref (mount_operation); @@ -1595,7 +1545,6 @@ stop_mountable_async_cb (GVfsDBusMount *proxy, GSimpleAsyncResult *orig_result; GError *error = NULL; - g_print ("stop_mountable_async_cb\n"); orig_result = data->result; if (! gvfs_dbus_mount_call_stop_mountable_finish (proxy, res, &error)) @@ -1621,8 +1570,6 @@ stop_mountable_got_proxy_cb (GVfsDBusMount *proxy, GMountSource *mount_source; const char *dbus_id, *obj_path; - g_print ("stop_mountable_got_proxy_cb, proxy = %p\n", proxy); - data->result = g_object_ref (result); mount_source = g_mount_operation_dbus_wrap (data->mount_operation, _g_daemon_vfs_get_async_bus ()); @@ -1653,8 +1600,6 @@ g_daemon_file_stop_mountable (GFile *file, { AsyncMountOp *data; - g_print ("g_daemon_file_stop_mountable\n"); - data = g_new0 (AsyncMountOp, 1); data->flags = flags; data->mount_operation = g_object_ref (mount_operation); @@ -1685,7 +1630,6 @@ eject_mountable_async_cb (GVfsDBusMount *proxy, GSimpleAsyncResult *orig_result; GError *error = NULL; - g_print ("eject_mountable_async_cb\n"); orig_result = data->result; if (! gvfs_dbus_mount_call_eject_mountable_finish (proxy, res, &error)) @@ -1711,8 +1655,6 @@ eject_mountable_got_proxy_cb (GVfsDBusMount *proxy, GMountSource *mount_source; const char *dbus_id, *obj_path; - g_print ("eject_mountable_got_proxy_cb, proxy = %p\n", proxy); - data->result = g_object_ref (result); mount_source = g_mount_operation_dbus_wrap (data->mount_operation, _g_daemon_vfs_get_async_bus ()); @@ -1743,8 +1685,6 @@ g_daemon_file_eject_mountable_with_operation (GFile *file, { AsyncMountOp *data; - g_print ("g_daemon_file_eject_mountable_with_operation\n"); - data = g_new0 (AsyncMountOp, 1); data->flags = flags; data->mount_operation = g_object_ref (mount_operation); @@ -1793,7 +1733,6 @@ unmount_mountable_async_cb (GVfsDBusMount *proxy, GSimpleAsyncResult *orig_result; GError *error = NULL; - g_print ("unmount_mountable_async_cb\n"); orig_result = data->result; if (! gvfs_dbus_mount_call_unmount_mountable_finish (proxy, res, &error)) @@ -1819,8 +1758,6 @@ unmount_mountable_got_proxy_cb (GVfsDBusMount *proxy, GMountSource *mount_source; const char *dbus_id, *obj_path; - g_print ("unmount_mountable_got_proxy_cb, proxy = %p\n", proxy); - data->result = g_object_ref (result); mount_source = g_mount_operation_dbus_wrap (data->mount_operation, _g_daemon_vfs_get_async_bus ()); @@ -1851,8 +1788,6 @@ g_daemon_file_unmount_mountable_with_operation (GFile *file, { AsyncMountOp *data; - g_print ("g_daemon_file_unmount_mountable_with_operation\n"); - data = g_new0 (AsyncMountOp, 1); data->flags = flags; data->mount_operation = g_object_ref (mount_operation); @@ -1883,7 +1818,6 @@ poll_mountable_async_cb (GVfsDBusMount *proxy, GSimpleAsyncResult *orig_result; GError *error = NULL; - g_print ("poll_mountable_async_cb\n"); orig_result = data->result; if (! gvfs_dbus_mount_call_poll_mountable_finish (proxy, res, &error)) @@ -1907,8 +1841,6 @@ poll_mountable_got_proxy_cb (GVfsDBusMount *proxy, { AsyncMountOp *data = callback_data; - g_print ("poll_mountable_got_proxy_cb, proxy = %p\n", proxy); - data->result = g_object_ref (result); gvfs_dbus_mount_call_poll_mountable (proxy, @@ -1927,8 +1859,6 @@ g_daemon_file_poll_mountable (GFile *file, { AsyncMountOp *data; - g_print ("g_daemon_file_poll_mountable\n"); - data = g_new0 (AsyncMountOp, 1); if (cancellable) data->cancellable = g_object_ref (cancellable); @@ -1998,8 +1928,6 @@ mount_reply (GVfsDBusMountTracker *proxy, MountData *data = user_data; GSimpleAsyncResult *ares; GError *error = NULL; - - g_print ("mount_reply\n"); if (!gvfs_dbus_mount_tracker_call_mount_location_finish (proxy, res, &error)) { @@ -2036,7 +1964,6 @@ mount_enclosing_volume_proxy_cb (GObject *source_object, GMountSpec *spec; GMountSource *mount_source; - g_print ("mount_enclosing_volume_proxy_cb\n"); daemon_file = G_DAEMON_FILE (data->file); proxy = gvfs_dbus_mount_tracker_proxy_new_for_bus_finish (res, &error); @@ -2081,8 +2008,6 @@ g_daemon_file_mount_enclosing_volume (GFile *location, { MountData *data; - g_print ("g_daemon_file_mount_enclosing_volume\n"); - data = g_new0 (MountData, 1); data->callback = callback; if (data->cancellable) @@ -2123,8 +2048,6 @@ g_daemon_file_query_filesystem_info (GFile *file, GVariant *iter_info; GError *local_error = NULL; - g_print ("g_daemon_file_query_filesystem_info\n"); - proxy = create_proxy_for_file (file, NULL, &path, NULL, cancellable, error); if (proxy == NULL) return NULL; @@ -2136,8 +2059,6 @@ g_daemon_file_query_filesystem_info (GFile *file, &iter_info, cancellable, &local_error); - - g_print ("g_daemon_file_query_filesystem_info: done, res = %d\n", res); if (! res) { @@ -2190,7 +2111,6 @@ query_fs_info_async_cb (GVfsDBusMount *proxy, GSimpleAsyncResult *orig_result; GVariant *iter_info; - g_print ("query_info_async_cb\n"); orig_result = data->result; if (! gvfs_dbus_mount_call_query_filesystem_info_finish (proxy, &iter_info, res, &error)) @@ -2230,8 +2150,6 @@ query_info_fs_async_get_proxy_cb (GVfsDBusMount *proxy, AsyncCallQueryFsInfo *data = callback_data; char *uri; - g_print ("query_info_fs_async_get_proxy_cb, proxy = %p\n", proxy); - uri = g_file_get_uri (data->file); data->result = g_object_ref (result); @@ -2257,8 +2175,6 @@ g_daemon_file_query_filesystem_info_async (GFile *file, { AsyncCallQueryFsInfo *data; - g_print ("g_daemon_file_query_filesystem_info_async\n"); - data = g_new0 (AsyncCallQueryFsInfo, 1); data->file = g_object_ref (file); data->attributes = g_strdup (attributes); @@ -2387,7 +2303,6 @@ g_daemon_file_set_display_name (GFile *file, daemon_file = G_DAEMON_FILE (file); mount_info = NULL; - g_print ("g_daemon_file_set_display_name\n"); proxy = create_proxy_for_file (file, &mount_info, &path, NULL, cancellable, error); if (proxy == NULL) @@ -2399,7 +2314,6 @@ g_daemon_file_set_display_name (GFile *file, &new_path, cancellable, &local_error); - g_print ("g_daemon_file_set_display_name: done, res = %d\n", res); if (! res) { @@ -2433,8 +2347,6 @@ g_daemon_file_delete (GFile *file, gboolean res; GError *local_error = NULL; - g_print ("g_daemon_file_delete\n"); - proxy = create_proxy_for_file (file, NULL, &path, NULL, cancellable, error); if (proxy == NULL) return FALSE; @@ -2443,7 +2355,6 @@ g_daemon_file_delete (GFile *file, path, cancellable, &local_error); - g_print ("g_daemon_file_delete: done, res = %d\n", res); if (! res) { @@ -2468,8 +2379,6 @@ g_daemon_file_trash (GFile *file, gboolean res; GError *local_error = NULL; - g_print ("g_daemon_file_trash\n"); - proxy = create_proxy_for_file (file, NULL, &path, NULL, cancellable, error); if (proxy == NULL) return FALSE; @@ -2478,7 +2387,6 @@ g_daemon_file_trash (GFile *file, path, cancellable, &local_error); - g_print ("g_daemon_file_trash: done, res = %d\n", res); if (! res) { @@ -2503,8 +2411,6 @@ g_daemon_file_make_directory (GFile *file, gboolean res; GError *local_error = NULL; - g_print ("g_daemon_file_make_directory\n"); - proxy = create_proxy_for_file (file, NULL, &path, NULL, cancellable, error); if (proxy == NULL) return FALSE; @@ -2513,7 +2419,6 @@ g_daemon_file_make_directory (GFile *file, path, cancellable, &local_error); - g_print ("g_daemon_file_make_directory: done, res = %d\n", res); if (! res) { @@ -2539,8 +2444,6 @@ g_daemon_file_make_symbolic_link (GFile *file, gboolean res; GError *local_error = NULL; - g_print ("g_daemon_file_make_symbolic_link\n"); - proxy = create_proxy_for_file (file, NULL, &path, NULL, cancellable, error); if (proxy == NULL) return FALSE; @@ -2550,7 +2453,6 @@ g_daemon_file_make_symbolic_link (GFile *file, symlink_value ? symlink_value : "", cancellable, &local_error); - g_print ("g_daemon_file_make_symbolic_link: done, res = %d\n", res); if (! res) { @@ -2577,8 +2479,6 @@ g_daemon_file_query_settable_attributes (GFile *file, GFileAttributeInfoList *list; GError *local_error = NULL; - g_print ("g_daemon_file_query_settable_attributes\n"); - proxy = create_proxy_for_file (file, NULL, &path, NULL, cancellable, error); if (proxy == NULL) return FALSE; @@ -2589,7 +2489,6 @@ g_daemon_file_query_settable_attributes (GFile *file, &iter_list, cancellable, &local_error); - g_print ("g_daemon_file_query_settable_attributes: done, res = %d\n", res); if (! res) { @@ -2622,8 +2521,6 @@ g_daemon_file_query_writable_namespaces (GFile *file, GFileAttributeInfoList *list; GError *local_error = NULL; - g_print ("g_daemon_file_query_writable_namespaces\n"); - proxy = create_proxy_for_file (file, NULL, &path, NULL, cancellable, error); if (proxy == NULL) return FALSE; @@ -2634,7 +2531,6 @@ g_daemon_file_query_writable_namespaces (GFile *file, &iter_list, cancellable, &local_error); - g_print ("g_daemon_file_query_writable_namespaces: done, res = %d\n", res); if (! res) { @@ -2750,8 +2646,6 @@ g_daemon_file_set_attribute (GFile *file, return set_metadata_attribute (file, attribute, type, value_p, cancellable, error); retry: - g_print ("g_daemon_file_set_attribute\n"); - proxy = create_proxy_for_file (file, NULL, &path, NULL, cancellable, error); if (proxy == NULL) return FALSE; @@ -2763,8 +2657,6 @@ g_daemon_file_set_attribute (GFile *file, _g_dbus_append_file_attribute (attribute, 0, type, value_p), cancellable, &my_error); - g_print ("g_daemon_file_set_attribute: done, res = %d\n", res); - g_free (path); if (! res) @@ -3090,8 +2982,6 @@ g_daemon_file_monitor_dir (GFile* file, gboolean res; GError *local_error = NULL; - g_print ("g_daemon_file_monitor_dir\n"); - monitor = NULL; mount_info = NULL; obj_path = NULL; @@ -3107,7 +2997,6 @@ g_daemon_file_monitor_dir (GFile* file, &obj_path, cancellable, &local_error); - g_print ("g_daemon_file_monitor_dir: done, res = %d\n", res); if (! res) { @@ -3146,8 +3035,6 @@ g_daemon_file_monitor_file (GFile* file, gboolean res; GError *local_error = NULL; - g_print ("g_daemon_file_monitor_file\n"); - monitor = NULL; mount_info = NULL; obj_path = NULL; @@ -3163,7 +3050,6 @@ g_daemon_file_monitor_file (GFile* file, &obj_path, cancellable, &local_error); - g_print ("g_daemon_file_monitor_file: done, res = %d\n", res); if (! res) { @@ -3205,7 +3091,6 @@ file_open_write_async_cb (GVfsDBusMount *proxy, guint64 initial_offset; GFileOutputStream *output_stream; - g_print ("file_open_write_async_cb\n"); orig_result = data->result; if (! gvfs_dbus_mount_call_open_for_write_finish (proxy, &fd_id_val, &can_seek, &initial_offset, &fd_list, res, &error)) @@ -3251,8 +3136,6 @@ file_open_write_async_get_proxy_cb (GVfsDBusMount *proxy, AsyncCallFileReadWrite *data = callback_data; guint32 pid; - g_print ("file_open_write_async_get_proxy_cb, proxy = %p\n", proxy); - pid = get_pid_for_file (data->file); data->result = g_object_ref (result); @@ -3308,8 +3191,6 @@ g_daemon_file_append_to_async (GFile *file, GAsyncReadyCallback callback, gpointer user_data) { - g_print ("g_daemon_file_append_to_async\n"); - file_open_write_async (file, 1, "", FALSE, flags, io_priority, cancellable, @@ -3339,8 +3220,6 @@ g_daemon_file_create_async (GFile *file, GAsyncReadyCallback callback, gpointer user_data) { - g_print ("g_daemon_file_create_async\n"); - file_open_write_async (file, 0, "", FALSE, flags, io_priority, cancellable, @@ -3377,8 +3256,6 @@ typedef struct { static void async_call_enumerate_free (AsyncCallEnumerate *data) { - g_print ("async_call_enumerate_free\n"); - g_clear_object (&data->file); g_clear_object (&data->result); g_clear_object (&data->cancellable); @@ -3396,7 +3273,6 @@ enumerate_children_async_cb (GVfsDBusMount *proxy, GError *error = NULL; GSimpleAsyncResult *orig_result; - g_print ("enumerate_children_async_cb\n"); orig_result = data->result; if (! gvfs_dbus_mount_call_enumerate_finish (proxy, res, &error)) @@ -3430,8 +3306,6 @@ enumerate_children_async_get_proxy_cb (GVfsDBusMount *proxy, char *obj_path; char *uri; - g_print ("enumerate_children_async_get_proxy_cb, proxy = %p\n", proxy); - obj_path = g_daemon_file_enumerator_get_object_path (data->enumerator); uri = g_file_get_uri (data->file); @@ -3463,8 +3337,6 @@ g_daemon_file_enumerate_children_async (GFile *file, { AsyncCallEnumerate *data; - g_print ("g_daemon_file_enumerate_children_async\n"); - data = g_new0 (AsyncCallEnumerate, 1); data->file = g_object_ref (file); data->attributes = g_strdup (attributes); @@ -3610,8 +3482,6 @@ g_daemon_file_replace_async (GFile *file, GAsyncReadyCallback callback, gpointer user_data) { - g_print ("g_daemon_file_replace_async\n"); - file_open_write_async (file, 2, etag, make_backup, flags, io_priority, cancellable, @@ -3666,7 +3536,6 @@ set_display_name_async_cb (GVfsDBusMount *proxy, gchar *new_path; GSimpleAsyncResult *orig_result; - g_print ("set_display_name_async_cb\n"); orig_result = data->result; if (! gvfs_dbus_mount_call_set_display_name_finish (proxy, &new_path, res, &error)) @@ -3701,8 +3570,6 @@ set_display_name_async_get_proxy_cb (GVfsDBusMount *proxy, { AsyncCallSetDisplayName *data = callback_data; - g_print ("set_display_name_async_get_proxy_cb, proxy = %p\n", proxy); - data->result = g_object_ref (result); data->mount_info = g_mount_info_ref (mount_info); @@ -3725,8 +3592,6 @@ g_daemon_file_set_display_name_async (GFile *file, { AsyncCallSetDisplayName *data; - g_print ("g_daemon_file_set_display_name_async\n"); - data = g_new0 (AsyncCallSetDisplayName, 1); data->file = g_object_ref (file); data->display_name = g_strdup (display_name); diff --git a/client/gdaemonfileenumerator.c b/client/gdaemonfileenumerator.c index 1e2b7de7..f8cdcc97 100644 --- a/client/gdaemonfileenumerator.c +++ b/client/gdaemonfileenumerator.c @@ -109,8 +109,6 @@ g_daemon_file_enumerator_finalize (GObject *object) daemon = G_DAEMON_FILE_ENUMERATOR (object); - g_print ("g_daemon_file_enumerator_finalize: daemon = %p\n", daemon); - path = g_daemon_file_enumerator_get_object_path (daemon); _g_dbus_unregister_vfs_filter (path); g_free (path); @@ -152,13 +150,10 @@ g_daemon_file_enumerator_class_init (GDaemonFileEnumeratorClass *klass) static void next_files_sync_check (GDaemonFileEnumerator *enumerator) { - g_print ("next_files_sync_check: enumerator->infos = %p, enumerator->done = %d, loop = %p, daemon = %p\n", enumerator->infos, enumerator->done, enumerator->next_files_mainloop, enumerator); - g_mutex_lock (&enumerator->next_files_mutex); if ((enumerator->infos || enumerator->done) && enumerator->next_files_mainloop != NULL) { - g_print ("next_files_sync_check: calling quit\n"); g_main_loop_quit (enumerator->next_files_mainloop); } g_mutex_unlock (&enumerator->next_files_mutex); @@ -171,8 +166,6 @@ handle_done (GVfsDBusEnumerator *object, { GDaemonFileEnumerator *enumerator = G_DAEMON_FILE_ENUMERATOR (user_data); - g_print ("handle_done: daemon = %p, async_requested_files = %d\n", enumerator, enumerator->async_requested_files); - G_LOCK (infos); enumerator->done = TRUE; if (enumerator->async_requested_files > 0) @@ -196,8 +189,6 @@ handle_got_info (GVfsDBusEnumerator *object, GFileInfo *info; GVariantIter iter; GVariant *child; - - g_print ("handle_got_info: daemon = %p\n", enumerator); infos = NULL; @@ -245,8 +236,6 @@ register_vfs_filter_cb (GDBusConnection *connection, g_signal_connect (skeleton, "handle-done", G_CALLBACK (handle_done), callback_data); g_signal_connect (skeleton, "handle-got-info", G_CALLBACK (handle_got_info), callback_data); - g_print ("register_vfs_filter_cb: callback_data = %p, skeleton = %p, obj_path = '%s'\n", callback_data, skeleton, obj_path); - error = NULL; if (!g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (skeleton), connection, @@ -289,7 +278,6 @@ g_daemon_file_enumerator_new (GFile *file, daemon->next_files_context = g_main_context_new (); path = g_daemon_file_enumerator_get_object_path (daemon); - g_print ("g_daemon_file_enumerator_new: daemon = %p, obj_path = '%s', sync = %d\n", daemon, path, sync); _g_dbus_register_vfs_filter (path, register_vfs_filter_cb, @@ -460,8 +448,6 @@ sync_timeout (gpointer data) { GDaemonFileEnumerator *daemon = G_DAEMON_FILE_ENUMERATOR (data); - g_print ("sync_timeout\n"); - g_mutex_lock (&daemon->next_files_mutex); g_main_loop_quit (daemon->next_files_mainloop); g_mutex_unlock (&daemon->next_files_mutex); @@ -490,13 +476,10 @@ g_daemon_file_enumerator_next_file (GFileEnumerator *enumerator, return NULL; } - g_print ("g_daemon_file_enumerator_next_file: done = %d\n", daemon->done); - if (! daemon->infos && ! daemon->done) { /* Wait for incoming data */ g_mutex_lock (&daemon->next_files_mutex); - g_print ("g_daemon_file_enumerator_next_file: starting loop, daemon = %p\n", daemon); daemon->next_files_mainloop = g_main_loop_new (daemon->next_files_context, FALSE); g_mutex_unlock (&daemon->next_files_mutex); @@ -508,7 +491,6 @@ g_daemon_file_enumerator_next_file (GFileEnumerator *enumerator, g_main_context_pop_thread_default (daemon->next_files_context); g_mutex_lock (&daemon->next_files_mutex); - g_print ("g_daemon_file_enumerator_next_file: loop done.\n"); g_source_remove (daemon->next_files_sync_timeout_tag); g_main_loop_unref (daemon->next_files_mainloop); diff --git a/client/gdaemonfilemonitor.c b/client/gdaemonfilemonitor.c index 4b063f90..ebf082c9 100644 --- a/client/gdaemonfilemonitor.c +++ b/client/gdaemonfilemonitor.c @@ -95,8 +95,6 @@ handle_changed (GVfsDBusMonitorClient *object, GMountSpec *spec1, *spec2; GFile *file1, *file2; - g_print ("handle_changed: daemon_monitor = %p\n", monitor); - spec1 = g_mount_spec_from_dbus (arg_mount_spec); file1 = g_daemon_file_new (spec1, arg_file_path); g_mount_spec_unref (spec1); @@ -152,7 +150,6 @@ g_daemon_file_monitor_init (GDaemonFileMonitor* daemon_monitor) id = g_atomic_int_add (&path_counter, 1); daemon_monitor->object_path = g_strdup_printf (OBJ_PATH_PREFIX"%d", id); - g_print ("g_daemon_file_monitor_init: daemon_monitor = %p, object_path = '%s'\n", daemon_monitor, daemon_monitor->object_path); _g_dbus_register_vfs_filter (daemon_monitor->object_path, register_vfs_filter_cb, @@ -183,7 +180,6 @@ subscribe_cb (GVfsDBusMonitor *proxy, { GError *error = NULL; - g_print ("gdaemonfilemonitor.c: subscribe_cb()\n"); if (! gvfs_dbus_monitor_call_subscribe_finish (proxy, res, &error)) { g_printerr ("Error calling org.gtk.vfs.Monitor.Subscribe(): %s (%s, %d)\n", @@ -230,7 +226,6 @@ async_proxy_new_cb (GObject *source_object, GError *error = NULL; proxy = gvfs_dbus_monitor_proxy_new_finish (res, &error); - g_print ("gdaemonfilemonitor.c: async_proxy_new_cb, proxy = %p\n", proxy); if (proxy == NULL) { g_printerr ("Error creating monitor proxy: %s (%s, %d)\n", @@ -247,8 +242,6 @@ async_got_connection_cb (GDBusConnection *connection, gpointer callback_data) { AsyncProxyCreate *data = callback_data; - - g_print ("gdaemonfilemonitor.c: async_got_connection_cb, connection = %p\n", connection); if (! connection) { @@ -299,7 +292,6 @@ unsubscribe_cb (GVfsDBusMonitor *proxy, { GError *error = NULL; - g_print ("gdaemonfilemonitor.c: unsubscribe_cb()\n"); if (! gvfs_dbus_monitor_call_unsubscribe_finish (proxy, res, &error)) { g_printerr ("Error calling org.gtk.vfs.Monitor.Unsubscribe(): %s (%s, %d)\n", @@ -338,8 +330,6 @@ g_daemon_file_monitor_cancel (GFileMonitor* monitor) GDaemonFileMonitor *daemon_monitor = G_DAEMON_FILE_MONITOR (monitor); AsyncProxyCreate *data; - g_print ("g_daemon_file_monitor_cancel\n"); - data = g_new0 (AsyncProxyCreate, 1); data->monitor = g_object_ref (daemon_monitor); data->cb = unsubscribe_proxy_created_cb; diff --git a/client/gdaemonmount.c b/client/gdaemonmount.c index 9ecb0e02..78439cb7 100644 --- a/client/gdaemonmount.c +++ b/client/gdaemonmount.c @@ -205,8 +205,6 @@ unmount_reply (GVfsDBusMount *proxy, AsyncProxyCreate *data = user_data; GError *error = NULL; - g_print ("gdaemonmount.c: unmount_reply, proxy = %p\n", proxy); - if (! gvfs_dbus_mount_call_unmount_finish (proxy, res, &error)) { _g_simple_async_result_take_error_stripped (data->result, error); @@ -228,7 +226,6 @@ async_proxy_new_cb (GObject *source_object, GMountSource *mount_source; proxy = gvfs_dbus_mount_proxy_new_finish (res, &error); - g_print ("gdaemonmount.c: async_proxy_new_cb, proxy = %p\n", proxy); if (proxy == NULL) { _g_simple_async_result_take_error_stripped (data->result, error); @@ -297,8 +294,6 @@ async_got_connection_cb (GDBusConnection *connection, { AsyncProxyCreate *data = callback_data; - g_print ("gdaemonmount.c: async_got_connection_cb, connection = %p\n", connection); - if (connection == NULL) { /* TODO: we should probably test if we really want a session bus; @@ -324,8 +319,6 @@ g_daemon_mount_unmount_with_operation (GMount *mount, GDaemonMount *daemon_mount = G_DAEMON_MOUNT (mount); AsyncProxyCreate *data; - g_print ("g_daemon_mount_unmount_with_operation\n"); - data = g_new0 (AsyncProxyCreate, 1); data->mount = g_object_ref (mount); data->mount_info = daemon_mount->mount_info; diff --git a/client/gvfsdaemondbus.c b/client/gvfsdaemondbus.c index d4e1b8d6..767d9c60 100644 --- a/client/gvfsdaemondbus.c +++ b/client/gvfsdaemondbus.c @@ -86,7 +86,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); } @@ -98,8 +97,6 @@ _g_dbus_register_vfs_filter (const char *obj_path, GObject *data) { PathMapEntry *entry; - - g_print ("_g_dbus_register_vfs_filter: obj_path = '%s'\n", obj_path); G_LOCK (obj_path_map); @@ -139,13 +136,11 @@ register_skeleton (const char *obj_path, { /* Note that the newly created GDBusInterfaceSkeleton instance refs the connection so it's not needed to watch for connection being destroyed */ skeleton = entry->callback (dbus_conn, obj_path, entry->data); - g_print ("registering interface skeleton %p for path '%s' on the %p connection\n", skeleton, obj_path, dbus_conn); - g_hash_table_insert (entry->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 already been registered on the connection, skipping */ } } @@ -162,8 +157,6 @@ register_skeleton (const char *obj_path, void _g_dbus_connect_vfs_filters (GDBusConnection *connection) { - g_print ("_g_dbus_connect_vfs_filters: connection = %p\n", connection); - G_LOCK (obj_path_map); if (obj_path_map) @@ -192,13 +185,9 @@ vfs_connection_closed (GDBusConnection *connection, { VfsConnectionData *connection_data; - g_print ("gvfsdaemondbus.c: vfs_connection_closed()\n"); - connection_data = g_object_get_data (G_OBJECT (connection), "connection_data"); g_assert (connection_data != NULL); - g_print (" async_dbus_id = '%s'\n", connection_data->async_dbus_id); - if (connection_data->async_dbus_id) { _g_daemon_vfs_invalidate_dbus_id (connection_data->async_dbus_id); @@ -247,8 +236,6 @@ close_and_unref_connection (void *data) { GDBusConnection *connection = G_DBUS_CONNECTION (data); - g_print ("close_and_unref_connection: closing connection\n"); - /* TODO: watch for the need to manually call g_dbus_connection_close_sync () */ g_object_unref (connection); } @@ -258,8 +245,6 @@ set_connection_for_async (GDBusConnection *connection, const char *dbus_id) { VfsConnectionData *data; - g_print ("set_connection_for_async: connection = %p, dbus_id = '%s'\n", connection, dbus_id); - G_LOCK (async_map); data = g_object_get_data (G_OBJECT (connection), "connection_data"); g_assert (data != NULL); @@ -314,7 +299,6 @@ async_got_private_connection_cb (GObject *source_object, GError *error = NULL; connection = g_dbus_connection_new_for_address_finish (res, &error); - g_print ("async_got_private_connection_cb, connection = %p\n", connection); if (!connection) { async_call->io_error = g_error_copy (error); @@ -363,8 +347,6 @@ async_get_connection_response (GVfsDBusDaemon *proxy, GError *error = NULL; gchar *address1; - g_print ("async_get_connection_response\n"); - if (! gvfs_dbus_daemon_call_get_connection_finish (proxy, &address1, NULL, res, @@ -394,8 +376,6 @@ open_connection_async_cb (GObject *source_object, GError *error = NULL; proxy = gvfs_dbus_daemon_proxy_new_finish (res, &error); - g_print ("open_connection_async_cb, proxy = %p\n", proxy); - if (proxy == NULL) { async_call->io_error = g_error_copy (error); @@ -434,8 +414,6 @@ _g_dbus_connection_get_for_async (const char *dbus_id, { AsyncDBusCall *async_call; - g_print ("_g_dbus_connection_get_for_async\n"); - async_call = g_new0 (AsyncDBusCall, 1); async_call->dbus_id = g_strdup (dbus_id); if (cancellable) @@ -448,7 +426,6 @@ _g_dbus_connection_get_for_async (const char *dbus_id, open_connection_async (async_call); else { - g_print ("got connection from cache\n"); async_call_finish (async_call); } } @@ -590,7 +567,6 @@ struct _ThreadLocalConnections { static void free_local_connections (ThreadLocalConnections *local) { - g_print ("free_local_connections()\n"); g_hash_table_destroy (local->connections); g_clear_object (&local->session_bus); g_free (local); diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c index b0ec1dde..675af27d 100644 --- a/client/gvfsfusedaemon.c +++ b/client/gvfsfusedaemon.c @@ -2302,8 +2302,6 @@ name_vanished_handler (GDBusConnection *connection, const gchar *name, gpointer user_data) { - g_print ("name_vanished_handler()\n"); - /* The daemon died, unmount */ g_main_loop_quit (subthread_main_loop); } @@ -2314,8 +2312,6 @@ dbus_connection_closed (GDBusConnection *connection, GError *error, gpointer user_data) { - g_print ("dbus_connection_closed\n"); - /* Session bus died, unmount */ g_main_loop_quit (subthread_main_loop); } @@ -2333,7 +2329,6 @@ register_fuse_cb (GVfsDBusMountTracker *proxy, error->message, g_quark_to_string (error->domain), error->code); g_error_free (error); } - g_print ("register_fuse_cb\n"); } static gpointer diff --git a/client/gvfsiconloadable.c b/client/gvfsiconloadable.c index 70ee720b..9030a486 100644 --- a/client/gvfsiconloadable.c +++ b/client/gvfsiconloadable.c @@ -96,8 +96,6 @@ g_vfs_icon_load (GLoadableIcon *icon, GVariant *fd_id_val = NULL; GError *local_error = NULL; - g_print ("gvfsiconloadable.c: g_vfs_icon_load\n"); - proxy = create_proxy_for_icon (vfs_icon, cancellable, error); if (proxy == NULL) return NULL; @@ -111,8 +109,6 @@ g_vfs_icon_load (GLoadableIcon *icon, cancellable, &local_error); - g_print ("gvfsiconloadable.c: g_vfs_icon_load: done, res = %d\n", res); - if (! res) { if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) @@ -182,7 +178,6 @@ async_proxy_new_cb (GObject *source_object, GError *error = NULL; proxy = gvfs_dbus_mount_proxy_new_finish (res, &error); - g_print ("gvfsiconloadable.c: async_proxy_new_cb, proxy = %p\n", proxy); if (proxy == NULL) { _g_simple_async_result_take_error_stripped (data->result, error); @@ -207,8 +202,6 @@ async_got_connection_cb (GDBusConnection *connection, { AsyncPathCall *data = callback_data; - g_print ("gvfsiconloadable.c: async_got_connection_cb, connection = %p\n", connection); - if (connection == NULL) { g_dbus_error_strip_remote_error (io_error); @@ -234,8 +227,6 @@ async_got_mount_info (GMountInfo *mount_info, GError *error) { AsyncPathCall *data = _data; - - g_print ("gvfsiconloadable.c: async_got_mount_info, mount_info = %p\n", mount_info); if (error != NULL) { @@ -296,8 +287,6 @@ open_icon_read_cb (GVfsDBusMount *proxy, guint fd_id; GFileInputStream *stream; - g_print ("gvfsiconloadable.c: open_icon_read_cb\n"); - if (! gvfs_dbus_mount_call_open_icon_for_read_finish (proxy, &fd_id_val, &can_seek, &fd_list, res, &error)) { _g_simple_async_result_take_error_stripped (data->result, error); @@ -335,8 +324,6 @@ load_async_cb (GVfsDBusMount *proxy, { AsyncPathCall *data = callback_data; - g_print ("gvfsiconloadable.c: load_async_cb\n"); - gvfs_dbus_mount_call_open_icon_for_read (proxy, data->vfs_icon->icon_id, NULL, diff --git a/common/gmountoperationdbus.c b/common/gmountoperationdbus.c index 4c323467..10f1267a 100644 --- a/common/gmountoperationdbus.c +++ b/common/gmountoperationdbus.c @@ -103,8 +103,6 @@ handle_ask_password (GVfsDBusMountOperation *object, { GMountOperationDBus *op_dbus = data; - g_print ("gmountoperationdbus.c: handle_ask_password()\n"); - op_dbus->object = object; op_dbus->invocation = invocation; g_signal_connect (op_dbus->op, "reply", @@ -153,8 +151,6 @@ handle_ask_question (GVfsDBusMountOperation *object, { GMountOperationDBus *op_dbus = data; - g_print ("gmountoperationdbus.c: handle_ask_question()\n"); - op_dbus->object = object; op_dbus->invocation = invocation; g_signal_connect (op_dbus->op, @@ -206,8 +202,6 @@ handle_show_processes (GVfsDBusMountOperation *object, GPid pid; GVariantIter iter; - g_print ("gmountoperationdbus.c: handle_show_processes()\n"); - processes = g_array_new (FALSE, FALSE, sizeof (GPid)); g_variant_iter_init (&iter, arg_processes); while (g_variant_iter_loop (&iter, "i", &pid)) @@ -239,8 +233,6 @@ handle_show_unmount_progress (GVfsDBusMountOperation *object, gpointer data) { GMountOperationDBus *op_dbus = data; - - g_print ("gmountoperationdbus.c: handle_show_unmount_progress()\n"); g_signal_emit_by_name (op_dbus->op, "show-unmount-progress", arg_message_string, @@ -258,8 +250,6 @@ handle_aborted (GVfsDBusMountOperation *object, gpointer data) { GMountOperationDBus *op_dbus = data; - - g_print ("gmountoperationdbus.c: handle_aborted()\n"); /* also emit reply to make the all DBus ops return */ g_mount_operation_reply (op_dbus->op, G_MOUNT_OPERATION_UNHANDLED); diff --git a/common/gmountsource.c b/common/gmountsource.c index c21f5fc5..f75461cf 100644 --- a/common/gmountsource.c +++ b/common/gmountsource.c @@ -215,8 +215,6 @@ ask_password_reply (GVfsDBusMountOperation *proxy, result = G_SIMPLE_ASYNC_RESULT (user_data); handled = TRUE; - - g_print ("gmountsource.c: ask_password_reply()\n"); data = g_new0 (AskPasswordData, 1); g_simple_async_result_set_op_res_gpointer (result, data, ask_password_data_free); @@ -530,8 +528,6 @@ ask_question_reply (GVfsDBusMountOperation *proxy, result = G_SIMPLE_ASYNC_RESULT (user_data); handled = TRUE; - - g_print ("gmountsource.c: ask_question_reply()\n"); data = g_new0 (AskQuestionData, 1); g_simple_async_result_set_op_res_gpointer (result, data, g_free); @@ -737,8 +733,6 @@ show_processes_reply (GVfsDBusMountOperation *proxy, result = G_SIMPLE_ASYNC_RESULT (user_data); handled = TRUE; - g_print ("gmountsource.c: show_processes_reply()\n"); - data = g_new0 (ShowProcessesData, 1); g_simple_async_result_set_op_res_gpointer (result, data, g_free); @@ -1000,8 +994,6 @@ abort_reply (GVfsDBusMountOperation *proxy, GAsyncResult *res, gpointer user_data) { - g_print ("gmountsource.c: abort_reply()\n"); - gvfs_dbus_mount_operation_call_aborted_finish (proxy, res, NULL); } 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); |