aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog5
-rw-r--r--composer/e-msg-composer-hdrs.c23
-rw-r--r--composer/e-msg-composer.c1
3 files changed, 17 insertions, 12 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index e28212c231..a9f13303b8 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-12 Jeffrey Stedfast <fejj@ximian.com>
+
+ * e-msg-composer.c (menu_changed_charset_cb): Removed a warning
+ that I don't need anymore. This code is working wonderfully ;-)
+
2001-07-10 Kjartan Maraas <kmaraas@gnome.org>
* e-msg-composer.c: Fix typo. s/sesiion/session/
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index 9180cfd216..b21f7ca323 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -635,39 +635,40 @@ set_recipients (CamelMimeMessage *msg, GtkWidget *entry_widget, const gchar *typ
EDestination **destv;
CamelInternetAddress *addr;
char *string = NULL, *dest_str = NULL;
- gint i=0;
+ int i;
bonobo_widget_get_property (BONOBO_WIDGET (entry_widget), "text", &string, NULL);
destv = e_destination_importv (string);
-
+
g_message ("importv: [%s]", string);
if (destv) {
-
dest_str = e_destination_get_address_textv (destv);
g_message ("destination is: %s", dest_str);
-
+
+ /* dest_str has been utf8 encoded 2x by this point...not good */
+
if (dest_str && *dest_str) {
addr = camel_internet_address_new ();
camel_address_unformat (CAMEL_ADDRESS (addr), dest_str);
-
+
/* TODO: In here, we could cross-reference the names with an alias book
or address book, it should be sufficient for unformat to do the parsing too */
-
+
camel_mime_message_set_recipients (msg, type, addr);
-
+
camel_object_unref (CAMEL_OBJECT (addr));
-
+
g_free (dest_str);
}
-
- for (i=0; destv[i]; ++i) {
+
+ for (i = 0; destv[i]; i++) {
e_destination_touch (destv[i]);
gtk_object_unref (GTK_OBJECT (destv[i]));
}
g_free (destv);
}
-
+
g_free (string);
}
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 15cbbe5988..767e166144 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1655,7 +1655,6 @@ menu_changed_charset_cb (BonoboUIComponent *component,
/* Charset menu names are "Charset-%s" where %s is the charset name */
g_free (E_MSG_COMPOSER (user_data)->charset);
E_MSG_COMPOSER (user_data)->charset = g_strdup (path + strlen ("Charset-"));
- g_warning ("Set charset to %s", E_MSG_COMPOSER (user_data)->charset);
}
}