diff options
| author | Brian Tarricone <brian@tarricone.org> | 2006-11-04 12:27:37 +0000 |
|---|---|---|
| committer | Brian Tarricone <brian@tarricone.org> | 2006-11-04 12:27:37 +0000 |
| commit | e8911abe2aaccdd01cf0796f2cb144427b8ea130 (patch) | |
| tree | abc14033eb494cf404036c9d6b2b0369af82e38c /src/xfdesktop-file-icon-manager.c | |
| parent | ad54f6e245146499aa45c686c781c08d46058557 (diff) | |
| download | xfdesktop-e8911abe2aaccdd01cf0796f2cb144427b8ea130.tar.gz | |
don't allow linking root items, as thunar-vfs throws a critical warning and
then crashes when you try (bug 2470)
(Old svn revision: 23644)
Diffstat (limited to 'src/xfdesktop-file-icon-manager.c')
| -rw-r--r-- | src/xfdesktop-file-icon-manager.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c index ecee0b77..de45689d 100644 --- a/src/xfdesktop-file-icon-manager.c +++ b/src/xfdesktop-file-icon-manager.c @@ -3171,26 +3171,18 @@ xfdesktop_file_icon_manager_drag_data_received(XfdesktopIconViewManager *manager for(l = path_list; l; l = l->next) { ThunarVfsPath *path = (ThunarVfsPath *)l->data; - ThunarVfsInfo *dinfo = NULL; /* only work with file:// URIs here */ if(thunar_vfs_path_get_scheme(path) != THUNAR_VFS_PATH_SCHEME_FILE) continue; + /* root nodes cause crashes */ + if(thunar_vfs_path_is_root(path)) + continue; - if(thunar_vfs_path_is_root(path)) { - ThunarVfsInfo *dinfo = thunar_vfs_info_new_for_path(path, NULL); - if(dinfo) - name = dinfo->display_name; - else - continue; - } else - name = thunar_vfs_path_get_name(path); + name = thunar_vfs_path_get_name(path); dest_path = thunar_vfs_path_relative(base_dest_path, name); dest_path_list = g_list_prepend(dest_path_list, dest_path); - - if(dinfo) - thunar_vfs_info_unref(dinfo); } thunar_vfs_path_unref(base_dest_path); dest_path_list = g_list_reverse(dest_path_list); |