Changeset 1522faf for irc_channel.c

Timestamp:

2015-04-06T02:26:44Z (10 years ago)

Author:

dequis <dx@…>

Children:

d16e951

Parents:

71f87ba (diff), 69982f8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

dequis <dx@…> (06-04-15 02:24:35)

git-committer:

dequis <dx@…> (06-04-15 02:26:44)

Message:

Merge branch 'develop' into feat/hip-cat

Conflicts:

irc_im.c
protocols/jabber/conference.c

File:

• irc_channel.c (modified) (2 diffs)

irc_channel.c

@@ -588 +588 @@
 char *irc_channel_name_gen(bee_t *bee, const char *hint)
 {
-        char name[MAX_NICK_LENGTH + 1] = { 0 };
-
-        name[0] = '#';
-        strncpy(name + 1, hint, MAX_NICK_LENGTH - 1);
-        name[MAX_NICK_LENGTH] = '\0';
+        char *name, *final_name;
+        gsize bytes_written;
+
+        name = g_convert_with_fallback(hint, -1, "ASCII//TRANSLIT", "UTF-8", "", NULL, &bytes_written, NULL);
+        if (bytes_written > MAX_NICK_LENGTH) {
+                name[MAX_NICK_LENGTH] = '\0';
+        }
 
         irc_channel_name_strip(name);
 
         if (set_getbool(&bee->set, "lcnicks")) {
-                nick_lc(bee->ui_data, name + 1);
+                nick_lc(bee->ui_data, name);
         }
 
@@ -604 +606 @@
         }
 
-        return g_strdup(name);
+        final_name = g_strconcat("#", name, NULL);
+
+        g_free(name);
+
+        return final_name;
 }