aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/e-msg-composer-hdrs.c1
-rw-r--r--composer/e-msg-composer.c5
3 files changed, 9 insertions, 3 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 2b64d185c1..27b66c5ac7 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-22 Parthasarathi Susarla <sparthasarathi@novell.com>
+
+ * e-msg-composer.c: (get_file_content):
+ use composer->priv->charset instead of p->charset. This fixes
+ a crash
+
2005-10-21 Vivek Jain <jvivek@novell.com>
Comitted NotZed's patch given on #314701
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index 6f187af83f..8a52188e9e 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -1663,3 +1663,4 @@ e_msg_composer_hdrs_get_from_omenu (EMsgComposerHdrs *hdrs)
return GTK_WIDGET (g_object_get_data ((GObject *) hdrs->priv->from.entry, "from_menu"));
}
+
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 4cc6b8ba4c..52ef59a2da 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -953,7 +953,6 @@ get_file_content (EMsgComposer *composer, const char *file_name, gboolean want_h
char *charset;
char *content;
int fd;
- EMsgComposerPrivate *p = composer->priv;
fd = open (file_name, O_RDONLY);
if (fd == -1) {
@@ -996,7 +995,7 @@ get_file_content (EMsgComposer *composer, const char *file_name, gboolean want_h
filtered_stream = camel_stream_filter_new_with_stream (stream);
camel_object_unref (stream);
- charset = composer && p->charset ? p->charset : NULL;
+ charset = composer && composer->priv->charset ? composer->priv->charset : NULL;
charset = charset ? g_strdup (charset) : composer_get_default_charset_setting ();
if ((charenc = (CamelMimeFilter *) camel_mime_filter_charset_new_convert (charset, "UTF-8"))) {
camel_stream_filter_add (filtered_stream, charenc);
@@ -2310,7 +2309,7 @@ setup_ui (EMsgComposer *composer)
bonobo_ui_component_add_listener (
p->uic, "FormatHtml",
menu_format_html_cb, composer);
-
+
/* View/From */
bonobo_ui_component_set_prop (
p->uic, "/commands/ViewFrom",