Changes in irc_channel.c [25f6151:24de9fa]

File:

• irc_channel.c (modified) (4 diffs)

irc_channel.c

@@ -213 +213 @@
         }
 
-        /* Skip the free/init if nothing is being changed */
-        if (ic->f == new) {
-                return value;
-        }
-
         /* TODO: Return values. */
         if (ic->f && ic->f->_free) {
@@ -260 +255 @@
 
         if (!(icu = irc_channel_has_user(ic, iu))) {
-                if (iu == ic->irc->user && type == IRC_CDU_KICK) {
-                        /* an error happened before joining, inform the client with a numeric */
-                        irc_send_num(ic->irc, 403, "%s :Error joining channel (check control channel?)", ic->name);
-                }
                 return 0;
         }
@@ -436 +427 @@
                           changes);
         }
-}
-
-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;
 }
 
@@ -614 +593 @@
 
         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';