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
This commit is contained in:
Tristan Chabredier 2005-10-26 22:24:12 +00:00
parent 7410bcb50d
commit bd1036d1de
7 changed files with 15 additions and 6 deletions

View file

@ -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

View file

@ -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

View file

@ -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=

View file

@ -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) {

View file

@ -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);
}

View file

@ -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");

View file

@ -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);
}