aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-format.c
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/em-format.c
parent43eb05b879d31ed75b41ca69b4e62f800cb5237c (diff)
downloadgsoc2013-evolution-6205217822761f5e424a9207b261786f9cb8772d.tar.gz
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/em-format.c')
-rw-r--r--mail/em-format.c3
1 files changed, 2 insertions, 1 deletions
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) {