Changeset 29ff5c2 for irc_channel.c

Timestamp:

2015-11-21T00:01:50Z (8 years ago)

Author:

dequis <dx@…>

Parents:

e4f08bf (diff), 8fdeaa5 (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 'master' into feat/hip-cat

File:

• irc_channel.c (modified) (3 diffs)

irc_channel.c

@@ -429 +429 @@
 }
 
+char irc_channel_user_get_prefix(irc_channel_user_t *icu)
+{
+        if (icu->flags & IRC_CHANNEL_USER_OP) {
+                return '@';
+        } else if (icu->flags & IRC_CHANNEL_USER_HALFOP) {
+                return '%';
+        } else if (icu->flags & IRC_CHANNEL_USER_VOICE) {
+                return '+';
+        }
+        return 0;
+}
+
 void irc_channel_auto_joins(irc_t *irc, account_t *acc)
 {
@@ -445 +457 @@
                         char *acc_s;
 
-                        if (!aj || (ic->flags & IRC_CHANNEL_JOINED)) {
-                                /* Only continue if this one's marked as auto_join
-                                   or if we're in it already. (Possible if the
-                                   client auto-rejoined it before identyfing.) */
+                        if (!aj && !(ic->flags & IRC_CHANNEL_JOINED)) {
+                                /* Only proceed if this one's marked as auto_join
+                                   or if we're in it already. (Very likely the IRC
+                                   client auto-(re)joining at reconnect time.) */
                                 continue;
                         } else if (!(acc_s = set_getstr(&ic->set, "account"))) {
@@ -593 +605 @@
 
         translit_name = g_convert_with_fallback(hint, -1, "ASCII//TRANSLIT", "UTF-8", "", NULL, &bytes_written, NULL);
+
+        if (!translit_name) {
+                /* Same thing as in nick_gen() in nick.c, try again without //TRANSLIT */
+                translit_name = g_convert_with_fallback(hint, -1, "ASCII", "UTF-8", "", NULL, &bytes_written, NULL);
+        }
+
+        if (!translit_name) {
+                return NULL;
+        }
+
         if (bytes_written > MAX_NICK_LENGTH) {
                 translit_name[MAX_NICK_LENGTH] = '\0';