Changeset ad404ab for protocols

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.

Location:

protocols

Files:

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

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 );