2011-12-28 [colin] 3.8.0cvs5

	* src/mimeview.c
		Fix GTK+2.16 build (w32)

diff --git a/ChangeLog b/ChangeLog
index 52ac091..6607850 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-28 [colin]     3.8.0cvs5
+
+       * src/mimeview.c
+               Fix GTK+2.16 build (w32)
+
 2011-12-18 [mir]       3.8.0cvs4
 
        * src/ldapctrl.c

diff --git a/PATCHSETS b/PATCHSETS
index 13bba97..a8e78de 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4321,3 +4321,4 @@
 ( cvs diff -u -r 1.150.2.119 -r 1.150.2.120 src/procmsg.c;  cvs diff -u -r 1.25.2.72 -r 1.25.2.73 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.42 -r 1.18.2.43 src/stock_pixmap.h;  cvs diff -u -r 1.395.2.441 -r 1.395.2.442 src/summaryview.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/gtk/icon_legend.c;  diff -u /dev/null src/pixmaps/replied_and_forwarded.xpm;  ) > 3.8.0cvs2.patchset
 ( cvs diff -u -r 1.155.2.97 -r 1.155.2.98 src/Makefile.am;  ) > 3.8.0cvs3.patchset
 ( cvs diff -u -r 1.2.2.23 -r 1.2.2.24 src/ldapctrl.c;  ) > 3.8.0cvs4.patchset
+( cvs diff -u -r 1.83.2.184 -r 1.83.2.185 src/mimeview.c;  ) > 3.8.0cvs5.patchset

diff --git a/configure.ac b/configure.ac
index d06015a..76bac11 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=4
+EXTRA_VERSION=5
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/mimeview.c b/src/mimeview.c
index ec4fbad..1c7e9ae 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -307,7 +307,9 @@ MimeView *mimeview_create(MainWindow *mainwin)
        column = gtk_tree_view_get_column(GTK_TREE_VIEW(ctree), cols-1);
                                                           
        renderer = gtk_cell_renderer_text_new();
+#if(GTK_CHECK_VERSION(2,18,0))
        gtk_cell_renderer_set_alignment(renderer, 1, 0.5);
+#end
        cols = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(ctree),
                                        -1, titles[COL_SIZE], renderer,
                                        "text", COL_SIZE, NULL);