Changeset fd45e1d1

Timestamp:

2010-05-08T14:12:32Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4a9fd5f

Parents:

b0364dc

Message:

Always show normal contacts in &bitlbee, not just the first channel in the
list.

Files:

• irc.c (modified) (1 diff)
• irc.h (modified) (2 diffs)
• irc_im.c (modified) (3 diffs)

irc.c

@@ -636 +636 @@
                         irc_umode_set( irc, "+" UMODE, TRUE );
                         
-                        ic = irc_channel_new( irc, ROOT_CHAN );
+                        ic = irc->default_channel = irc_channel_new( irc, ROOT_CHAN );
                         irc_channel_set_topic( ic, CONTROL_TOPIC, irc->root );
                         irc_channel_add_user( ic, irc->user );

irc.h

@@ -78 +78 @@
         
         GSList *users, *channels;
+        struct irc_channel *default_channel;
         GHashTable *nick_user_hash;
         GHashTable *watches;
@@ -130 +131 @@
 {
         IRC_CHANNEL_JOINED = 1,
+        IRC_CHANNEL_CONTACTS = 256,
 } irc_channel_flags_t;
 

irc_im.c

@@ -81 +81 @@
         irc_t *irc = bee->ui_data;
         irc_user_t *iu = bu->ui_data;
-        irc_channel_t *ic = irc->channels->data; /* For now, just pick the first channel. */
+        irc_channel_t *ic = irc->default_channel;
         
         /* Do this outside the if below since away state can change without
@@ -119 +119 @@
 {
         irc_t *irc = bee->ui_data;
-        irc_channel_t *ic = irc->channels->data;
+        irc_channel_t *ic = irc->default_channel;
         irc_user_t *iu = (irc_user_t *) bu->ui_data;
         char *dst, *prefix = NULL;
@@ -410 +410 @@
 static gboolean bee_irc_channel_chat_topic( irc_channel_t *ic, const char *new )
 {
+        return TRUE;
 }