[totem] main: Better error messages for failed removals
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] main: Better error messages for failed removals
- Date: Mon, 17 Feb 2014 13:38:23 +0000 (UTC)
commit ed29bc696359c64143a599bd747857fd289bf69d
Author: Bastien Nocera <hadess hadess net>
Date: Mon Feb 17 13:56:37 2014 +0100
main: Better error messages for failed removals
src/totem-grilo.c | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
---
diff --git a/src/totem-grilo.c b/src/totem-grilo.c
index 94e54ae..25522e8 100644
--- a/src/totem-grilo.c
+++ b/src/totem-grilo.c
@@ -2032,18 +2032,29 @@ delete_foreach (gpointer data,
success = TRUE;
if (grl_source_supported_operations (source) & GRL_OP_REMOVE) {
+ g_debug ("Removing item '%s' through Grilo",
+ grl_media_get_id (media));
grl_source_remove_sync (source, media, &error);
success = (error != NULL);
} else {
- GFile *file;
+ const char *uri;
- file = g_file_new_for_uri (grl_media_get_url (media));
- success = g_file_trash (file, NULL, &error);
- g_object_unref (file);
+ uri = grl_media_get_url (media);
+ if (!uri) {
+ g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+ "Item cannot be removed through Grilo and doesn't have a URI,
please file a bug");
+ } else {
+ GFile *file;
+
+ file = g_file_new_for_uri (grl_media_get_url (media));
+ success = g_file_trash (file, NULL, &error);
+ g_object_unref (file);
+ }
}
if (!success) {
- g_warning ("Couldn't remove item '%s': %s",
+ g_warning ("Couldn't remove item '%s' (%s): %s",
grl_media_get_title (media),
+ grl_media_get_id (media),
error->message);
g_error_free (error);
} else {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]