diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 4fe64ada1..51486897c 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,11 @@
+2005-10-26 [wwp]	1.9.15cvs114
+
+	* src/procmime.c
+	* src/gtk/gtksctree.c
+	* src/plugins/spamassassin/libspamc.c
+	* src/plugins/spamassassin/spamassassin.c
+		fix some compilation warnings more
+
 2005-10-26 [mones]	1.9.15cvs113
 
 	* po/es.po
diff --git a/PATCHSETS b/PATCHSETS
index e28d238d4..a6480eab1 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -950,3 +950,4 @@
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gedit-print.c;  cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/imap_gtk.c;  cvs diff -u -r 1.18.2.13 -r 1.18.2.14 src/jpilot.c;  cvs diff -u -r 1.115.2.62 -r 1.115.2.63 src/main.c;  cvs diff -u -r 1.274.2.76 -r 1.274.2.77 src/mainwindow.c;  cvs diff -u -r 1.2.2.11 -r 1.2.2.12 src/news_gtk.c;  ) > 1.9.15cvs111.patchset
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_message.c;  ) > 1.9.15cvs112.patchset
 ( cvs diff -u -r 1.60.2.17 -r 1.60.2.18 po/es.po;  ) > 1.9.15cvs113.patchset
+( cvs diff -u -r 1.49.2.65 -r 1.49.2.66 src/procmime.c;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/gtk/gtksctree.c;  cvs diff -u -r 1.4.2.5 -r 1.4.2.6 src/plugins/spamassassin/libspamc.c;  cvs diff -u -r 1.18.2.9 -r 1.18.2.10 src/plugins/spamassassin/spamassassin.c;  ) > 1.9.15cvs114.patchset
diff --git a/configure.ac b/configure.ac
index eb67cdbdf..4067d0041 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=113
+EXTRA_VERSION=114
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/gtksctree.c b/src/gtk/gtksctree.c
index 218a8c4a4..659198c55 100644
--- a/src/gtk/gtksctree.c
+++ b/src/gtk/gtksctree.c
@@ -1105,7 +1105,7 @@ GtkCTreeNode* gtk_sctree_insert_node        (GtkCTree *ctree,
                                              gboolean expanded)
 {
 	if (!emptyxpm) {
-		stock_pixmap_gdk(ctree, STOCK_PIXMAP_EMPTY,
+		stock_pixmap_gdk((GtkWidget*)ctree, STOCK_PIXMAP_EMPTY,
 			 &emptyxpm, &emptyxpmmask);
 	}
 	if (!pixmap_closed) {
@@ -1138,7 +1138,7 @@ void        gtk_sctree_set_node_info        (GtkCTree *ctree,
                                              gboolean expanded)
 {
 	if (!emptyxpm) {
-		stock_pixmap_gdk(ctree, STOCK_PIXMAP_EMPTY,
+		stock_pixmap_gdk((GtkWidget*)ctree, STOCK_PIXMAP_EMPTY,
 			 &emptyxpm, &emptyxpmmask);
 	}
 	if (!pixmap_closed) {
diff --git a/src/plugins/spamassassin/libspamc.c b/src/plugins/spamassassin/libspamc.c
index 46cf1d179..3d00c5d94 100644
--- a/src/plugins/spamassassin/libspamc.c
+++ b/src/plugins/spamassassin/libspamc.c
@@ -1091,7 +1091,7 @@ void message_cleanup(struct message *m)
 	free(m->out);
     if (m->raw != NULL && m->raw != m->out)
 	free(m->raw);
-    if (m->priv != NULL && m->priv != m->out && m->priv != m->raw)
+    if (m->priv != NULL && (char*)m->priv != m->out && (char*)m->priv != m->raw)
 	free(m->priv);
     _clear_message(m);
 }
diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index fdff08a74..007523ad8 100644
--- a/src/plugins/spamassassin/spamassassin.c
+++ b/src/plugins/spamassassin/spamassassin.c
@@ -296,7 +296,7 @@ gint plugin_init(gchar **error)
 		return -1;
 	}
 
-	username = g_get_user_name();
+	username = (gchar*)g_get_user_name();
 	if (username == NULL) {
 		hooks_unregister_hook(MAIL_FILTERING_HOOKLIST, hook_id);
 		*error = g_strdup("Failed to get username");
diff --git a/src/procmime.c b/src/procmime.c
index f281ebf12..7cbe75cd7 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -983,7 +983,7 @@ gchar *procmime_get_tmp_file_name(MimeInfo *mimeinfo)
 		if (*basetmp == '\0') 
 			basetmp = g_strdup("mimetmp");
 		base = conv_filename_from_utf8(basetmp);
-		g_free(basetmp);
+		g_free((gchar*)basetmp);
 		subst_for_shellsafe_filename(base);
 	}