aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/e-msg-composer-hdrs.c14
-rw-r--r--composer/e-msg-composer.c3
3 files changed, 13 insertions, 10 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index a3bf167ed8..9d404d1dd5 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-12 Jeffrey Stedfast <fejj@helixcode.com>
+
+ * e-msg-composer-hdrs.c (set_entry): Don't convert the utf-8
+ string to a gtkstring because the widget expects to get a utf-8
+ string.
+
2000-12-12 Dan Winship <danw@helixcode.com>
* Makefile.am (EXTRA_DIST): Add $(IDLS). (From campd.)
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index 0ab2b76829..647ba2b3f1 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -492,20 +492,16 @@ set_entry (BonoboWidget *bonobo_widget,
{
GString *string;
const GList *p;
- char *s;
-
- string = g_string_new (NULL);
+
+ string = g_string_new ("");
for (p = list; p != NULL; p = p->next) {
if (string->str[0] != '\0')
g_string_append (string, ", ");
g_string_append (string, p->data);
}
-
- /* FIXME: This is just a temporary workaround, the widget should grok it */
- s = e_utf8_to_gtk_string((GtkWidget *)bonobo_widget, string->str);
- bonobo_widget_set_property (BONOBO_WIDGET (bonobo_widget), "text", s, NULL);
-
- g_free(s);
+
+ bonobo_widget_set_property (BONOBO_WIDGET (bonobo_widget), "text", string->str, NULL);
+
g_string_free (string, TRUE);
}
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 908d59e352..8143bee24e 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -217,6 +217,7 @@ add_inlined_image (gpointer key, gpointer value, gpointer data)
id = g_strconcat ("<", cid, ">", NULL);
camel_mime_part_set_content_id (part, id);
g_free (id);
+ /* FIXME: should this use g_basename (file_name)? */
camel_mime_part_set_filename (part, strchr (file_name, '/') ? strrchr (file_name, '/') + 1 : file_name);
camel_mime_part_set_encoding (part, CAMEL_MIME_PART_ENCODING_BASE64);
@@ -1339,7 +1340,7 @@ e_msg_composer_construct (EMsgComposer *composer)
DEFAULT_WIDTH, DEFAULT_HEIGHT);
bonobo_window_construct (BONOBO_WINDOW (composer), "e-msg-composer",
- _("Compose a message"));
+ _("Compose a message"));
/* DND support */
gtk_drag_dest_set (GTK_WIDGET (composer), GTK_DEST_DEFAULT_ALL,