talons

commit d0bd9a0dfbc0ca4f734143c66d0ece19a0c58f24
parent 334ef1f0cb0559160564ef923e98d409d269cb15
Author: Colin Leroy <colin@colino.net>
Date:   Sun, 10 Aug 2008 18:41:41 +0000

2008-08-10 [colin]	3.5.0cvs56

	* src/gtk/gtksctree.c
		Fix build on GTK < 2.12

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/gtksctree.c
 | 
6
+++---

4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-10 [colin]	3.5.0cvs56
+
+	* src/gtk/gtksctree.c
+		Fix build on GTK < 2.12
+
 2008-08-09 [colin]	3.5.0cvs55
 
 	* src/mainwindow.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3467,3 +3467,4 @@
 ( cvs diff -u -r 1.60.2.53 -r 1.60.2.54 po/es.po;  cvs diff -u -r 1.382.2.464 -r 1.382.2.465 src/compose.c;  cvs diff -u -r 1.274.2.263 -r 1.274.2.264 src/mainwindow.c;  ) > 3.5.0cvs53.patchset
 ( cvs diff -u -r 1.382.2.465 -r 1.382.2.466 src/compose.c;  cvs diff -u -r 1.14.2.52 -r 1.14.2.53 src/editaddress.c;  cvs diff -u -r 1.207.2.205 -r 1.207.2.206 src/folderview.c;  cvs diff -u -r 1.274.2.264 -r 1.274.2.265 src/mainwindow.c;  cvs diff -u -r 1.3.12.31 -r 1.3.12.32 src/message_search.c;  cvs diff -u -r 1.83.2.141 -r 1.83.2.142 src/mimeview.c;  cvs diff -u -r 1.5.2.18 -r 1.5.2.19 src/noticeview.c;  cvs diff -u -r 1.105.2.141 -r 1.105.2.142 src/prefs_account.c;  cvs diff -u -r 1.204.2.175 -r 1.204.2.176 src/prefs_common.c;  cvs diff -u -r 1.16.2.32 -r 1.16.2.33 src/prefs_customheader.c;  cvs diff -u -r 1.3.2.20 -r 1.3.2.21 src/prefs_ext_prog.c;  cvs diff -u -r 1.1.4.55 -r 1.1.4.56 src/prefs_filtering_action.c;  cvs diff -u -r 1.10.2.37 -r 1.10.2.38 src/prefs_gtk.c;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/prefs_logging.c;  cvs diff -u -r 1.43.2.75 -r 1.43.2.76 src/prefs_matcher.c;  cvs diff -u -r 1.1.2.38 -r 1.1.2.39 src/prefs_msg_colors.c;  cvs diff -u -r 1.49.2.111 -r 1.49.2.112 src/procmime.c;  cvs diff -u -r 1.15.2.55 -r 1.15.2.56 src/summary_search.c;  cvs diff -u -r 1.395.2.380 -r 1.395.2.381 src/summaryview.c;  cvs diff -u -r 1.43.2.103 -r 1.43.2.104 src/toolbar.c;  cvs diff -u -r 1.1.4.12 -r 1.1.4.13 src/gtk/colorsel.c;  cvs diff -u -r 1.9.2.58 -r 1.9.2.59 src/gtk/gtkaspell.c;  cvs diff -u -r 1.5.2.80 -r 1.5.2.81 src/gtk/gtkutils.c;  cvs diff -u -r 1.4.2.44 -r 1.4.2.45 src/gtk/gtkutils.h;  cvs diff -u -r 1.2.2.30 -r 1.2.2.31 src/gtk/inputdialog.c;  cvs diff -u -r 1.5.2.52 -r 1.5.2.53 src/gtk/pluginwindow.c;  cvs diff -u -r 1.1.2.84 -r 1.1.2.85 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.5.2.23 -r 1.5.2.24 src/plugins/dillo_viewer/dillo_prefs.c;  cvs diff -u -r 1.23.2.49 -r 1.23.2.50 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 3.5.0cvs54.patchset
 ( cvs diff -u -r 1.274.2.265 -r 1.274.2.266 src/mainwindow.c;  ) > 3.5.0cvs55.patchset
+( cvs diff -u -r 1.1.4.47 -r 1.1.4.48 src/gtk/gtksctree.c;  ) > 3.5.0cvs56.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=55
+EXTRA_VERSION=56
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/gtksctree.c b/src/gtk/gtksctree.c
@@ -3262,9 +3262,9 @@ void gtk_sctree_set_column_tooltip	    (GtkSCTree		*sctree,
 {
 #if !(GTK_CHECK_VERSION(2,12,0))
 	GtkTooltips *tips;
-	if (!sctree->tips)
-		sctree->tips = gtk_tooltips_new();
-	tips = sctree->tips;
+	if (!sctree->tooltips)
+		sctree->tooltips = gtk_tooltips_new();
+	tips = sctree->tooltips;
 #endif
 
 	CLAWS_SET_TIP(GTK_CMCLIST(sctree)->column[column].button,