Changeset e4f08bf for nick.c

Timestamp:

2015-06-08T18:25:08Z (9 years ago)

Author:

dequis <dx@…>

Children:

29ff5c2

Parents:

c720890 (diff), 61e7e02 (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.

Message:

Merge branch 'develop' into feat/hip-cat

Conflicts:

configure

File:

• nick.c (modified) (1 diff)

nick.c

@@ -186 +186 @@
                    LC_CTYPE being set to something other than C/POSIX. */
                 if (!(irc && irc->status & IRC_UTF8_NICKS)) {
-                        part = asc = g_convert_with_fallback(part, -1, "ASCII//TRANSLIT",
-                                                             "UTF-8", "", NULL, NULL, NULL);
+                        asc = g_convert_with_fallback(part, -1, "ASCII//TRANSLIT", "UTF-8", "", NULL, NULL, NULL);
+
+                        if (!asc) {
+                                /* If above failed, try again without //TRANSLIT.
+                                   //TRANSLIT is a GNU iconv special and is not POSIX.
+                                   Other platforms may not support it. */
+                                asc = g_convert_with_fallback(part, -1, "ASCII", "UTF-8", "", NULL, NULL, NULL);
+                        }
+
+                        part = asc;
                 }