callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initialise charset to NULL or it may be used uninitialised. Also include

Browse Source 
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
This commit is contained in:
Jeffrey Stedfast
2003-09-18 16:04:25 +00:00
committed by Jeffrey Stedfast
parent 43eb05b879
commit 6205217822
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mail/ChangeLog
View File

@ -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> 2003-09-17 Not Zed <NotZed@Ximian.com>
* folder-browser.c, folder-browser.h, folder-browser-ui.c * folder-browser.c, folder-browser.h, folder-browser-ui.c
folder-browser-ui.h, mail-callbacks.c, mail-callbacks.h folder-browser-ui.h, mail-callbacks.c, mail-callbacks.h
mail-display.c, mail-display.h, mail-display-stream.c mail-display.c, mail-display.h, mail-display-stream.c
mail-display-stream.h, mail-format.c, mail-format.h mail-display-stream.h, mail-format.c, mail-format.h
mail-identify.c, mail-search.c, mail-search.h mail-identify.c, mail-search.c, mail-search.h message-browser.c,
message-browser.c, message-browser.h, subscribe-dialog.c message-browser.h, subscribe-dialog.c subscribe-dialog.h,
subscribe-dialog.h, mail-font-prefs.c, mail-font-prefs.h: cvs mail-font-prefs.c, mail-font-prefs.h: cvs removed.
removed.
* Makefile.am: Removed mail-font-prefs.[ch], hasn't been built for * Makefile.am: Removed mail-font-prefs.[ch], hasn't been built for
ages. ages.

3
mail/Makefile.am
View File

@ -208,6 +208,7 @@ $(EVOLUTION_MAIL_CORBA_GENERATED_C): $(EVOLUTION_MAIL_CORBA_GENERATED_H)
EXTRA_DIST = \ EXTRA_DIST = \
ChangeLog.pre-1-4 \ ChangeLog.pre-1-4 \
em-marshal.list \
Mailer.idl \ Mailer.idl \
$(SPELL_IDL) \ $(SPELL_IDL) \
$(glade_DATA) \ $(glade_DATA) \
@ -237,5 +238,5 @@ install-data-local:
dist-hook: dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES) 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) CLEANFILES = $(BUILT_SOURCES)

3
mail/em-format.c
View File

@ -31,6 +31,7 @@
#include <libgnomevfs/gnome-vfs-mime.h> #include <libgnomevfs/gnome-vfs-mime.h>
#include <libgnomevfs/gnome-vfs-mime-utils.h> #include <libgnomevfs/gnome-vfs-mime-utils.h>
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
#include <gconf/gconf-client.h> #include <gconf/gconf-client.h>
@ -796,7 +797,7 @@ em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *dw)
{ {
CamelStreamFilter *filter_stream; CamelStreamFilter *filter_stream;
CamelMimeFilterCharset *filter; CamelMimeFilterCharset *filter;
const char *charset; const char *charset = NULL;
char *fallback_charset = NULL; char *fallback_charset = NULL;
if (emf->charset) { if (emf->charset) {