Changes in root_commands.c [30ce1ce:7adc657]

File:

• root_commands.c (modified) (5 diffs)

root_commands.c

@@ -449 +449 @@
         {
                 add_on_server = 0;
-                cmd ++;         /* So evil... :-D */
+                cmd ++;
         }
         
@@ -481 +481 @@
         }
         
-        /* By making this optional, you can talk to people without having to
-           add them to your *real* (server-side) contact list. */
         if( add_on_server )
                 a->ic->acc->prpl->add_buddy( a->ic, cmd[2], NULL );
-        
-        /* add_buddy( a->ic, NULL, cmd[2], cmd[2] ); */
+        else
+                /* Yeah, officially this is a call-*back*... So if we just
+                   called add_buddy, we'll wait for the IM server to respond
+                   before we do this. */
+                imcb_add_buddy( a->ic, cmd[2], NULL );
         
         irc_usermsg( irc, "Adding `%s' to your contact list", cmd[2]  );
@@ -821 +822 @@
                 if( online == 1 )
                 {
-                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->ic->acc->prpl->name );
+                        g_snprintf( s, sizeof( s ) - 1, "%s@%s %s(%s)", u->user, u->host, u->ic->acc->prpl->name, u->ic->acc->user );
                         irc_usermsg( irc, format, u->nick, s, "Online" );
                 }
@@ -832 +833 @@
                 if( away == 1 )
                 {
-                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->ic->acc->prpl->name );
+                        g_snprintf( s, sizeof( s ) - 1, "%s@%s %s(%s)", u->user, u->host, u->ic->acc->prpl->name, u->ic->acc->user );
                         irc_usermsg( irc, format, u->nick, s, u->away );
                 }
@@ -842 +843 @@
                 if( offline == 1 )
                 {
-                        g_snprintf( s, sizeof( s ) - 1, "%s@%s (%s)", u->user, u->host, u->ic->acc->prpl->name );
+                        g_snprintf( s, sizeof( s ) - 1, "%s@%s %s(%s)", u->user, u->host, u->ic->acc->prpl->name, u->ic->acc->user );
                         irc_usermsg( irc, format, u->nick, s, "Offline" );
                 }