aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/e-msg-composer.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 1834559fc4..548593186a 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-12 Parthasarathi Susarla <sparthasarathi@novell.com>
+
+ Fixes bug #177416 on bnc
+ * e-msg-composer.c: (attachment_guess_mime_type):
+ initialise type to "" and not NULL.
+
2006-05-26 Jeffrey Stedfast <fejj@novell.com>
* e-msg-composer.c (drop_action): If 'str' is empty, continue
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 512acab0dc..e3e90f2dbb 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2900,7 +2900,7 @@ attachment_guess_mime_type (const char *file_name)
{
GnomeVFSFileInfo *info;
GnomeVFSResult result;
- char *type = NULL;
+ char *type = "";
info = gnome_vfs_file_info_new ();
result = gnome_vfs_get_file_info (file_name, info,