Changeset 1d39159 for protocols

Timestamp:

2010-04-05T00:18:24Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0b5cc72

Parents:

f012a9f

Message:

Get full names properly. Handling of nick_source setting and
imcb_nick_hint() is probably still broken.

Location:

protocols

Files:

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

protocols/bee.h

@@ -68 +68 @@
         gboolean (*user_new)( bee_t *bee, struct bee_user *bu );
         gboolean (*user_free)( bee_t *bee, struct bee_user *bu );
+        gboolean (*user_fullname)( bee_t *bee, bee_user_t *bu );
         gboolean (*user_status)( bee_t *bee, struct bee_user *bu, struct bee_user *old );
         gboolean (*user_msg)( bee_t *bee, bee_user_t *bu, const char *msg, time_t sent_at );

protocols/bee_user.c

@@ -169 +169 @@
 {
         bee_t *bee = ic->bee;
-        char *wrapped;
         bee_user_t *bu;
         

protocols/nogaim.c

@@ -365 +365 @@
 {
         bee_user_t *bu;
-        //char nick[MAX_NICK_LENGTH+1], *s;
         bee_t *bee = ic->bee;
         
@@ -385 +384 @@
 }
 
-void imcb_rename_buddy( struct im_connection *ic, const char *handle, const char *realname )
-{
-#if 0
-        user_t *u = user_findhandle( ic, handle );
-        char *set;
-        
-        if( !u || !realname ) return;
-        
-        if( g_strcasecmp( u->realname, realname ) != 0 )
-        {
-                if( u->realname != u->nick ) g_free( u->realname );
-                
-                u->realname = g_strdup( realname );
-                
-                if( ( ic->flags & OPT_LOGGED_IN ) && set_getbool( &ic->bee->set, "display_namechanges" ) )
-                        imcb_log( ic, "User `%s' changed name to `%s'", u->nick, u->realname );
-        }
-        
-        set = set_getstr( &ic->acc->set, "nick_source" );
-        if( strcmp( set, "handle" ) != 0 )
-        {
-                char *name = g_strdup( realname );
-                
-                if( strcmp( set, "first_name" ) == 0 )
-                {
-                        int i;
-                        for( i = 0; name[i] && !isspace( name[i] ); i ++ ) {}
-                        name[i] = '\0';
-                }
-                
-                imcb_buddy_nick_hint( ic, handle, name );
-                
-                g_free( name );
-        }
-#endif
+void imcb_rename_buddy( struct im_connection *ic, const char *handle, const char *fullname )
+{
+        bee_t *bee = ic->bee;
+        bee_user_t *bu = bee_user_by_handle( bee, ic, handle );
+        
+        if( !bu || !fullname ) return;
+        
+        if( strcmp( bu->fullname, fullname ) != 0 )
+        {
+                g_free( bu->fullname );
+                bu->fullname = g_strdup( fullname );
+                
+                if( bee->ui->user_fullname )
+                        bee->ui->user_fullname( bee, bu );
+        }
 }