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

If the subject or body components of the mailto url are not in UTF-8,

Browse Source 
2003-01-27  Jeffrey Stedfast  <fejj@ximian.com>

	* e-msg-composer.c (e_msg_composer_new_from_url): If the subject
	or body components of the mailto url are not in UTF-8, convert
	them to UTF-8.

svn path=/trunk/; revision=19662
This commit is contained in:
Jeffrey Stedfast
2003-01-28 04:04:51 +00:00
committed by Jeffrey Stedfast
parent a81077272f
commit 8644df4c44
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
composer/ChangeLog
View File

@ -1,5 +1,9 @@
2003-01-27 Jeffrey Stedfast <fejj@ximian.com>
* e-msg-composer.c (e_msg_composer_new_from_url): If the subject
or body components of the mailto url are not in UTF-8, convert
them to UTF-8.
* e-msg-composer-attachment.c (update_mime_type): Fixed a #warning
by converting the filename into a uri before passing it into
gnome_vfs_get_mime_type() since that function really needs a uri.

25
composer/e-msg-composer.c
View File

@ -3658,6 +3658,7 @@ e_msg_composer_new_from_url (const char *url_in)
EDestination **tov, **ccv, **bccv;
char *subject = NULL, *body = NULL;
const char *p, *header;
size_t nread, nwritten;
char *content;
int len, clen;
@ -3704,10 +3705,30 @@ e_msg_composer_new_from_url (const char *url_in)
bcc = add_recipients (bcc, content, FALSE);
} else if (!strncasecmp (header, "subject", len)) {
g_free (subject);
subject = g_strdup (content);
if (g_utf8_validate (content, -1, NULL)) {
subject = content;
content = NULL;
} else {
subject = g_locale_to_utf8 (content, clen, &nread,
&nwritten, NULL);
if (subject) {
subject = g_realloc (subject, nwritten + 1);
subject[nwritten] = '\0';
}
}
} else if (!strncasecmp (header, "body", len)) {
g_free (body);
body = g_strdup (content);
if (g_utf8_validate (content, -1, NULL)) {
body = content;
content = NULL;
} else {
body = g_locale_to_utf8 (content, clen, &nread,
&nwritten, NULL);
if (body) {
body = g_realloc (body, nwritten + 1);
body[nwritten] = '\0';
}
}
} else if (!strncasecmp (header, "attach", len)) {
e_msg_composer_attachment_bar_attach (E_MSG_COMPOSER_ATTACHMENT_BAR (composer->attachment_bar), content);
} else {