Mercurial > hg > forks > geeqie
changeset 2095:e4aa52cbbecb
dropped support for gtk < 2.20
| author | Vladimir Nadvornik <nadvornik@suse.cz> |
|---|---|
| date | Sun, 19 Aug 2012 00:28:42 +0200 |
| parents | 596b928d2751 |
| children | d9639ff548b1 |
| files | src/bar.c src/bar_comment.c src/bar_exif.c src/bar_histogram.c src/bar_keywords.c src/bar_sort.c src/cache_maint.c src/cellrenderericon.c src/collect-table.c src/compat.c src/compat.h src/dupe.c src/image.c src/layout.c src/layout_image.c src/layout_util.c src/logwindow.c src/pan-view.c src/pixbuf-renderer.c src/preferences.c src/print.c src/renderer-tiles.c src/search.c src/ui_misc.c src/ui_tabcomp.c src/ui_tree_edit.c src/ui_utildlg.c src/utilops.c src/view_dir_list.c src/view_file.c src/view_file_icon.c src/view_file_list.c |
| diffstat | 32 files changed, 10 insertions(+), 512 deletions(-) [+] |
line wrap: on
line diff
--- a/src/bar.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/bar.c Sun Aug 19 00:28:42 2012 +0200 @@ -457,11 +457,7 @@ if (!bd) return; WRITE_NL(); WRITE_STRING("<bar "); -#if GTK_CHECK_VERSION(2,20,0) write_bool_option(outstr, indent, "enabled", gtk_widget_get_visible(bar)); -#else - write_bool_option(outstr, indent, "enabled", GTK_WIDGET_VISIBLE(bar)); -#endif write_uint_option(outstr, indent, "width", bd->width); WRITE_STRING(">");
--- a/src/bar_comment.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/bar_comment.c Sun Aug 19 00:28:42 2012 +0200 @@ -141,11 +141,7 @@ pcd = g_object_get_data(G_OBJECT(bar), "pane_data"); if (!pcd) return FALSE; -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_has_focus(pcd->comment_view)) return gtk_widget_event(pcd->comment_view, event); -#else - if (GTK_WIDGET_HAS_FOCUS(pcd->comment_view)) return gtk_widget_event(pcd->comment_view, event); -#endif return FALSE; }
--- a/src/bar_exif.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/bar_exif.c Sun Aug 19 00:28:42 2012 +0200 @@ -301,11 +301,7 @@ ExifEntry *ee = g_object_get_data(G_OBJECT(entry), "entry_data"); work = work->next; -#if GTK_CHECK_VERSION(2,20,0) if (ee->editable && gtk_widget_has_focus(ee->value_widget)) ret = gtk_widget_event(ee->value_widget, event); -#else - if (ee->editable && GTK_WIDGET_HAS_FOCUS(ee->value_widget)) ret = gtk_widget_event(ee->value_widget, event); -#endif } g_list_free(list); return ret; @@ -403,11 +399,7 @@ gtk_widget_get_allocation(entry, &allocation); -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_is_drawable(entry) && -#else - if (GTK_WIDGET_DRAWABLE(entry) && -#endif gtk_widget_translate_coordinates(pane, entry, x, y, &nx, &ny) && ny < allocation.height / 2) break; pos++;
--- a/src/bar_histogram.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/bar_histogram.c Sun Aug 19 00:28:42 2012 +0200 @@ -61,11 +61,7 @@ /* histmap_get is relatively expensive, run it only when we really need it and with lower priority than pixbuf_renderer FIXME: this does not work for fullscreen*/ -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_is_drawable(phd->drawing_area)) -#else - if (GTK_WIDGET_DRAWABLE(phd->drawing_area)) -#endif { if (!phd->idle_id) {
--- a/src/bar_keywords.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/bar_keywords.c Sun Aug 19 00:28:42 2012 +0200 @@ -264,11 +264,7 @@ pkd = g_object_get_data(G_OBJECT(bar), "pane_data"); if (!pkd) return FALSE; -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_has_focus(pkd->keyword_view)) return gtk_widget_event(pkd->keyword_view, event); -#else - if (GTK_WIDGET_HAS_FOCUS(pkd->keyword_view)) return gtk_widget_event(pkd->keyword_view, event); -#endif return FALSE; }
--- a/src/bar_sort.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/bar_sort.c Sun Aug 19 00:28:42 2012 +0200 @@ -724,11 +724,7 @@ if (!sd) return; WRITE_NL(); WRITE_STRING("<bar_sort "); -#if GTK_CHECK_VERSION(2,20,0) write_bool_option(outstr, indent, "enabled", gtk_widget_get_visible(bar)); -#else - write_bool_option(outstr, indent, "enabled", GTK_WIDGET_VISIBLE(bar)); -#endif WRITE_INT(*sd, mode); WRITE_INT(*sd, action); WRITE_INT(*sd, selection);
--- a/src/cache_maint.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/cache_maint.c Sun Aug 19 00:28:42 2012 +0200 @@ -256,11 +256,7 @@ { CMData *cm = data; -#if GTK_CHECK_VERSION(2,20,0) if (!gtk_widget_get_sensitive(cm->button_close)) return; -#else - if (!GTK_WIDGET_SENSITIVE(cm->button_close)) return; -#endif cache_maintain_home_close(cm); } @@ -712,11 +708,7 @@ { CleanData *cd = data; -#if GTK_CHECK_VERSION(2,20,0) if (!gtk_widget_get_sensitive(cd->button_close)) return; -#else - if (!GTK_WIDGET_SENSITIVE(cd->button_close)) return; -#endif cache_manager_render_reset(cd); generic_dialog_close(cd->gd); @@ -831,11 +823,7 @@ CleanData *cd = data; gchar *path; -#if GTK_CHECK_VERSION(2,20,0) if (cd->list || !gtk_widget_get_sensitive(cd->button_start)) return; -#else - if (cd->list || !GTK_WIDGET_SENSITIVE(cd->button_start)) return; -#endif path = remove_trailing_slash((gtk_entry_get_text(GTK_ENTRY(cd->entry)))); parse_out_relatives(path); @@ -932,11 +920,7 @@ { CleanData *cd = data; -#if GTK_CHECK_VERSION(2,20,0) if (!gtk_widget_get_sensitive(cd->button_close)) return; -#else - if (!GTK_WIDGET_SENSITIVE(cd->button_close)) return; -#endif generic_dialog_close(cd->gd); @@ -1049,11 +1033,7 @@ gchar *path; FileData *dir_fd; -#if GTK_CHECK_VERSION(2,20,0) if (cd->list || !gtk_widget_get_sensitive(cd->button_start)) return; -#else - if (cd->list || !GTK_WIDGET_SENSITIVE(cd->button_start)) return; -#endif gtk_widget_set_sensitive(cd->button_start, FALSE); gtk_widget_set_sensitive(cd->button_stop, TRUE);
--- a/src/cellrenderericon.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/cellrenderericon.c Sun Aug 19 00:28:42 2012 +0200 @@ -678,22 +678,14 @@ if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED) { -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_has_focus(widget)) -#else - if (GTK_WIDGET_HAS_FOCUS(widget)) -#endif state = GTK_STATE_SELECTED; else state = GTK_STATE_ACTIVE; } else { -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_get_state(widget) == GTK_STATE_INSENSITIVE) -#else - if (GTK_WIDGET_STATE(widget) == GTK_STATE_INSENSITIVE) -#endif state = GTK_STATE_INSENSITIVE; else state = GTK_STATE_NORMAL; @@ -836,11 +828,7 @@ } } -#if GTK_CHECK_VERSION(2,20,0) if (cellicon->focused && gtk_widget_has_focus(widget)) -#else - if (cellicon->focused && GTK_WIDGET_HAS_FOCUS(widget)) -#endif { #if GTK_CHECK_VERSION(3,0,0) #else
--- a/src/collect-table.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/collect-table.c Sun Aug 19 00:28:42 2012 +0200 @@ -539,11 +539,7 @@ 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); } @@ -1574,11 +1570,7 @@ 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 +1721,7 @@ 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 +1732,7 @@ "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;
--- a/src/compat.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/compat.c Sun Aug 19 00:28:42 2012 +0200 @@ -12,49 +12,6 @@ #include "main.h" #include "compat.h" -/* gtk_radio_action_set_current_value() replacement for GTK+ < 2.10 */ -void radio_action_set_current_value(GtkRadioAction *action, gint current_value) -{ -#if GTK_CHECK_VERSION(2, 10, 0) - gtk_radio_action_set_current_value(action, current_value); -#else - GSList *group; - gint value; - - group = gtk_radio_action_get_group(action); - while (group) - { - action = GTK_RADIO_ACTION(group->data); - g_object_get(G_OBJECT(action), "value", &value, NULL); - if (value == current_value) - { - gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), TRUE); - return; - } - group = g_slist_next(group); - } -#endif -} - -#if !GLIB_CHECK_VERSION(2, 14, 0) -static void hash_table_add(gpointer key, gpointer value, gpointer user_data) -{ - GList **list = user_data; - *list = g_list_prepend(*list, key); -} -#endif - -GList* hash_table_get_keys(GHashTable *hash_table) -{ -#if GLIB_CHECK_VERSION(2, 14, 0) - return g_hash_table_get_keys(hash_table); -#else - GList *list = NULL; - g_hash_table_foreach(hash_table, hash_table_add, &list); - return list; -#endif -} - #if !GTK_CHECK_VERSION(2,24,0) gint compat_gdk_window_get_width(GdkWindow *window) {
--- a/src/compat.h Sat Aug 18 23:02:36 2012 +0200 +++ b/src/compat.h Sun Aug 19 00:28:42 2012 +0200 @@ -13,13 +13,6 @@ #ifndef COMPAT_H #define COMPAT_H -void radio_action_set_current_value(GtkRadioAction *action, gint current_value); -GList* hash_table_get_keys(GHashTable *hash_table); - -#if !GTK_CHECK_VERSION(2,12,0) -#define gtk_widget_set_tooltip_text(widget, text) /* ignored */ -#endif - /* Some systems (BSD,MacOsX,HP-UX,...) define MAP_ANON and not MAP_ANONYMOUS */ #if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
--- a/src/dupe.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/dupe.c Sun Aug 19 00:28:42 2012 +0200 @@ -2216,11 +2216,7 @@ { GList *list; -#if GTK_CHECK_VERSION(2,20,0) 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); } @@ -2773,11 +2769,7 @@ 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)); -#else - list = gtk_tree_view_column_get_cell_renderers(column); -#endif if (!list) return; cell = list->data; g_list_free(list); @@ -2864,11 +2856,7 @@ GList *slist; DupeItem *di = NULL; -#if GTK_CHECK_VERSION(2,20,0) on_second = gtk_widget_has_focus(dw->second_listview); -#else - on_second = GTK_WIDGET_HAS_FOCUS(dw->second_listview); -#endif if (on_second) {
--- a/src/image.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/image.c Sun Aug 19 00:28:42 2012 +0200 @@ -1796,19 +1796,11 @@ if (frame) { imd->frame = gtk_frame_new(NULL); -#if GTK_CHECK_VERSION(2,12,0) g_object_ref(imd->pr); -#else - gtk_widget_ref(imd->pr); -#endif if (imd->has_frame != -1) gtk_container_remove(GTK_CONTAINER(imd->widget), imd->pr); gtk_container_add(GTK_CONTAINER(imd->frame), imd->pr); -#if GTK_CHECK_VERSION(2,12,0) g_object_unref(imd->pr); -#else - gtk_widget_unref(imd->pr); -#endif gtk_widget_set_can_focus(imd->frame, TRUE); gtk_widget_set_app_paintable(imd->frame, TRUE); @@ -1822,37 +1814,21 @@ g_signal_connect(G_OBJECT(imd->frame), "focus_in_event", G_CALLBACK(image_focus_in_cb), imd); -#if GTK_CHECK_VERSION(2,14,0) gtk_box_pack_start(GTK_BOX(imd->widget), imd->frame, TRUE, TRUE, 0); -#else - gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->frame); -#endif gtk_widget_show(imd->frame); } else { -#if GTK_CHECK_VERSION(2,12,0) g_object_ref(imd->pr); -#else - gtk_widget_ref(imd->pr); -#endif if (imd->frame) { gtk_container_remove(GTK_CONTAINER(imd->frame), imd->pr); gtk_widget_destroy(imd->frame); imd->frame = NULL; } -#if GTK_CHECK_VERSION(2,14,0) gtk_box_pack_start(GTK_BOX(imd->widget), imd->pr, TRUE, TRUE, 0); -#else - gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->pr); -#endif -#if GTK_CHECK_VERSION(2,12,0) g_object_unref(imd->pr); -#else - gtk_widget_unref(imd->pr); -#endif } gtk_widget_show(imd->pr);
--- a/src/layout.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/layout.c Sun Aug 19 00:28:42 2012 +0200 @@ -332,11 +332,7 @@ static void layout_sort_menu_hide_cb(GtkWidget *widget, gpointer data) { /* destroy the menu */ -#if GTK_CHECK_VERSION(2,12,0) g_object_unref(widget); -#else - gtk_widget_unref(GTK_WIDGET(widget)); -#endif } static void layout_sort_button_press_cb(GtkWidget *widget, gpointer data) @@ -1164,11 +1160,7 @@ GtkAllocation allocation; if (!layout_valid(&lw)) return FALSE; -#if GTK_CHECK_VERSION(2,20,0) if (!lw->tools || !gtk_widget_get_visible(lw->tools)) -#else - if (!lw->tools || !GTK_WIDGET_VISIBLE(lw->tools)) -#endif { /* use the stored values (sort of breaks success return value) */ @@ -1207,11 +1199,7 @@ if (hide) { -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_get_visible(lw->tools)) -#else - if (GTK_WIDGET_VISIBLE(lw->tools)) -#endif { layout_tools_geometry_sync(lw); gtk_widget_hide(lw->tools); @@ -1219,11 +1207,7 @@ } else { -#if GTK_CHECK_VERSION(2,20,0) if (!gtk_widget_get_visible(lw->tools)) -#else - if (!GTK_WIDGET_VISIBLE(lw->tools)) -#endif { gtk_widget_show(lw->tools); if (lw->vf) vf_refresh(lw->vf); @@ -1749,19 +1733,11 @@ if (lw->options.toolbar_hidden) { -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_get_visible(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_hide(lw->toolbar[TOOLBAR_MAIN]); -#else - if (GTK_WIDGET_VISIBLE(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_hide(lw->toolbar[TOOLBAR_MAIN]); -#endif } else { -#if GTK_CHECK_VERSION(2,20,0) if (!gtk_widget_get_visible(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_show(lw->toolbar[TOOLBAR_MAIN]); -#else - if (!GTK_WIDGET_VISIBLE(lw->toolbar[TOOLBAR_MAIN])) gtk_widget_show(lw->toolbar[TOOLBAR_MAIN]); -#endif } }
--- a/src/layout_image.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/layout_image.c Sun Aug 19 00:28:42 2012 +0200 @@ -1616,11 +1616,7 @@ { lw->split_images[i] = image_new(TRUE); -#if GTK_CHECK_VERSION(2,12,0) g_object_ref(lw->split_images[i]->widget); -#else - gtk_widget_ref(lw->split_images[i]->widget); -#endif g_signal_connect(G_OBJECT(lw->split_images[i]->pr), "update-pixel", G_CALLBACK(layout_status_update_pixel_cb), lw); @@ -1759,11 +1755,7 @@ { if (lw->split_images[i]) { -#if GTK_CHECK_VERSION(2,12,0) g_object_unref(lw->split_images[i]->widget); -#else - gtk_widget_unref(lw->split_images[i]->widget); -#endif lw->split_images[i] = NULL; } }
--- a/src/layout_util.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/layout_util.c Sun Aug 19 00:28:42 2012 +0200 @@ -90,11 +90,7 @@ gint x = 0; gint y = 0; -#if GTK_CHECK_VERSION(2,20,0) if (lw->path_entry && gtk_widget_has_focus(lw->path_entry)) -#else - if (lw->path_entry && GTK_WIDGET_HAS_FOCUS(lw->path_entry)) -#endif { if (event->keyval == GDK_KEY_Escape && lw->dir_fd) { @@ -109,11 +105,7 @@ return TRUE; } } -#if GTK_CHECK_VERSION(2,20,0) if (lw->vd && lw->options.dir_view_type == DIRVIEW_TREE && gtk_widget_has_focus(lw->vd->view) && -#else - if (lw->vd && lw->options.dir_view_type == DIRVIEW_TREE && GTK_WIDGET_HAS_FOCUS(lw->vd->view) && -#endif !layout_key_match(event->keyval) && gtk_widget_event(lw->vd->view, (GdkEvent *)event)) { @@ -133,11 +125,7 @@ focused = gtk_container_get_focus_child(GTK_CONTAINER(lw->image->widget)); if (lw->image && -#if GTK_CHECK_VERSION(2,20,0) (focused && gtk_widget_has_focus(focused) || (lw->tools && widget == lw->window) || lw->full_screen) ) -#else - (focused && GTK_WIDGET_HAS_FOCUS(focused) || (lw->tools && widget == lw->window) || lw->full_screen) ) -#endif { stop_signal = TRUE; switch (event->keyval) @@ -848,7 +836,7 @@ mode = mode % 3 + 1; GtkAction *radio = gtk_action_group_get_action(lw->action_group, "StereoAuto"); - radio_action_set_current_value(GTK_RADIO_ACTION(radio), mode); + gtk_radio_action_set_current_value(GTK_RADIO_ACTION(radio), mode); /* this is called via fallback in layout_menu_stereo_mode_cb @@ -2375,13 +2363,13 @@ if (!lw->action_group) return; action = gtk_action_group_get_action(lw->action_group, "FolderTree"); - radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->options.dir_view_type); + gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->options.dir_view_type); action = gtk_action_group_get_action(lw->action_group, "SplitSingle"); - radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->split_mode); + gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->split_mode); action = gtk_action_group_get_action(lw->action_group, "ViewIcons"); - radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->options.file_view_type); + gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->options.file_view_type); action = gtk_action_group_get_action(lw->action_group, "FloatTools"); gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->options.tools_float); @@ -2413,17 +2401,17 @@ if (osd_flags & OSD_SHOW_HISTOGRAM) { action = gtk_action_group_get_action(lw->action_group, "HistogramChanR"); - radio_action_set_current_value(GTK_RADIO_ACTION(action), image_osd_histogram_get_channel(lw->image)); + gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), image_osd_histogram_get_channel(lw->image)); action = gtk_action_group_get_action(lw->action_group, "HistogramModeLin"); - radio_action_set_current_value(GTK_RADIO_ACTION(action), image_osd_histogram_get_mode(lw->image)); + gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), image_osd_histogram_get_mode(lw->image)); } action = gtk_action_group_get_action(lw->action_group, "ConnectZoomMenu"); gtk_action_set_sensitive(action, lw->split_mode != SPLIT_NONE); action = gtk_action_group_get_action(lw->action_group, "StereoAuto"); - radio_action_set_current_value(GTK_RADIO_ACTION(action), layout_image_stereo_pixbuf_get(lw)); + gtk_radio_action_set_current_value(GTK_RADIO_ACTION(action), layout_image_stereo_pixbuf_get(lw)); layout_util_sync_color(lw); } @@ -2456,11 +2444,7 @@ static gboolean layout_bar_enabled(LayoutWindow *lw) { -#if GTK_CHECK_VERSION(2,20,0) return lw->bar && gtk_widget_get_visible(lw->bar); -#else - return lw->bar && GTK_WIDGET_VISIBLE(lw->bar); -#endif } static void layout_bar_destroyed(GtkWidget *widget, gpointer data) @@ -2553,11 +2537,7 @@ static gboolean layout_bar_sort_enabled(LayoutWindow *lw) { -#if GTK_CHECK_VERSION(2,20,0) return lw->bar_sort && gtk_widget_get_visible(lw->bar_sort); -#else - return lw->bar_sort && GTK_WIDGET_VISIBLE(lw->bar_sort); -#endif }
--- a/src/logwindow.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/logwindow.c Sun Aug 19 00:28:42 2012 +0200 @@ -270,11 +270,7 @@ log_window_insert_text(buffer, &iter, str, logdefs[type].tag); -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_get_visible(text)) -#else - if (GTK_WIDGET_VISIBLE(text)) -#endif { GtkTextMark *mark;
--- a/src/pan-view.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/pan-view.c Sun Aug 19 00:28:42 2012 +0200 @@ -1214,15 +1214,9 @@ fd = pan_menu_click_fd(pw); imd_widget = gtk_container_get_focus_child(GTK_CONTAINER(pw->imd->widget)); -#if GTK_CHECK_VERSION(2,20,0) focused = (pw->fs || imd_widget && gtk_widget_has_focus(imd_widget)); on_entry = (gtk_widget_has_focus(pw->path_entry) || gtk_widget_has_focus(pw->search_entry)); -#else - focused = (pw->fs || imd_widget && GTK_WIDGET_HAS_FOCUS(imd_widget)); - on_entry = (GTK_WIDGET_HAS_FOCUS(pw->path_entry) || - GTK_WIDGET_HAS_FOCUS(pw->search_entry)); -#endif if (focused) { @@ -1975,11 +1969,7 @@ PanWindow *pw = data; gboolean visible; -#if GTK_CHECK_VERSION(2,20,0) visible = gtk_widget_get_visible(pw->search_box); -#else - visible = GTK_WIDGET_VISIBLE(pw->search_box); -#endif if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)) == visible) return; if (visible) @@ -2001,11 +1991,7 @@ if (enable) { -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_get_visible(pw->search_box)) -#else - if (GTK_WIDGET_VISIBLE(pw->search_box)) -#endif { gtk_widget_grab_focus(pw->search_entry); } @@ -2016,17 +2002,9 @@ } else { -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_get_visible(pw->search_entry)) -#else - if (GTK_WIDGET_VISIBLE(pw->search_entry)) -#endif { -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_has_focus(pw->search_entry)) -#else - if (GTK_WIDGET_HAS_FOCUS(pw->search_entry)) -#endif { gtk_widget_grab_focus(GTK_WIDGET(pw->imd->widget)); }
--- a/src/pixbuf-renderer.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/pixbuf-renderer.c Sun Aug 19 00:28:42 2012 +0200 @@ -2056,11 +2056,7 @@ } parent = gtk_widget_get_parent(widget); -#if GTK_CHECK_VERSION(2,20,0) if (widget && gtk_widget_get_can_focus(parent)) -#else - if (widget && GTK_WIDGET_CAN_FOCUS(parent)) -#endif { gtk_widget_grab_focus(parent); } @@ -2080,11 +2076,7 @@ return TRUE; } -#if GTK_CHECK_VERSION(2,20,0) if (gdk_pointer_is_grabbed() && gtk_widget_has_grab(GTK_WIDGET(pr))) -#else - if (gdk_pointer_is_grabbed() && GTK_WIDGET_HAS_GRAB(pr)) -#endif { gtk_grab_remove(widget); gdk_pointer_ungrab(bevent->time);
--- a/src/preferences.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/preferences.c Sun Aug 19 00:28:42 2012 +0200 @@ -990,7 +990,6 @@ help_window_show("overlay"); } -#if GTK_CHECK_VERSION(2, 10, 0) static void accel_store_populate(void) { LayoutWindow *lw; @@ -1288,7 +1287,6 @@ } #endif -#endif static GtkWidget *scrolled_notebook_page(GtkWidget *notebook, const gchar *title) { @@ -1541,7 +1539,6 @@ image_overlay_template_view = gtk_text_view_new(); -#if GTK_CHECK_VERSION(2,12,0) gtk_widget_set_tooltip_markup(image_overlay_template_view, _("<i>%name%</i> results in the filename of the picture.\n" "Also available: <i>%collection%</i>, <i>%number%</i>, <i>%total%</i>, <i>%date%</i>,\n" @@ -1553,8 +1550,7 @@ "<i>%formatted.ShutterSpeed%</i>|<i>%formatted.ISOSpeedRating%</i>|<i>%formatted.FocalLength%</i> could show \"1/20s - 400 - 80 mm\" or \"1/200 - 80 mm\",\n" "if there's no ISO information in the Exif data.\n" "If a line is empty, it is removed. This allows one to add lines that totally disappear when no data is available.\n" -)); -#endif + )); gtk_container_add(GTK_CONTAINER(scrolled), image_overlay_template_view); gtk_widget_show(image_overlay_template_view); @@ -1963,9 +1959,7 @@ pref_spacer(hbox, PREF_PAD_INDENT - PREF_PAD_GAP); spin = pref_spin_new_int(hbox, _("Maximum size:"), _("MB"), 0, 2048, 1, options->file_ops.safe_delete_folder_maxsize, &c_options->file_ops.safe_delete_folder_maxsize); -#if GTK_CHECK_VERSION(2,12,0) gtk_widget_set_tooltip_markup(spin, _("Set to 0 for unlimited size")); -#endif button = pref_button_new(NULL, NULL, _("View"), FALSE, G_CALLBACK(safe_delete_view_cb), NULL); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); @@ -2018,7 +2012,6 @@ /* accelerators tab */ static void config_tab_accelerators(GtkWidget *notebook) { -#if GTK_CHECK_VERSION(2, 10, 0) GtkWidget *hbox; GtkWidget *vbox; GtkWidget *group; @@ -2132,7 +2125,6 @@ gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); #endif -#endif } /* stereo tab */
--- a/src/print.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/print.c Sun Aug 19 00:28:42 2012 +0200 @@ -1959,11 +1959,7 @@ GtkWidget *label; gchar *buf; -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_get_visible(pw->dialog->dialog)) parent = pw->dialog->dialog; -#else - if (GTK_WIDGET_VISIBLE(pw->dialog->dialog)) parent = pw->dialog->dialog; -#endif gd = generic_dialog_new(_("Printing error"), "print_warning", parent, TRUE, NULL, NULL); @@ -2489,11 +2485,7 @@ pw->job_pixbuf = NULL; } -#if GTK_CHECK_VERSION(2,20,0) if (pw->dialog && !gtk_widget_get_visible(pw->dialog->dialog)) -#else - if (pw->dialog && !GTK_WIDGET_VISIBLE(pw->dialog->dialog)) -#endif { g_idle_add_full(G_PRIORITY_HIGH_IDLE, print_job_close_finish_cb, pw, NULL); }
--- a/src/renderer-tiles.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/renderer-tiles.c Sun Aug 19 00:28:42 2012 +0200 @@ -1488,16 +1488,6 @@ cairo_fill (cr); cairo_destroy (cr); -#if 0 -#if GTK_CHECK_VERSION(2,20,0) - gdk_draw_drawable(window, box->style->fg_gc[gtk_widget_get_state(box)], -#else - gdk_draw_drawable(window, box->style->fg_gc[GTK_WIDGET_STATE(box)], -#endif - it->pixmap, x, y, - pr->x_offset + (it->x - rt->x_scroll) + x + rt->stereo_off_x, pr->y_offset + (it->y - rt->y_scroll) + y + rt->stereo_off_y, w, h); -#endif - if (rt->overlay_list) { rt_overlay_draw(rt, pr->x_offset + (it->x - rt->x_scroll) + x, @@ -1617,11 +1607,7 @@ fast = FALSE; } -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_get_realized(pr)) -#else - if (GTK_WIDGET_REALIZED(pr)) -#endif { if (rt_tile_is_visible(rt, qd->it)) { @@ -1953,15 +1939,6 @@ cairo_pop_group_to_source(cr); cairo_paint(cr); cairo_destroy(cr); -#if 0 - gc = gdk_gc_new(window); - gdk_gc_set_exposures(gc, TRUE); - gdk_draw_drawable(window, gc, - window, - x2 + pr->x_offset + rt->stereo_off_x, y2 + pr->y_offset + rt->stereo_off_y, - x1 + pr->x_offset + rt->stereo_off_x, y1 + pr->y_offset + rt->stereo_off_y, w, h); - g_object_unref(gc); -#endif rt_overlay_queue_all(rt, x2, y2, x1, y1); @@ -1981,22 +1958,6 @@ rt->x_scroll, y_off > 0 ? rt->y_scroll + (pr->vis_height - h) : rt->y_scroll, pr->vis_width, h, TRUE, TILE_RENDER_ALL, FALSE, FALSE); } - - /* process exposures here, "expose_event" seems to miss a few with obstructed windows */ -#if ! GTK_CHECK_VERSION(2,18,0) - while ((event = gdk_event_get_graphics_expose(window)) != NULL) - { - renderer_redraw((void *) rt, event->expose.area.x, event->expose.area.y, event->expose.area.width, event->expose.area.height, - FALSE, TILE_RENDER_ALL, FALSE, FALSE); - - if (event->expose.count == 0) - { - gdk_event_free(event); - break; - } - gdk_event_free(event); - } -#endif } } @@ -2155,17 +2116,9 @@ static gboolean rt_expose_cb(GtkWidget *widget, GdkEventExpose *event, gpointer data) { RendererTiles *rt = (RendererTiles *)data; -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_is_drawable(widget)) -#else - if (GTK_WIDGET_DRAWABLE(widget)) -#endif { -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_get_has_window(widget)) -#else - if (!GTK_WIDGET_NO_WINDOW(widget)) -#endif { if (event->window != gtk_widget_get_window(widget)) {
--- a/src/search.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/search.c Sun Aug 19 00:28:42 2012 +0200 @@ -824,11 +824,7 @@ 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); @@ -2347,19 +2343,11 @@ { 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 } }
--- a/src/ui_misc.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/ui_misc.c Sun Aug 19 00:28:42 2012 +0200 @@ -556,11 +556,7 @@ { GtkWidget *widget = data; -#if GTK_CHECK_VERSION(2,20,0) gtk_widget_set_sensitive(widget, gtk_widget_is_sensitive(watch)); -#else - gtk_widget_set_sensitive(widget, GTK_WIDGET_IS_SENSITIVE(watch)); -#endif } void pref_link_sensitivity(GtkWidget *widget, GtkWidget *watch) @@ -741,23 +737,9 @@ } -#if ! GTK_CHECK_VERSION(2,12,0) - -static void pref_toolbar_destroy_cb(GtkWidget *widget, gpointer data) -{ - GtkTooltips *tips = data; - - g_object_unref(G_OBJECT(tips)); -} - -#endif - GtkWidget *pref_toolbar_new(GtkWidget *parent_box, GtkToolbarStyle style) { GtkWidget *tbar; -#if ! GTK_CHECK_VERSION(2,12,0) - GtkTooltips *tips; -#endif tbar = gtk_toolbar_new(); gtk_toolbar_set_style(GTK_TOOLBAR(tbar), style); @@ -767,27 +749,6 @@ gtk_box_pack_start(GTK_BOX(parent_box), tbar, FALSE, FALSE, 0); gtk_widget_show(tbar); } - -#if ! GTK_CHECK_VERSION(2,12,0) - tips = gtk_tooltips_new(); - - /* take ownership of tooltips */ -# ifdef GTK_OBJECT_FLOATING - /* GTK+ < 2.10 */ - g_object_ref(G_OBJECT(tips)); - gtk_object_sink(GTK_OBJECT(tips)); -# else - /* GTK+ >= 2.10 */ - g_object_ref_sink(G_OBJECT(tips)); -# endif - - g_object_set_data(G_OBJECT(tbar), "tooltips", tips); - g_signal_connect(G_OBJECT(tbar), "destroy", - G_CALLBACK(pref_toolbar_destroy_cb), tips); - - gtk_tooltips_enable(tips); -#endif - return tbar; } @@ -830,18 +791,8 @@ if (description) { - -#if GTK_CHECK_VERSION(2,12,0) - gtk_widget_set_tooltip_text(item, description); - -#else - GtkTooltips *tips; - - tips = g_object_get_data(G_OBJECT(toolbar), "tooltips"); - gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(item), tips, description, NULL); -#endif - } + } return item; } @@ -899,11 +850,7 @@ { if (!ds->window) return; -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_has_grab(ds->window)) -#else - if (GTK_WIDGET_HAS_GRAB(ds->window)) -#endif { gtk_grab_remove(ds->window); gdk_keyboard_ungrab(GDK_CURRENT_TIME); @@ -1338,11 +1285,7 @@ if (bevent->button != MOUSE_BUTTON_LEFT) return FALSE; -#if GTK_CHECK_VERSION(2,20,0) if (gdk_pointer_is_grabbed() && gtk_widget_has_grab(sd->sizer)) -#else - if (gdk_pointer_is_grabbed() && GTK_WIDGET_HAS_GRAB(sd->sizer)) -#endif { gtk_grab_remove(sd->sizer); gdk_pointer_ungrab(bevent->time);
--- a/src/ui_tabcomp.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/ui_tabcomp.c Sun Aug 19 00:28:42 2012 +0200 @@ -206,11 +206,7 @@ TabCompData *td = data; GtkWidget *child; -#if GTK_CHECK_VERSION(2,20,0) if (!gtk_widget_get_visible(widget)) return; -#else - if (!GTK_WIDGET_VISIBLE(widget)) return; -#endif child = gtk_bin_get_child(GTK_BIN(widget)); if (GTK_IS_LABEL(child)) { @@ -260,11 +256,7 @@ /* close the menu */ gtk_menu_popdown(GTK_MENU(widget)); /* doing this does not emit the "selection done" signal, unref it ourselves */ -#if GTK_CHECK_VERSION(2,12,0) g_object_unref(widget); -#else - gtk_widget_unref(widget); -#endif return TRUE; } @@ -655,11 +647,7 @@ if (!td) return; -#if GTK_CHECK_VERSION(2,20,0) if (!gtk_widget_has_focus(entry)) -#else - if (!GTK_WIDGET_HAS_FOCUS(entry)) -#endif { gtk_widget_grab_focus(entry); }
--- a/src/ui_tree_edit.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/ui_tree_edit.c Sun Aug 19 00:28:42 2012 +0200 @@ -188,20 +188,12 @@ GList *work; if (!edit_func) return FALSE; -#if GTK_CHECK_VERSION(2,20,0) if (!gtk_widget_get_visible(GTK_WIDGET(tree))) return FALSE; -#else - if (!GTK_WIDGET_VISIBLE(tree)) return FALSE; -#endif tcolumn = gtk_tree_view_get_column(tree, column); if (!tcolumn) return FALSE; -#if GTK_CHECK_VERSION(2,18,0) list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(tcolumn)); -#else - list = gtk_tree_view_column_get_cell_renderers(tcolumn); -#endif work = list; while (work && !cell) { @@ -277,11 +269,7 @@ * use x_offset instead for X scroll (sigh) */ gtk_tree_view_get_cell_area(widget, tpath, tv_column, &rect); -#if GTK_CHECK_VERSION(2,12,0) gtk_tree_view_convert_tree_to_widget_coords(widget, 0, 0, &x_offset, &y_offset); -#else - gtk_tree_view_tree_to_widget_coords(widget, 0, 0, &x_offset, &y_offset); -#endif gdk_window_get_origin(gtk_widget_get_window(GTK_WIDGET(widget)), &x_origin, &y_origin); if (gtk_tree_view_get_headers_visible(widget)) @@ -307,11 +295,7 @@ gint cell_x; gint cell_width; -#if GTK_CHECK_VERSION(2,18,0) renderers = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(tv_column)); -#else - renderers = gtk_tree_view_column_get_cell_renderers(tv_column); -#endif work = renderers; while (work && !cell) { @@ -368,7 +352,6 @@ *height = MIN(*height, wy + wh - (*y)); } -#if GTK_CHECK_VERSION(2,8,0) /* an implementation that uses gtk_tree_view_get_visible_range */ gint tree_view_row_get_visibility(GtkTreeView *widget, GtkTreeIter *iter, gboolean fully_visible) { @@ -410,47 +393,6 @@ return ret; } -#else -/* an implementation that uses gtk_tree_view_get_visible_rect, it seems to be more error prone than the variant above */ - -gint tree_view_row_get_visibility(GtkTreeView *widget, GtkTreeIter *iter, gboolean fully_visible) -{ - GtkTreeModel *store; - GtkTreePath *tpath; - gint cx, cy; - - GdkRectangle vrect; - GdkRectangle crect; - - if (!GTK_WIDGET_REALIZED(GTK_WIDGET(widget))) return -1; /* we will most probably scroll down, needed for tree_view_row_make_visible */ - - store = gtk_tree_view_get_model(widget); - tpath = gtk_tree_model_get_path(store, iter); - - gtk_tree_view_get_visible_rect(widget, &vrect); - gtk_tree_view_get_cell_area(widget, tpath, NULL, &crect); - gtk_tree_path_free(tpath); - - -#if GTK_CHECK_VERSION(2,12,0) - gtk_tree_view_convert_widget_to_tree_coords(widget, crect.x, crect.y, &cx, &cy); -#else - gtk_tree_view_widget_to_tree_coords(widget, crect.x, crect.y, &cx, &cy); -#endif - - if (fully_visible) - { - if (cy < vrect.y) return -1; - if (cy + crect.height > vrect.y + vrect.height) return 1; - return 0; - } - - if (cy + crect.height < vrect.y) return -1; - if (cy > vrect.y + vrect.height) return 1; - return 0; -} -#endif - gint tree_view_row_make_visible(GtkTreeView *widget, GtkTreeIter *iter, gboolean center) { GtkTreePath *tpath;
--- a/src/ui_utildlg.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/ui_utildlg.c Sun Aug 19 00:28:42 2012 +0200 @@ -62,11 +62,7 @@ { GenericDialog *gd = data; -#if GTK_CHECK_VERSION(2,20,0) if (event->keyval == GDK_KEY_Return && gtk_widget_has_focus(widget) -#else - if (event->keyval == GDK_KEY_Return && GTK_WIDGET_HAS_FOCUS(widget) -#endif && gd->default_cb) { gboolean auto_close; @@ -238,11 +234,7 @@ GtkWidget *top; top = gtk_widget_get_toplevel(parent); -#if GTK_CHECK_VERSION(2,20,0) if (GTK_IS_WINDOW(top) && gtk_widget_is_toplevel(top)) window = GTK_WINDOW(top); -#else - if (GTK_IS_WINDOW(top) && GTK_WIDGET_TOPLEVEL(top)) window = GTK_WINDOW(top); -#endif } if (window) gtk_window_set_transient_for(GTK_WINDOW(gd->dialog), window);
--- a/src/utilops.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/utilops.c Sun Aug 19 00:28:42 2012 +0200 @@ -1849,7 +1849,7 @@ if (fd && fd->modified_xmp) { - keys = hash_table_get_keys(fd->modified_xmp); + keys = g_hash_table_get_keys(fd->modified_xmp); } g_assert(keys);
--- a/src/view_dir_list.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/view_dir_list.c Sun Aug 19 00:28:42 2012 +0200 @@ -96,11 +96,7 @@ { GtkTreeIter iter; -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_get_realized(vd->view) && vd_find_row(vd, fd, &iter)) -#else - if (GTK_WIDGET_REALIZED(vd->view) && vd_find_row(vd, fd, &iter)) -#endif { GtkTreeModel *store; GtkTreePath *tpath; @@ -111,11 +107,7 @@ gtk_tree_view_set_cursor(GTK_TREE_VIEW(vd->view), tpath, NULL, FALSE); gtk_tree_path_free(tpath); -#if GTK_CHECK_VERSION(2,20,0) if (!gtk_widget_has_focus(vd->view)) gtk_widget_grab_focus(vd->view); -#else - if (!GTK_WIDGET_HAS_FOCUS(vd->view)) gtk_widget_grab_focus(vd->view); -#endif } } @@ -339,11 +331,7 @@ return ret; } -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_get_realized(vd->view)) -#else - if (GTK_WIDGET_REALIZED(vd->view)) -#endif { gtk_tree_view_scroll_to_point(GTK_TREE_VIEW(vd->view), 0, 0); }
--- a/src/view_file.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/view_file.c Sun Aug 19 00:28:42 2012 +0200 @@ -878,11 +878,7 @@ { FileData *fd = NULL; -#if GTK_CHECK_VERSION(2,20,0) if (!gtk_widget_get_realized(vf->listview)) -#else - if (!GTK_WIDGET_REALIZED(vf->listview)) -#endif { vf_thumb_status(vf, 0.0, NULL); return FALSE;
--- a/src/view_file_icon.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/view_file_icon.c Sun Aug 19 00:28:42 2012 +0200 @@ -433,11 +433,7 @@ gdk_window_get_pointer(NULL, &x, &y, NULL); -#if GTK_CHECK_VERSION(2,20,0) if (!gtk_widget_get_realized(VFICON(vf)->tip_window)) gtk_widget_realize(VFICON(vf)->tip_window); -#else - if (!GTK_WIDGET_REALIZED(VFICON(vf)->tip_window)) gtk_widget_realize(VFICON(vf)->tip_window); -#endif gtk_window_move(GTK_WINDOW(VFICON(vf)->tip_window), x + 16, y + 16); gtk_widget_show(VFICON(vf)->tip_window); } @@ -457,11 +453,7 @@ window = gtk_widget_get_toplevel(vf->listview); -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_get_sensitive(window) && -#else - if (GTK_WIDGET_SENSITIVE(window) && -#endif gtk_window_has_toplevel_focus(GTK_WINDOW(window))) { tip_show(vf); @@ -1446,11 +1438,7 @@ switch (bevent->button) { case MOUSE_BUTTON_LEFT: -#if GTK_CHECK_VERSION(2,20,0) if (!gtk_widget_has_focus(vf->listview)) -#else - if (!GTK_WIDGET_HAS_FOCUS(vf->listview)) -#endif { gtk_widget_grab_focus(vf->listview); } @@ -1613,11 +1601,7 @@ store = gtk_tree_view_get_model(GTK_TREE_VIEW(vf->listview)); -#if GTK_CHECK_VERSION(2,20,0) if (keep_position && gtk_widget_get_realized(vf->listview) && -#else - if (keep_position && GTK_WIDGET_REALIZED(vf->listview) && -#endif gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(vf->listview), 0, 0, &tpath, NULL, NULL, NULL)) { GtkTreeIter iter; @@ -1650,11 +1634,7 @@ gtk_tree_view_column_set_visible(column, (i < VFICON(vf)->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); @@ -1668,11 +1648,7 @@ NULL); } } -#if GTK_CHECK_VERSION(2,20,0) if (gtk_widget_get_realized(vf->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(vf->listview)); -#else - if (GTK_WIDGET_REALIZED(vf->listview)) gtk_tree_view_columns_autosize(GTK_TREE_VIEW(vf->listview)); -#endif } r = -1;
--- a/src/view_file_list.c Sat Aug 18 23:02:36 2012 +0200 +++ b/src/view_file_list.c Sun Aug 19 00:28:42 2012 +0200 @@ -1694,11 +1694,7 @@ gtk_tree_view_column_set_fixed_width(column, 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);