2008-09-09 [colin] 3.5.0cvs95

	* src/gtk/gtkcmclist.h
		Fix build on GTK+ 2.14

diff --git a/ChangeLog b/ChangeLog
index 4231c8bb70f3f2447330b9ce1dabbc52daa7b3f1..a25baf38204672bcd8c76e257028295285c78ef1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-09 [colin]     3.5.0cvs95
+
+       * src/gtk/gtkcmclist.h
+               Fix build on GTK+ 2.14
+
 2008-09-08 [colin]     3.5.0cvs94
 
        * src/noticeview.c

diff --git a/PATCHSETS b/PATCHSETS
index 08fba510f0b33573910b0fec933c709f46387b02..7ded79ae951ce95411767b1a2043e9c7d942e0db 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3506,3 +3506,4 @@
 ( cvs diff -u -r 1.96.2.204 -r 1.96.2.205 src/textview.c;  ) > 3.5.0cvs92.patchset
 ( cvs diff -u -r 1.9.2.24 -r 1.9.2.25 src/addressadd.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/addressbook_foldersel.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/gtkcmclist.h;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/gtkcmctree.h;  cvs diff -u -r 1.1.4.49 -r 1.1.4.50 src/gtk/gtksctree.c;  cvs diff -u -r 1.12.2.46 -r 1.12.2.47 src/gtk/prefswindow.c;  cvs diff -u -r 1.7.2.12 -r 1.7.2.13 src/gtk/prefswindow.h;  ) > 3.5.0cvs93.patchset
 ( cvs diff -u -r 1.5.2.19 -r 1.5.2.20 src/noticeview.c;  cvs diff -u -r 1.3.8.9 -r 1.3.8.10 src/noticeview.h;  ) > 3.5.0cvs94.patchset
+( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/gtkcmclist.h;  ) > 3.5.0cvs95.patchset

diff --git a/configure.ac b/configure.ac
index 7dfdb2354b996e52a882e4f6576aa669db40cccd..63a7fd10ede5240f5b5b985e1b5f1265f21147ed 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=94
+EXTRA_VERSION=95
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkcmclist.h b/src/gtk/gtkcmclist.h
index b8db6187e1d2b95ec67ea3e8d566c2881478fa3f..8cdf4fab0226f1f4a40aeb7041ac3f07d4ffa082 100644 (file)
--- a/src/gtk/gtkcmclist.h
+++ b/src/gtk/gtkcmclist.h
@@ -29,13 +29,7 @@
 #define __GTK_CMCLIST_H__
 
 #include <gdk/gdk.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkenums.h>
+#include <gtk/gtk.h>
 
 
 G_BEGIN_DECLS