talons

commit 7dd5185b4657a8d1419c632f394575650d8b081e
parent aa776f0a6ea73cc8199350b04cc619dca69fd1e0
Author: Colin Leroy <colin@colino.net>
Date:   Sun, 16 Mar 2008 16:23:43 +0000

2008-03-16 [colin]	3.3.1cvs29

	* src/summaryview.c
		Fix build on GTK < 2.12

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/summaryview.c
 | 
7
+++++--

4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-16 [colin]	3.3.1cvs29
+
+	* src/summaryview.c
+		Fix build on GTK < 2.12
+
 2008-03-16 [colin]	3.3.1cvs28
 
 	* src/mainwindow.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3263,3 +3263,4 @@
 ( cvs diff -u -r 1.395.2.361 -r 1.395.2.362 src/summaryview.c;  cvs diff -u -r 1.1.4.42 -r 1.1.4.43 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/gtk/gtksctree.h;  ) > 3.3.1cvs26.patchset
 ( cvs diff -u -r 1.1.2.16 -r 1.1.2.17 manual/faq.xml;  ) > 3.3.1cvs27.patchset
 ( cvs diff -u -r 1.274.2.237 -r 1.274.2.238 src/mainwindow.c;  ) > 3.3.1cvs28.patchset
+( cvs diff -u -r 1.395.2.362 -r 1.395.2.363 src/summaryview.c;  ) > 3.3.1cvs29.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=28
+EXTRA_VERSION=29
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -3125,10 +3125,13 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
 	gchar *from_text = NULL, *to_text = NULL, *tags_text = NULL;
 	gboolean should_swap = FALSE;
 	gboolean vert = (prefs_common.layout_mode == VERTICAL_LAYOUT);
-	static gchar *color_dim_rgb = NULL;
+#if GTK_CHECK_VERSION(2,12,0)
+	static const gchar *color_dim_rgb = NULL;
 	if (!color_dim_rgb)
 		color_dim_rgb = gdk_color_to_string(&summaryview->color_dim);
-
+#else
+	static const gchar *color_dim_rgb = "#888888";
+#endif
 	text[col_pos[S_COL_FROM]]   = "";
 	text[col_pos[S_COL_TO]]     = "";
 	text[col_pos[S_COL_SUBJECT]]= "";