Changeset 0fb32dd for irc_channel.c


Ignore:
Timestamp:
2015-04-06T17:07:03Z (6 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:
1 edited

Legend:

Unmodified
Added
Removed
  • irc_channel.c

    rb3ebb3a r0fb32dd  
    556556}
    557557
    558 gboolean irc_channel_is_unused(bee_t *bee, char *name)
     558gboolean irc_channel_is_unused(irc_t *irc, char *name)
    559559{
    560560        char *type, *chat_type;
     
    565565        }
    566566
    567         if (!(oic = irc_channel_by_name(bee->ui_data, name))) {
     567        if (!(oic = irc_channel_by_name(irc, name))) {
    568568                return TRUE;
    569569        }
     
    586586}
    587587
    588 char *irc_channel_name_gen(bee_t *bee, const char *hint)
     588char *irc_channel_name_gen(irc_t *irc, const char *hint)
    589589{
    590590        char name[MAX_NICK_LENGTH + 1] = { 0 };
     
    605605        irc_channel_name_strip(name);
    606606
    607         if (set_getbool(&bee->set, "lcnicks")) {
    608                 nick_lc(bee->ui_data, name + 1);
    609         }
    610 
    611         while (!irc_channel_is_unused(bee, name)) {
     607        if (set_getbool(&irc->b->set, "lcnicks")) {
     608                nick_lc(irc, name + 1);
     609        }
     610
     611        while (!irc_channel_is_unused(irc, name)) {
    612612                underscore_dedupe(name);
    613613        }
     
    626626        }
    627627
    628         if (!(full_name = irc_channel_name_gen(irc->b, name))) {
     628        if (!(full_name = irc_channel_name_gen(irc, name))) {
    629629                return FALSE;
    630630        }
Note: See TracChangeset for help on using the changeset viewer.