Changeset 3b3c50d9

Timestamp:

2010-07-28T08:24:47Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3963fdd

Parents:

13fa2db

Message:

Allow including account tags in nicknames, and be a bit more clever about
the default tags (recognize AIM/ICQ/GTalk/Facebook).

Files:

• doc/user-guide/misc.xml (modified) (1 diff)
• nick.c (modified) (1 diff)
• protocols/account.c (modified) (1 diff)

doc/user-guide/misc.xml

@@ -201 +201 @@
         <varlistentry><term>%first_name</term><listitem><para>The first name of the contact (the full name up to the first space).</para></listitem></varlistentry>
         <varlistentry><term>%group</term><listitem><para>The name of the group this contact is a member of</para></listitem></varlistentry>
+        <varlistentry><term>%account</term><listitem><para>Account tag of the contact</para></listitem></varlistentry>
 </variablelist>
 

nick.c

@@ -177 +177 @@
                                 part = bu->group ? bu->group->name : NULL;
                                 fmt += 5;
+                                break;
+                        }
+                        else if( g_strncasecmp( fmt, "account", 7 ) == 0 )
+                        {
+                                part = bu->ic->acc->tag;
+                                fmt += 7;
                                 break;
                         }

protocols/account.c

@@ -73 +73 @@
         set_setstr( &a->set, "username", user );
         
-        if( account_by_tag( bee, prpl->name ) )
-        {
+        /* Hardcode some more clever tag guesses. */
+        strcpy( tag, prpl->name );
+        if( strcmp( prpl->name, "oscar" ) == 0 )
+        {
+                if( isdigit( a->user[0] ) )
+                        strcpy( tag, "icq" );
+                else
+                        strcpy( tag, "aim" );
+        }
+        else if( strcmp( prpl->name, "jabber" ) == 0 )
+        {
+                if( strstr( a->user, "@gmail.com" ) ||
+                    strstr( a->user, "@googlemail.com" ) )
+                        strcpy( tag, "gtalk" );
+                else if( strstr( a->user, "@chat.facebook.com" ) )
+                        strcpy( tag, "fb" );
+        }
+        
+        if( account_by_tag( bee, tag ) )
+        {
+                char *numpos = tag + strlen( tag );
                 int i;
 
                 for( i = 2; i < 10000; i ++ )
                 {
-                        sprintf( tag, "%s%d", prpl->name, i );
+                        sprintf( numpos, "%d", i );
                         if( !account_by_tag( bee, tag ) )
                                 break;
                 }
-        }
-        else
-        {
-                strcpy( tag, prpl->name );
         }
         set_setstr( &a->set, "tag", tag );