2008-06-28 [colin] 3.5.0cvs1

	* src/foldersel.c
		Fix compilation with older GTKs

diff --git a/ChangeLog b/ChangeLog
index a2c48f090c2bf01f0aa8c647edddf8b3f44f0c41..2463b5f267c31abbd1e49a33b72ac06eb9f23c82 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-28 [colin]     3.5.0cvs1
+
+       * src/foldersel.c
+               Fix compilation with older GTKs
+
 2008-06-27 [paul]      3.5.0
 
        * NEWS

diff --git a/PATCHSETS b/PATCHSETS
index 2f3972c6ecac97d6ae4960d027f962a105290df3..1943201b10c35c619eaea905e6c0df93587f7a44 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3412,3 +3412,4 @@
 ( cvs diff -u -r 1.58.2.39 -r 1.58.2.40 po/de.po;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 po/fi.po;  cvs diff -u -r 1.50.2.31 -r 1.50.2.32 po/pt_BR.po;  ) > 3.4.0cvs114.patchset
 ( cvs diff -u -r 1.654.2.3471 -r 1.654.2.3472 configure.ac;  cvs diff -u -r 1.1.2.47 -r 1.1.2.48 src/gtk/authors.h;  ) > 3.4.0cvs115.patchset
 ( cvs diff -u -r 1.1.2.48 -r 1.1.2.49 src/gtk/authors.h;  ) > 3.4.0cvs116.patchset
+( cvs diff -u -r 1.26.2.36 -r 1.26.2.37 src/foldersel.c;  ) > 3.5.0cvs1.patchset

diff --git a/configure.ac b/configure.ac
index 1150cdf7cf12beed4ff516a4b59df604a855daa0..a4ef3f069f2e862906659c27b5e94c2d450f093f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=0
+EXTRA_VERSION=1
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/foldersel.c b/src/foldersel.c
index bc24af354e1da64df6b79209901228b69f66e241..e3edc43d0126af5613445cc15784a359014dc192 100644 (file)
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -269,8 +269,10 @@ static void foldersel_create(void)
        gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE);
        gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview),
                                     prefs_common.use_stripes_everywhere);
+#if GTK_CHECK_VERSION(2,10,0)
        gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(treeview),
                                                        prefs_common.enable_dotted_lines);
+#endif
        gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview),
                                        FOLDERSEL_FOLDERNAME);