Updating branch refs/heads/master
to 6d8057911d2d88286893821b6999e8def3730809 (commit)
from 05c7d2372248d0ce90fda57e941958acf92a4a2e (commit)
commit 6d8057911d2d88286893821b6999e8def3730809
Author: Nick Schermer <[email protected]>
Date: Wed Sep 26 18:37:30 2012 +0200
Use Gtk function to get uris in tpa plugin.
The function returns NULL if the data is not valid.
plugins/thunar-tpa/thunar-tpa.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/plugins/thunar-tpa/thunar-tpa.c b/plugins/thunar-tpa/thunar-tpa.c
index 3af9472..afb02c1 100644
--- a/plugins/thunar-tpa/thunar-tpa.c
+++ b/plugins/thunar-tpa/thunar-tpa.c
@@ -441,10 +441,9 @@ thunar_tpa_drag_data_received (GtkWidget *button,
if (G_LIKELY (info == TARGET_TEXT_URI_LIST))
{
/* check if the data is valid for text/uri-list */
- if (G_LIKELY (selection_data->length >= 0 && selection_data->format ==
8))
+ uri_list = gtk_selection_data_get_uris (selection_data);
+ if (G_LIKELY (uri_list != NULL))
{
- /* parse the URI list according to RFC 2483 */
- uri_list = g_uri_list_extract_uris ((const gchar *)
selection_data->data);
succeed = thunar_tpa_move_to_trash (plugin, (const gchar **)
uri_list);
g_strfreev (uri_list);
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
