diff options
| author | Eric Koegel <eric.koegel@gmail.com> | 2013-04-14 08:19:45 +0300 |
|---|---|---|
| committer | Eric Koegel <eric.koegel@gmail.com> | 2013-04-14 08:21:09 +0300 |
| commit | 3884058acfdc5e29a2a660a4c2a5ee3689f4e606 (patch) | |
| tree | b2e760f4400a096dc4799ea6560342adb9afff4b | |
| parent | 63df50d249bba0522b5bd2f0c23748ae38e9026b (diff) | |
| download | xfdesktop-3884058acfdc5e29a2a660a4c2a5ee3689f4e606.tar.gz | |
Remove unneeded warning messages
| -rw-r--r-- | src/xfdesktop-file-icon-manager.c | 1 | ||||
| -rw-r--r-- | 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 a12c7027..1f425ad2 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 5d5e20e2..b2360cd5 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, |