Trim trailing white spaces on empty lines.

[geeqie.git] / src / ui_pathsel.c

diff --git a/src/ui_pathsel.c b/src/ui_pathsel.c
index 7593a21..23c153b 100644 (file)
--- a/src/ui_pathsel.c
+++ b/src/ui_pathsel.c
@@ -291,7 +291,7 @@ static void dest_change_dir(Dest_Data *dd, const gchar *path, gboolean retain_na
                new_directory = g_path_get_dirname(full_path);
        else
                new_directory = g_strdup(full_path);
-       
+
        gtk_entry_set_text(GTK_ENTRY(dd->entry), full_path);
 
        dest_populate(dd, new_directory);
@@ -331,9 +331,7 @@ static void dest_dnd_set_data(GtkWidget *view,
                              guint info, guint time, gpointer data)
 {
        gchar *path = NULL;
-       gchar *uri_text = NULL;
        GList *list = NULL;
-       gint length = 0;
        GtkTreeModel *model;
        GtkTreeSelection *selection;
        GtkTreeIter iter;
@@ -346,22 +344,16 @@ static void dest_dnd_set_data(GtkWidget *view,
 
        list = g_list_append(list, path);
 
-       switch (info)
+       gchar **uris = uris_from_filelist(list);
+       gboolean ret = gtk_selection_data_set_uris(selection_data, uris);
+       if (!ret)
                {
-               case TARGET_URI_LIST:
-                       uri_text = uri_text_from_list(list, &length, FALSE);
-                       break;
-               case TARGET_TEXT_PLAIN:
-                       uri_text = uri_text_from_list(list, &length, TRUE);
-                       break;
+               char *str = g_strjoinv("\r\n", uris);
+               ret = gtk_selection_data_set_text(selection_data, str, -1);
+               g_free(str);
                }
 
        string_list_free(list);
-
-       if (!uri_text) return;
-
-       gtk_selection_data_set_text(selection_data, uri_text, length);
-       g_free(uri_text);
 }
 
 static void dest_dnd_init(Dest_Data *dd)
@@ -1150,9 +1142,6 @@ GtkWidget *path_selection_new_with_files(GtkWidget *entry, const gchar *path,
                gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(dd->filter_combo), renderer, TRUE);
                gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(dd->filter_combo), renderer,
                                               "text", FILTER_COLUMN_NAME, NULL);
-#if 0
-               gtk_combo_set_case_sensitive(GTK_COMBO(dd->filter_combo), TRUE);
-#endif
                gtk_box_pack_start(GTK_BOX(hbox2), dd->filter_combo, TRUE, TRUE, 0);
                gtk_widget_show(dd->filter_combo);