Updating branch refs/heads/master
to 3884058acfdc5e29a2a660a4c2a5ee3689f4e606 (commit)
from 63df50d249bba0522b5bd2f0c23748ae38e9026b (commit)
commit 3884058acfdc5e29a2a660a4c2a5ee3689f4e606
Author: Eric Koegel <[email protected]>
Date: Sun Apr 14 08:19:45 2013 +0300
Remove unneeded warning messages
src/xfdesktop-file-icon-manager.c | 1 -
src/xfdesktop-icon-view.c | 7 +++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/xfdesktop-file-icon-manager.c
b/src/xfdesktop-file-icon-manager.c
index a12c702..1f425ad 100644
--- a/src/xfdesktop-file-icon-manager.c
+++ b/src/xfdesktop-file-icon-manager.c
@@ -3195,7 +3195,6 @@
xfdesktop_file_icon_manager_drag_data_get(XfdesktopIconViewManager *manager,
TRACE("entering");
g_return_if_fail(drag_icons);
- g_return_if_fail(info == TARGET_TEXT_URI_LIST);
file_list = xfdesktop_file_utils_file_icon_list_to_file_list(drag_icons);
str = xfdesktop_file_utils_file_list_to_string(file_list);
diff --git a/src/xfdesktop-icon-view.c b/src/xfdesktop-icon-view.c
index 5d5e20e..b2360cd 100644
--- a/src/xfdesktop-icon-view.c
+++ b/src/xfdesktop-icon-view.c
@@ -1587,8 +1587,11 @@ xfdesktop_icon_view_drag_data_get(GtkWidget *widget,
XfdesktopIconView *icon_view = XFDESKTOP_ICON_VIEW(widget);
TRACE("entering");
-
- g_return_if_fail(icon_view->priv->selected_icons);
+
+ /* Sometimes during a ctrl+drag this is NULL
+ * but works when the file(s) are dropped */
+ if(icon_view->priv->selected_icons == NULL)
+ return;
xfdesktop_icon_view_manager_drag_data_get(icon_view->priv->manager,
icon_view->priv->selected_icons,
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
