Remove commented out code.

[geeqie.git] / src / search.c

diff --git a/src/search.c b/src/search.c
index 8058ae8..3d97b53 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -824,11 +824,7 @@ static void search_result_thumb_height(SearchData *sd)
 
        gtk_tree_view_column_set_fixed_width(column, (sd->thumb_enable) ? options->thumbnails.max_width : 4);
 
-#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
        if (!list) return;
        cell = list->data;
        g_list_free(list);
@@ -1219,40 +1215,19 @@ static gboolean search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event,
 
        if (event->state & GDK_CONTROL_MASK)
                {
-               gint edit_val = -1;
-
                stop_signal = TRUE;
                switch (event->keyval)
                        {
                        case '1':
-                               edit_val = 0;
-                               break;
                        case '2':
-                               edit_val = 1;
-                               break;
                        case '3':
-                               edit_val = 2;
-                               break;
                        case '4':
-                               edit_val = 3;
-                               break;
                        case '5':
-                               edit_val = 4;
-                               break;
                        case '6':
-                               edit_val = 5;
-                               break;
                        case '7':
-                               edit_val = 6;
-                               break;
                        case '8':
-                               edit_val = 7;
-                               break;
                        case '9':
-                               edit_val = 8;
-                               break;
                        case '0':
-                               edit_val = 9;
                                break;
                        case 'C': case 'c':
                                file_util_copy(NULL, search_result_selection_list(sd), NULL, widget);
@@ -1283,12 +1258,6 @@ static gboolean search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event,
                                stop_signal = FALSE;
                                break;
                        }
-#if 0
-               if (edit_val >= 0)
-                       {
-                       search_result_edit_selected(sd, edit_val);
-                       }
-#endif
                }
        else
                {
@@ -1426,11 +1395,6 @@ static void search_dnd_init(SearchData *sd)
                         G_CALLBACK(search_dnd_data_set), sd);
        g_signal_connect(G_OBJECT(sd->result_view), "drag_begin",
                         G_CALLBACK(search_dnd_begin), sd);
-#if 0
-       g_signal_connect(G_OBJECT(sd->result_view), "drag_end",
-                        G_CALLBACK(search_dnd_end), sd);
-#endif
-
 }
 
 /*
@@ -2347,19 +2311,11 @@ static void menu_choice_set_visible(GtkWidget *widget, gboolean visible)
 {
        if (visible)
                {
-#if GTK_CHECK_VERSION(2,20,0)
                if (!gtk_widget_get_visible(widget)) gtk_widget_show(widget);
-#else
-               if (!GTK_WIDGET_VISIBLE(widget)) gtk_widget_show(widget);
-#endif
                }
        else
                {
-#if GTK_CHECK_VERSION(2,20,0)
                if (gtk_widget_get_visible(widget)) gtk_widget_hide(widget);
-#else
-               if (GTK_WIDGET_VISIBLE(widget)) gtk_widget_hide(widget);
-#endif
                }
 }
 
@@ -2829,10 +2785,6 @@ void search_new(FileData *dir_fd, FileData *example_file)
        gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(sd->result_view), TRUE);
        gtk_tree_view_set_enable_search(GTK_TREE_VIEW(sd->result_view), FALSE);
 
-#if 0
-       gtk_tree_view_set_search_column(GTK_TREE_VIEW(sd->result_view), SEARCH_COLUMN_NAME);
-#endif
-
        search_result_add_column(sd, SEARCH_COLUMN_RANK, _("Rank"), FALSE, FALSE);
        search_result_add_column(sd, SEARCH_COLUMN_THUMB, "", TRUE, FALSE);
        search_result_add_column(sd, SEARCH_COLUMN_NAME, _("Name"), FALSE, FALSE);