Changeset b95d03b

Timestamp:

2015-03-25T18:50:07Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

3dcc878

Parents:

098a75b

git-author:

Antoine Pietri <antoine.pietri@…> (11-03-15 10:49:15)

git-committer:

dequis <dx@…> (25-03-15 18:50:07)

Message:

chat_name_hint: normalize utf8 with fallback from the channel name

File:

• irc_im.c (modified) (3 diffs)

irc_im.c

@@ -698 +698 @@
         irc_t *irc = bee->ui_data;
         irc_channel_t *ic = c->ui_data, *oic;
-        char stripped[MAX_NICK_LENGTH + 1], *full_name;
+        char *stripped, *full_name;
+        gsize bytes_written;
 
         if (ic == NULL) {
@@ -709 +710 @@
         }
 
-        strncpy(stripped, name, MAX_NICK_LENGTH);
-        stripped[MAX_NICK_LENGTH] = '\0';
+        stripped = g_convert_with_fallback(name, -1, "ASCII//TRANSLIT", "UTF-8", "", NULL, &bytes_written, NULL);
+        if (bytes_written > MAX_NICK_LENGTH) {
+                stripped[MAX_NICK_LENGTH] = '\0';
+        }
+
         irc_channel_name_strip(stripped);
         if (set_getbool(&bee->set, "lcnicks")) {
@@ -717 +721 @@
 
         if (stripped[0] == '\0') {
+                g_free(stripped);
                 return FALSE;
         }
 
         full_name = g_strdup_printf("#%s", stripped);
+        g_free(stripped);
         if ((oic = irc_channel_by_name(irc, full_name))) {
                 char *type, *chat_type;