projects
/
geeqie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trim trailing white spaces.
[geeqie.git]
/
src
/
dupe.c
diff --git
a/src/dupe.c
b/src/dupe.c
index
2c0df5d
..
77cc06e
100644
(file)
--- a/
src/dupe.c
+++ b/
src/dupe.c
@@
-2210,17
+2210,13
@@
static void dupe_menu_popup_destroy_cb(GtkWidget *widget, gpointer data)
GList *editmenu_fd_list = data;
filelist_free(editmenu_fd_list);
GList *editmenu_fd_list = data;
filelist_free(editmenu_fd_list);
-}
+}
static GList *dupe_window_get_fd_list(DupeWindow *dw)
{
GList *list;
static GList *dupe_window_get_fd_list(DupeWindow *dw)
{
GList *list;
-#if GTK_CHECK_VERSION(2,20,0)
if (gtk_widget_has_focus(dw->second_listview))
if (gtk_widget_has_focus(dw->second_listview))
-#else
- if (GTK_WIDGET_HAS_FOCUS(dw->second_listview))
-#endif
{
list = dupe_listview_get_selection(dw, dw->second_listview);
}
{
list = dupe_listview_get_selection(dw, dw->second_listview);
}
@@
-2773,11
+2769,7
@@
static void dupe_listview_set_height(GtkWidget *listview, gboolean thumb)
gtk_tree_view_column_set_fixed_width(column, (thumb) ? options->thumbnails.max_width : 4);
gtk_tree_view_column_set_fixed_width(column, (thumb) ? options->thumbnails.max_width : 4);
-#if GTK_CHECK_VERSION(2,18,0)
list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column));
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);
if (!list) return;
cell = list->data;
g_list_free(list);
@@
-2864,11
+2856,7
@@
static gboolean dupe_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, g
GList *slist;
DupeItem *di = NULL;
GList *slist;
DupeItem *di = NULL;
-#if GTK_CHECK_VERSION(2,20,0)
on_second = gtk_widget_has_focus(dw->second_listview);
on_second = gtk_widget_has_focus(dw->second_listview);
-#else
- on_second = GTK_WIDGET_HAS_FOCUS(dw->second_listview);
-#endif
if (on_second)
{
if (on_second)
{
@@
-2899,42
+2887,21
@@
static gboolean dupe_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, g
if (event->state & GDK_CONTROL_MASK)
{
if (event->state & GDK_CONTROL_MASK)
{
- gint edit_val = -1;
-
if (!on_second)
{
stop_signal = TRUE;
switch (event->keyval)
{
case '1':
if (!on_second)
{
stop_signal = TRUE;
switch (event->keyval)
{
case '1':
- edit_val = 0;
- break;
case '2':
case '2':
- edit_val = 1;
- break;
case '3':
case '3':
- edit_val = 2;
- break;
case '4':
case '4':
- edit_val = 3;
- break;
case '5':
case '5':
- edit_val = 4;
- break;
case '6':
case '6':
- edit_val = 5;
- break;
case '7':
case '7':
- edit_val = 6;
- break;
case '8':
case '8':
- edit_val = 7;
- break;
case '9':
case '9':
- edit_val = 8;
- break;
case '0':
case '0':
- edit_val = 9;
break;
case 'C': case 'c':
file_util_copy(NULL, dupe_listview_get_selection(dw, listview),
break;
case 'C': case 'c':
file_util_copy(NULL, dupe_listview_get_selection(dw, listview),
@@
-2997,12
+2964,6
@@
static gboolean dupe_window_keypress_cb(GtkWidget *widget, GdkEventKey *event, g
break;
}
}
break;
}
}
-#if 0
- if (edit_val >= 0)
- {
- dupe_window_edit_selected(dw, edit_val);
- }
-#endif
}
else
{
}
else
{
@@
-3394,8
+3355,6
@@
static void dupe_dnd_data_set(GtkWidget *widget, GdkDragContext *context,
guint time, gpointer data)
{
DupeWindow *dw = data;
guint time, gpointer data)
{
DupeWindow *dw = data;
- gchar *uri_text;
- gint length;
GList *list;
switch (info)
GList *list;
switch (info)
@@
-3408,7
+3367,6
@@
static void dupe_dnd_data_set(GtkWidget *widget, GdkDragContext *context,
filelist_free(list);
break;
default:
filelist_free(list);
break;
default:
- uri_text = NULL;
break;
}
}
break;
}
}