Mercurial > pidgin
changeset 4815:3efe860c40c7
[gaim-migrate @ 5139]
non-utf8 messages that come from the prpls for status messages and tooltips
will no longer wreak havoc. yay.
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Tue, 18 Mar 2003 01:46:06 +0000 |
| parents | 043f7c059034 |
| children | 94e75b03c598 |
| files | src/buddy.c |
| diffstat | 1 files changed, 16 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buddy.c Tue Mar 18 00:27:56 2003 +0000 +++ b/src/buddy.c Tue Mar 18 01:46:06 2003 +0000 @@ -578,7 +578,15 @@ char *warning = NULL, *idletime = NULL; if (prpl->tooltip_text) { + const char *end; statustext = prpl->tooltip_text(b); + + if(statustext && !g_utf8_validate(statustext, -1, &end)) { + char *new = g_strndup(statustext, + g_utf8_pointer_to_offset(statustext, end)); + g_free(statustext); + statustext = new; + } } if (b->idle) { @@ -820,6 +828,14 @@ if (prpl->status_text) { char *tmp = prpl->status_text(b); + const char *end; + + if(tmp && !g_utf8_validate(tmp, -1, &end)) { + char *new = g_strndup(tmp, + g_utf8_pointer_to_offset(tmp, end)); + g_free(tmp); + tmp = new; + } if(tmp) { g_strdelimit(tmp, "\n", ' '); @@ -942,7 +958,6 @@ sw = gtk_scrolled_window_new(NULL,NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_widget_set_size_request(sw, 200, 200); gtkblist->treemodel = gtk_tree_store_new(BLIST_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_POINTER);