From: Jose Dapena Paz <jdapena@igalia.com>
Date: Mon, 17 Mar 2008 10:37:20 +0000 (+0000)
Subject: * configure.ac:
X-Git-Tag: git_migration_finished~1550
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=7691e2bcadbe4e08be6afac44ed922681dbb6b6f

* configure.ac:
	* Add detection of new gtk method
	  gtk_tree_view_column_get_cell_data_hint.
* src/widgets/modest-header-view-render.c:
	* Added conditional build for cell data hint features.

pmo-trunk-r4319
---

diff --git a/configure.ac b/configure.ac
index 3c82a60..6083367 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,8 +80,10 @@ LIBS="$modest_save_libs"
 __COPY_LIBS="$LIBS"
 LIBS="$LIBS $MODEST_GSTUFF_LIBS"
 AC_CHECK_FUNCS(gtk_html_get_selection_area)
-LIBS="$__COPY_LIBS"
 AC_SUBST(HAVE_GTK_HTML_GET_SELECTION_AREA)
+AC_CHECK_FUNCS(gtk_tree_view_column_get_cell_data_hint)
+AC_SUBST(HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT)
+LIBS="$__COPY_LIBS"
 
 dnl dnl now, determine what to build
 dnl AC_MSG_NOTICE([Determining what platform to build])
diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c
index b2e64ff..1728532 100644
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -269,8 +269,10 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
 	time_t date;
 
 #ifdef MAEMO_CHANGES
+#ifdef HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT
 	GtkTreeCellDataHint hint;
 #endif
+#endif
 	
 	GtkCellRenderer *recipient_cell, *date_or_status_cell, *subject_cell,
 		*attach_cell, *priority_cell,
@@ -284,11 +286,13 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
 	g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
 
 #ifdef MAEMO_CHANGES
+#ifdef HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT
 	hint = gtk_tree_view_column_get_cell_data_hint (GTK_TREE_VIEW_COLUMN (column));
 
 	if (hint != GTK_TREE_CELL_DATA_HINT_ALL)
 		return;
 #endif
+#endif
 	
 	recipient_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "recpt-box-renderer"));
 	subject_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "subject-box-renderer"));