Changeset 0fb32dd for irc_channel.c

Timestamp:

2015-04-06T17:07:03Z (10 years ago)

Author:

dequis <dx@…>

Children:

1aacef41

Parents:

b3ebb3a (diff), a9b1e0e (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:

irc.h
irc_channel.c

File:

• irc_channel.c (modified) (5 diffs)

irc_channel.c

@@ -556 +556 @@
 }
 
-gboolean irc_channel_is_unused(bee_t *bee, char *name)
+gboolean irc_channel_is_unused(irc_t *irc, char *name)
 {
         char *type, *chat_type;
@@ -565 +565 @@
         }
 
-        if (!(oic = irc_channel_by_name(bee->ui_data, name))) {
+        if (!(oic = irc_channel_by_name(irc, name))) {
                 return TRUE;
         }
@@ -586 +586 @@
 }
 
-char *irc_channel_name_gen(bee_t *bee, const char *hint)
+char *irc_channel_name_gen(irc_t *irc, const char *hint)
 {
         char name[MAX_NICK_LENGTH + 1] = { 0 };
@@ -605 +605 @@
         irc_channel_name_strip(name);
 
-        if (set_getbool(&bee->set, "lcnicks")) {
-                nick_lc(bee->ui_data, name + 1);
-        }
-
-        while (!irc_channel_is_unused(bee, name)) {
+        if (set_getbool(&irc->b->set, "lcnicks")) {
+                nick_lc(irc, name + 1);
+        }
+
+        while (!irc_channel_is_unused(irc, name)) {
                 underscore_dedupe(name);
         }
@@ -626 +626 @@
         }
 
-        if (!(full_name = irc_channel_name_gen(irc->b, name))) {
+        if (!(full_name = irc_channel_name_gen(irc, name))) {
                 return FALSE;
         }