Add compatibility for GTK 2.18

With 2.18 some functions are deprecated. With geeqie that are two at the
moment.
- gtk_tree_view_column_get_cell_renderers - which can be replaced by
  gtk_cell_layout_get_cells
- gdk_event_get_graphics_expose - I just commented it as there seems to
  be no replacement in GTK 2.18

diff --git a/src/collect-table.c b/src/collect-table.c
index 00a34f1..61ae086 100644 (file)
--- a/src/collect-table.c
+++ b/src/collect-table.c
@@ -1701,7 +1701,11 @@ 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);
 

diff --git a/src/dupe.c b/src/dupe.c
index b491fb5..78f67f9 100644 (file)
--- a/src/dupe.c
+++ b/src/dupe.c
@@ -2769,7 +2769,11 @@ static void dupe_listview_set_height(GtkWidget *listview, gboolean thumb)
 
        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);

diff --git a/src/pixbuf-renderer.c b/src/pixbuf-renderer.c
index 9dc6085..55de84f 100644 (file)
--- a/src/pixbuf-renderer.c
+++ b/src/pixbuf-renderer.c
@@ -3682,6 +3682,7 @@ void pixbuf_renderer_scroll(PixbufRenderer *pr, gint x, gint y)
                        }
 
                /* 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(box->window)) != NULL)
                        {
                        pixbuf_renderer_paint(pr, &event->expose.area);
@@ -3693,6 +3694,7 @@ void pixbuf_renderer_scroll(PixbufRenderer *pr, gint x, gint y)
                                }
                        gdk_event_free(event);
                        }
+#endif
                }
 }
 

diff --git a/src/search.c b/src/search.c
index bd9e8f4..451e091 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -824,7 +824,11 @@ 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);

diff --git a/src/ui_tree_edit.c b/src/ui_tree_edit.c
index dec5acb..d04a5e9 100644 (file)
--- a/src/ui_tree_edit.c
+++ b/src/ui_tree_edit.c
@@ -189,7 +189,11 @@ gboolean tree_edit_by_path(GtkTreeView *tree, GtkTreePath *tpath, gint column, c
        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)
                {
@@ -289,7 +293,11 @@ gboolean tree_view_get_cell_origin(GtkTreeView *widget, GtkTreePath *tpath, gint
                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)
                        {

diff --git a/src/view_file_icon.c b/src/view_file_icon.c
index 00a83ad..c036746 100644 (file)
--- a/src/view_file_icon.c
+++ b/src/view_file_icon.c
@@ -1636,7 +1636,11 @@ static void vficon_populate(ViewFile *vf, gboolean resize, gboolean keep_positio
                        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);
 

diff --git a/src/view_file_list.c b/src/view_file_list.c
index 2f4c40d..45dd999 100644 (file)
--- a/src/view_file_list.c
+++ b/src/view_file_list.c
@@ -1701,7 +1701,11 @@ static void vflist_listview_set_columns(GtkWidget *listview, gboolean thumb, gbo
 
        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);