Remove commented out code.

[geeqie.git] / src / collect-table.c

diff --git a/src/collect-table.c b/src/collect-table.c
index 77b1971..160c1b6 100644 (file)
--- a/src/collect-table.c
+++ b/src/collect-table.c
@@ -539,11 +539,7 @@ static void tip_show(CollectTable *ct)
 
        gdk_window_get_pointer(NULL, &x, &y, NULL);
 
-#if GTK_CHECK_VERSION(2,20,0)
        if (!gtk_widget_get_realized(ct->tip_window)) gtk_widget_realize(ct->tip_window);
-#else
-       if (!GTK_WIDGET_REALIZED(ct->tip_window)) gtk_widget_realize(ct->tip_window);
-#endif
        gtk_window_move(GTK_WINDOW(ct->tip_window), x + 16, y + 16);
        gtk_widget_show(ct->tip_window);
 }
@@ -1243,9 +1239,6 @@ static gboolean collection_table_press_key_cb(GtkWidget *widget, GdkEventKey *ev
 
        if (stop_signal)
                {
-#if 0
-               g_signal_stop_emission_by_name(GTK_OBJECT(widget), "key_press_event");
-#endif
                tip_unschedule(ct);
                }
 
@@ -1361,7 +1354,6 @@ static CollectInfo *collection_table_insert_point(CollectTable *ct, gint x, gint
 
 static void collection_table_insert_marker(CollectTable *ct, CollectInfo *info, gboolean enable)
 {
-       gint row, col;
        gboolean after = FALSE;
        GdkRectangle cell;
 
@@ -1378,9 +1370,6 @@ static void collection_table_insert_marker(CollectTable *ct, CollectInfo *info,
        /* this setting does not take into account (after), but since it is not really used... */
        ct->marker_info = info;
 
-       row = -1;
-       col = -1;
-
        if (!ct->marker_window)
                {
                GdkWindow *parent = gtk_tree_view_get_bin_window(GTK_TREE_VIEW(ct->listview));
@@ -1574,11 +1563,7 @@ static gboolean collection_table_press_cb(GtkWidget *widget, GdkEventButton *bev
                                        layout_image_set_collection(NULL, ct->cd, info);
                                        }
                                }
-#if GTK_CHECK_VERSION(2,20,0)
                        else if (!gtk_widget_has_focus(ct->listview))
-#else
-                       else if (!GTK_WIDGET_HAS_FOCUS(ct->listview))
-#endif
                                {
                                gtk_widget_grab_focus(ct->listview);
                                }
@@ -1729,11 +1714,7 @@ static void collection_table_populate(CollectTable *ct, gboolean resize)
                        gtk_tree_view_column_set_visible(column, (i < ct->columns));
                        gtk_tree_view_column_set_fixed_width(column, thumb_width + (THUMB_BORDER_PADDING * 6));
 
-#if GTK_CHECK_VERSION(2,18,0)
                        list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
-#else
-                       list = gtk_tree_view_column_get_cell_renderers(column);
-#endif
                        cell = (list) ? list->data : NULL;
                        g_list_free(list);
 
@@ -1744,11 +1725,7 @@ static void collection_table_populate(CollectTable *ct, gboolean resize)
                                                             "show_text", ct->show_text, NULL);
                                }
                        }
-#if GTK_CHECK_VERSION(2,20,0)
                if (gtk_widget_get_realized(ct->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(ct->listview));
-#else
-               if (GTK_WIDGET_REALIZED(ct->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(ct->listview));
-#endif
                }
 
        row = -1;
@@ -2175,6 +2152,9 @@ static void collection_table_dnd_get(GtkWidget *widget, GdkDragContext *context,
                                uri_text = collection_info_list_to_dnd_data(ct->cd, list, &total);
                                g_list_free(list);
                                }
+                       gtk_selection_data_set(selection_data, gtk_selection_data_get_target(selection_data),
+                                               8, (guchar *)uri_text, total);
+                       g_free(uri_text);
                        break;
                case TARGET_URI_LIST:
                case TARGET_TEXT_PLAIN:
@@ -2189,13 +2169,10 @@ static void collection_table_dnd_get(GtkWidget *widget, GdkDragContext *context,
                                }
                        if (!list) return;
 
-                       uri_text = uri_text_from_filelist(list, &total, (info == TARGET_TEXT_PLAIN));
+                       uri_selection_data_set_uris_from_filelist(selection_data, list);
                        filelist_free(list);
                        break;
                }
-
-       gtk_selection_data_set_text(selection_data, uri_text, total);
-       g_free(uri_text);
 }
 
 
@@ -2254,7 +2231,7 @@ static void collection_table_dnd_receive(GtkWidget *widget, GdkDragContext *cont
                                }
                        break;
                case TARGET_URI_LIST:
-                       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)
                                {
@@ -2395,9 +2372,6 @@ static void collection_table_cell_data_cb(GtkTreeViewColumn *tree_column, GtkCel
 
        if (info && (info->flag_mask & SELECTION_PRELIGHT))
                {
-#if 0
-               shift_color(&color_fg, -1, 0);
-#endif
                shift_color(&color_bg, -1, 0);
                }