Trim trailing white spaces.

[geeqie.git] / src / img-view.c

diff --git a/src/img-view.c b/src/img-view.c
index 6a1d9df..06368d4 100644 (file)
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -373,40 +373,19 @@ static gboolean view_window_key_press_cb(GtkWidget *widget, GdkEventKey *event,
 
        if (event->state & GDK_CONTROL_MASK)
                {
-               gint n = -1;
-
                stop_signal = TRUE;
                switch (event->keyval)
                        {
                        case '1':
-                               n = 0;
-                               break;
                        case '2':
-                               n = 1;
-                               break;
                        case '3':
-                               n = 2;
-                               break;
                        case '4':
-                               n = 3;
-                               break;
                        case '5':
-                               n = 4;
-                               break;
                        case '6':
-                               n = 5;
-                               break;
                        case '7':
-                               n = 6;
-                               break;
                        case '8':
-                               n = 7;
-                               break;
                        case '9':
-                               n = 8;
-                               break;
                        case '0':
-                               n = 9;
                                break;
                        case 'C': case 'c':
                                file_util_copy(image_get_fd(imd), NULL, NULL, imd->widget);
@@ -1246,7 +1225,7 @@ static void view_popup_menu_destroy_cb(GtkWidget *widget, gpointer data)
        GList *editmenu_fd_list = data;
 
        filelist_free(editmenu_fd_list);
-}              
+}
 
 static GList *view_window_get_fd_list(ViewWindow *vw)
 {
@@ -1487,7 +1466,7 @@ static void view_window_get_dnd_data(GtkWidget *widget, GdkDragContext *context,
                        {
                        GList *work;
 
-                       list = uri_filelist_from_text((gchar *)gtk_selection_data_get_data(selection_data), TRUE);
+                       list = uri_filelist_from_gtk_selection_data(selection_data);
 
                        work = list;
                        while (work)
@@ -1556,29 +1535,11 @@ static void view_window_set_dnd_data(GtkWidget *widget, GdkDragContext *context,
 
        if (fd)
                {
-               gchar *text = NULL;
-               gint len;
-               gboolean plain_text;
                GList *list;
 
-               switch (info)
-                       {
-                       case TARGET_URI_LIST:
-                               plain_text = FALSE;
-                               break;
-                       case TARGET_TEXT_PLAIN:
-                       default:
-                               plain_text = TRUE;
-                               break;
-                       }
                list = g_list_append(NULL, fd);
-               text = uri_text_from_filelist(list, &len, plain_text);
+               uri_selection_data_set_uris_from_filelist(selection_data, list);
                g_list_free(list);
-               if (text)
-                       {
-                       gtk_selection_data_set_text(selection_data, text, len);
-                       g_free(text);
-                       }
                }
        else
                {