Changeset ad404ab

Timestamp:

2010-06-03T00:20:53Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

7b71feb

Parents:

704dd38

Message:

Restore add_* handle_unknown settings.

Files:

• irc_im.c (modified) (1 diff)
• protocols/bee.h (modified) (2 diffs)
• protocols/bee_chat.c (modified) (1 diff)
• protocols/bee_user.c (modified) (4 diffs)
• protocols/nogaim.c (modified) (1 diff)
• root_commands.c (modified) (1 diff)

irc_im.c

@@ -65 +65 @@
         if( set_getbool( &bee->set, "private" ) )
                 iu->flags |= IRC_USER_PRIVATE;
+        
+        if( bu->flags & BEE_USER_LOCAL )
+        {
+                char *s = set_getstr( &bee->set, "handle_unknown" );
+                
+                if( strcmp( s, "add_private" ) == 0 )
+                        iu->flags |= IRC_USER_PRIVATE;
+                else if( strcmp( s, "add_channel" ) == 0 )
+                        iu->flags &= ~IRC_USER_PRIVATE;
+        }
         
         iu->f = &irc_user_im_funcs;

protocols/bee.h

@@ -54 +54 @@
         BEE_USER_ONLINE = 1,    /* Compatibility with old OPT_LOGGED_IN flag */
         BEE_USER_AWAY = 4,      /* Compatibility with old OPT_AWAY flag */
+        BEE_USER_LOCAL = 256,   /* Locally-added contacts (not in real contact list) */
 } bee_user_flags_t;
 
@@ -107 +108 @@
 
 /* bee_user.c */
-bee_user_t *bee_user_new( bee_t *bee, struct im_connection *ic, const char *handle );
+bee_user_t *bee_user_new( bee_t *bee, struct im_connection *ic, const char *handle, bee_user_flags_t flags );
 int bee_user_free( bee_t *bee, bee_user_t *bu );
 bee_user_t *bee_user_by_handle( bee_t *bee, struct im_connection *ic, const char *handle );

protocols/bee_chat.c

@@ -160 +160 @@
            your contact list. Try to handle that here */
         if( !me && !bu )
-                bu = bee_user_new( bee, ic, handle );
+                bu = bee_user_new( bee, ic, handle, BEE_USER_LOCAL );
         
         /* Add the handle to the room userlist */

protocols/bee_user.c

@@ -27 +27 @@
 #include "bitlbee.h"
 
-bee_user_t *bee_user_new( bee_t *bee, struct im_connection *ic, const char *handle )
+bee_user_t *bee_user_new( bee_t *bee, struct im_connection *ic, const char *handle, bee_user_flags_t flags )
 {
         bee_user_t *bu;
@@ -37 +37 @@
         bu->bee = bee;
         bu->ic = ic;
+        bu->flags = flags;
         bu->handle = g_strdup( handle );
         bee->users = g_slist_prepend( bee->users, bu );
@@ -160 +161 @@
                 if( g_strcasecmp( set_getstr( &ic->bee->set, "handle_unknown" ), "add" ) == 0 )
                 {
-                        bu = bee_user_new( bee, ic, handle );
+                        bu = bee_user_new( bee, ic, handle, BEE_USER_LOCAL );
                 }
                 else
@@ -208 +209 @@
                 else if( g_strncasecmp( h, "add", 3 ) == 0 )
                 {
-                        bu = bee_user_new( bee, ic, handle );
+                        bu = bee_user_new( bee, ic, handle, BEE_USER_LOCAL );
                 }
         }

protocols/nogaim.c

@@ -376 +376 @@
         
         if( !( bu = bee_user_by_handle( bee, ic, handle ) ) )
-                bu = bee_user_new( bee, ic, handle );
+                bu = bee_user_new( bee, ic, handle, 0 );
         
         bu->group = bee_group_by_name( bee, group, TRUE );

root_commands.c

@@ -532 +532 @@
                 /* Only for add -tmp. For regular adds, this callback will
                    be called once the IM server confirms. */
-                bee_user_new( irc->b, a->ic, cmd[2] );
+                bee_user_new( irc->b, a->ic, cmd[2], BEE_USER_LOCAL );
         
         irc_usermsg( irc, "Adding `%s' to your contact list", cmd[2]  );