aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-09-19 00:04:25 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-09-19 00:04:25 +0800
commit6205217822761f5e424a9207b261786f9cb8772d (patch)
treeae267376887a3ba3ac6a45b19f023ebd3ea3fd7a /mail
parent43eb05b879d31ed75b41ca69b4e62f800cb5237c (diff)
downloadgsoc2013-evolution-6205217822761f5e424a9207b261786f9cb8772d.tar
gsoc2013-evolution-6205217822761f5e424a9207b261786f9cb8772d.tar.gz
gsoc2013-evolution-6205217822761f5e424a9207b261786f9cb8772d.tar.bz2
gsoc2013-evolution-6205217822761f5e424a9207b261786f9cb8772d.tar.lz
gsoc2013-evolution-6205217822761f5e424a9207b261786f9cb8772d.tar.xz
gsoc2013-evolution-6205217822761f5e424a9207b261786f9cb8772d.tar.zst
gsoc2013-evolution-6205217822761f5e424a9207b261786f9cb8772d.zip
Initialise charset to NULL or it may be used uninitialised. Also include
2003-09-18 Jeffrey Stedfast <fejj@ximian.com> * em-format.c (em_format_format_text): Initialise charset to NULL or it may be used uninitialised. Also include gnome-vfs-mime-handlers.h for gnome_vfs_mime_type_get_description(). * Makefile.am: Added $(MARSHALL_GENERATED) to $(BUILT_SOURCES) so that em-marshal.[c,h] were autogenerated. svn path=/trunk/; revision=22609
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog26
-rw-r--r--mail/Makefile.am3
-rw-r--r--mail/em-format.c3
3 files changed, 21 insertions, 11 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ff1d644a98..34b4f5f3c6 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,14 +1,22 @@
+2003-09-18 Jeffrey Stedfast <fejj@ximian.com>
+
+ * em-format.c (em_format_format_text): Initialise charset to NULL
+ or it may be used uninitialised. Also include
+ gnome-vfs-mime-handlers.h for gnome_vfs_mime_type_get_description().
+
+ * Makefile.am: Added $(MARSHALL_GENERATED) to $(BUILT_SOURCES) so
+ that em-marshal.[c,h] were autogenerated.
+
2003-09-17 Not Zed <NotZed@Ximian.com>
- * folder-browser.c, folder-browser.h, folder-browser-ui.c
- folder-browser-ui.h, mail-callbacks.c, mail-callbacks.h
- mail-display.c, mail-display.h, mail-display-stream.c
- mail-display-stream.h, mail-format.c, mail-format.h
- mail-identify.c, mail-search.c, mail-search.h
- message-browser.c, message-browser.h, subscribe-dialog.c
- subscribe-dialog.h, mail-font-prefs.c, mail-font-prefs.h: cvs
- removed.
-
+ * folder-browser.c, folder-browser.h, folder-browser-ui.c
+ folder-browser-ui.h, mail-callbacks.c, mail-callbacks.h
+ mail-display.c, mail-display.h, mail-display-stream.c
+ mail-display-stream.h, mail-format.c, mail-format.h
+ mail-identify.c, mail-search.c, mail-search.h message-browser.c,
+ message-browser.h, subscribe-dialog.c subscribe-dialog.h,
+ mail-font-prefs.c, mail-font-prefs.h: cvs removed.
+
* Makefile.am: Removed mail-font-prefs.[ch], hasn't been built for
ages.
diff --git a/mail/Makefile.am b/mail/Makefile.am
index d7d2d347cc..0ff3ce6e98 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -208,6 +208,7 @@ $(EVOLUTION_MAIL_CORBA_GENERATED_C): $(EVOLUTION_MAIL_CORBA_GENERATED_H)
EXTRA_DIST = \
ChangeLog.pre-1-4 \
+ em-marshal.list \
Mailer.idl \
$(SPELL_IDL) \
$(glade_DATA) \
@@ -237,5 +238,5 @@ install-data-local:
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
-BUILT_SOURCES = $(EVOLUTION_MAIL_CORBA_GENERATED) $(IDL_GENERATED) $(server_DATA)
+BUILT_SOURCES = $(EVOLUTION_MAIL_CORBA_GENERATED) $(IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA)
CLEANFILES = $(BUILT_SOURCES)
diff --git a/mail/em-format.c b/mail/em-format.c
index d239266806..1c53377829 100644
--- a/mail/em-format.c
+++ b/mail/em-format.c
@@ -31,6 +31,7 @@
#include <libgnomevfs/gnome-vfs-mime.h>
#include <libgnomevfs/gnome-vfs-mime-utils.h>
+#include <libgnomevfs/gnome-vfs-mime-handlers.h>
#include <gconf/gconf-client.h>
@@ -796,7 +797,7 @@ em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *dw)
{
CamelStreamFilter *filter_stream;
CamelMimeFilterCharset *filter;
- const char *charset;
+ const char *charset = NULL;
char *fallback_charset = NULL;
if (emf->charset) {