Changeset 17f057d

Timestamp:

2011-12-13T00:34:07Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

4efa5ce, 6e9ae72, a0a3de6

Parents:

b926d88

Message:

As I intended for a while already, use account tags everywhere instead of
"protocol(handle)". It's guaranteed to be unique and also shorter.

It may suck for people who have multiple accounts and didn't change their
tags, but that'll hopefully remind them to change them.

Files:

• irc_commands.c (modified) (1 diff)
• protocols/nogaim.c (modified) (1 diff)
• root_commands.c (modified) (8 diffs)

irc_commands.c

@@ -434 +434 @@
                                 set_setstr( &a->set, "password", password );
                                 irc_rootmsg( irc, "Password added to IM account "
-                                             "%s(%s)", a->prpl->name, a->user );
+                                             "%s", a->tag );
                                 /* The IRC client may expect this. 491 suggests the OPER
                                    password was wrong, so the client won't expect a +o.
                                    It may however repeat the password prompt. We'll see. */
                                 irc_send_num( irc, 491, ":Password added to IM account "
-                                              "%s(%s)", a->prpl->name, a->user );
+                                              "%s", a->tag );
                         }
         }

protocols/nogaim.c

@@ -216 +216 @@
         if( a )
                 /* FIXME(wilmer): ui_log callback or so */
-                irc_rootmsg( ic->bee->ui_data, "%s(%s) - %s", ic->acc->prpl->name, ic->acc->user, text );
+                irc_rootmsg( ic->bee->ui_data, "%s - %s", ic->acc->tag, text );
         else
                 irc_rootmsg( ic->bee->ui_data, "%s - %s", ic->acc->prpl->name, text );

root_commands.c

@@ -413 +413 @@
                                 if( strcmp( a->pass, PASSWORD_PENDING ) == 0 )
                                 {
-                                        irc_rootmsg( irc, "Enter password for account %s(%s) "
-                                                     "first (use /OPER)", a->prpl->name, a->user );
+                                        irc_rootmsg( irc, "Enter password for account %s "
+                                                     "first (use /OPER)", a->tag );
                                         return;
                                 }
@@ -443 +443 @@
                 }
                 
-                irc_rootmsg( irc, "Account successfully added%s", cmd[4] ? "" :
+                irc_rootmsg( irc, "Account successfully added with tag %s%s",
+                             a->tag, cmd[4] ? "" :
                              ", now use /OPER to enter the password" );
                 
@@ -490 +491 @@
                                 {
                                         if( strcmp( a->pass, PASSWORD_PENDING ) == 0 )
-                                                irc_rootmsg( irc, "Enter password for account %s(%s) "
-                                                             "first (use /OPER)", a->prpl->name, a->user );
+                                                irc_rootmsg( irc, "Enter password for account %s "
+                                                             "first (use /OPER)", a->tag );
                                         else
                                                 account_on( irc->b, a );
@@ -553 +554 @@
                         irc_rootmsg( irc, "Account already online" );
                 else if( strcmp( a->pass, PASSWORD_PENDING ) == 0 )
-                        irc_rootmsg( irc, "Enter password for account %s(%s) "
-                                     "first (use /OPER)", a->prpl->name, a->user );
+                        irc_rootmsg( irc, "Enter password for account %s "
+                                     "first (use /OPER)", a->tag );
                 else
                         account_on( irc->b, a );
@@ -1093 +1094 @@
                                 g_snprintf( st, sizeof( st ) - 1, "Online (%s)", bu->status_msg );
                         
-                        g_snprintf( s, sizeof( s ) - 1, "%s %s(%s)", bu->handle, bu->ic->acc->prpl->name, bu->ic->acc->user );
+                        g_snprintf( s, sizeof( s ) - 1, "%s %s", bu->handle, bu->ic->acc->tag );
                         irc_rootmsg( irc, format, iu->nick, s, st );
                 }
@@ -1111 +1112 @@
                 if( away == 1 )
                 {
-                        g_snprintf( s, sizeof( s ) - 1, "%s %s(%s)", bu->handle, bu->ic->acc->prpl->name, bu->ic->acc->user );
+                        g_snprintf( s, sizeof( s ) - 1, "%s %s", bu->handle, bu->ic->acc->tag );
                         irc_rootmsg( irc, format, iu->nick, s, irc_user_get_away( iu ) );
                 }
@@ -1128 +1129 @@
                 if( offline == 1 )
                 {
-                        g_snprintf( s, sizeof( s ) - 1, "%s %s(%s)", bu->handle, bu->ic->acc->prpl->name, bu->ic->acc->user );
+                        g_snprintf( s, sizeof( s ) - 1, "%s %s", bu->handle, bu->ic->acc->tag );
                         irc_rootmsg( irc, format, iu->nick, s, "Offline" );
                 }
@@ -1152 +1153 @@
         for( num = 0; q; q = q->next, num ++ )
                 if( q->ic ) /* Not necessary yet, but it might come later */
-                        irc_rootmsg( irc, "%d, %s(%s): %s", num, q->ic->acc->prpl->name, q->ic->acc->user, q->question );
+                        irc_rootmsg( irc, "%d, %s: %s", num, q->ic->acc->tag, q->question );
                 else
                         irc_rootmsg( irc, "%d, BitlBee: %s", num, q->question );