Revision: 1867
http://geeqie.svn.sourceforge.net/geeqie/?rev=1867&view=rev
Author: mow
Date: 2009-10-13 21:49:21 +0000 (Tue, 13 Oct 2009)
Log Message:
-----------
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
Modified Paths:
--------------
trunk/src/collect-table.c
trunk/src/dupe.c
trunk/src/pixbuf-renderer.c
trunk/src/search.c
trunk/src/ui_tree_edit.c
trunk/src/view_file_icon.c
trunk/src/view_file_list.c
Modified: trunk/src/collect-table.c
===================================================================
--- trunk/src/collect-table.c 2009-10-10 15:01:41 UTC (rev 1866)
+++ trunk/src/collect-table.c 2009-10-13 21:49:21 UTC (rev 1867)
@@ -1701,7 +1701,11 @@
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);
Modified: trunk/src/dupe.c
===================================================================
--- trunk/src/dupe.c 2009-10-10 15:01:41 UTC (rev 1866)
+++ trunk/src/dupe.c 2009-10-13 21:49:21 UTC (rev 1867)
@@ -2769,7 +2769,11 @@
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);
Modified: trunk/src/pixbuf-renderer.c
===================================================================
--- trunk/src/pixbuf-renderer.c 2009-10-10 15:01:41 UTC (rev 1866)
+++ trunk/src/pixbuf-renderer.c 2009-10-13 21:49:21 UTC (rev 1867)
@@ -3682,6 +3682,7 @@
}
/* 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 @@
}
gdk_event_free(event);
}
+#endif
}
}
Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c 2009-10-10 15:01:41 UTC (rev 1866)
+++ trunk/src/search.c 2009-10-13 21:49:21 UTC (rev 1867)
@@ -824,7 +824,11 @@
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);
Modified: trunk/src/ui_tree_edit.c
===================================================================
--- trunk/src/ui_tree_edit.c 2009-10-10 15:01:41 UTC (rev 1866)
+++ trunk/src/ui_tree_edit.c 2009-10-13 21:49:21 UTC (rev 1867)
@@ -189,7 +189,11 @@
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 @@
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)
{
Modified: trunk/src/view_file_icon.c
===================================================================
--- trunk/src/view_file_icon.c 2009-10-10 15:01:41 UTC (rev 1866)
+++ trunk/src/view_file_icon.c 2009-10-13 21:49:21 UTC (rev 1867)
@@ -1636,7 +1636,11 @@
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);
Modified: trunk/src/view_file_list.c
===================================================================
--- trunk/src/view_file_list.c 2009-10-10 15:01:41 UTC (rev 1866)
+++ trunk/src/view_file_list.c 2009-10-13 21:49:21 UTC (rev 1867)
@@ -1701,7 +1701,11 @@
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);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
