Changeset 5c09a59

Timestamp:

2005-11-15T23:16:39Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ef6c6a7

Parents:

9cb9868

Message:

Got rid of raw ^{B's in source,
Replaced most irc_usermsg() calls in nogaim.c with serv_got_crap(),
Slightly clearer handling of buddy add requests.}

Thanks to timing for the patch.

Files:

• bitlbee.c (modified) (1 diff)
• commands.c (modified) (2 diffs)
• irc.c (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/msn/msn_util.c (modified) (1 diff)
• protocols/nogaim.c (modified) (19 diffs)
• query.c (modified) (2 diffs)

bitlbee.c

@@ -518 +518 @@
                 }
         
-        irc_usermsg( irc, "Unknown command: %s. Please use help commands to get a list of available commands.", cmd[0] );
+        irc_usermsg( irc, "Unknown command: %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[0] );
         
         return( 1 );

commands.c

@@ -337 +337 @@
         else
         {
-                irc_usermsg( irc, "Unknown command: account %s. Please use help commands to get a list of available commands.", cmd[1] );
+                irc_usermsg( irc, "Unknown command: account %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[1] );
         }
         
@@ -738 +738 @@
         
         for( num = 0; q; q = q->next, num ++ )
-                irc_usermsg( irc, "%d, %s", num, q->question );
+                if( q->gc ) /* Not necessary yet, but it might come later */
+                        irc_usermsg( irc, "%d, %s(%s): %s", num, proto_name[q->gc->protocol], q->gc->username, q->question );
+                else
+                        irc_usermsg( irc, "%d, BitlBee: %s", num, q->question );
         
         return( 0 );

irc.c

@@ -1069 +1069 @@
         irc_spawn( irc, u );
         
-        irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\nIf you've never used BitlBee before, please do read the help information using the help command. Lots of FAQ's are answered there." );
+        irc_usermsg( irc, "Welcome to the BitlBee gateway!\n\nIf you've never used BitlBee before, please do read the help information using the \x02help\x02 command. Lots of FAQ's are answered there." );
         
         irc->status = USTATUS_LOGGED_IN;

protocols/jabber/jabber.c

@@ -1128 +1128 @@
                  */
                 struct jabber_add_permit *jap = g_new0(struct jabber_add_permit, 1);
-                gchar *msg = g_strdup_printf(_("The user %s wants to add you to their buddy list."),
+                gchar *msg = g_strdup_printf(_("The user %s wants to add you to his/her buddy list."),
                                 Jid);
 

protocols/msn/msn_util.c

@@ -166 +166 @@
         
         g_snprintf( buf, sizeof( buf ),
-                    "The user %s (%s) wants to add you to his/her buddy list. Do you want to allow this?",
+                    "The user %s (%s) wants to add you to his/her buddy list.",
                     handle, realname );
         do_ask_dialog( gc, buf, bla, msn_buddy_ask_yes, msn_buddy_ask_no );

protocols/nogaim.c

@@ -122 +122 @@
                         gc->prpl->set_away( gc, s, away );
                         if( set_getint( gc->irc, "debug" ) )
-                                irc_usermsg( gc->irc, "Setting away state for %s to %s", proto_name[gc->protocol], s );
+                                serv_got_crap( gc, "Setting away state to %s", s );
                 }
                 else
@@ -216 +216 @@
 void set_login_progress( struct gaim_connection *gc, int step, char *msg )
 {
-        irc_usermsg( gc->irc, "%s(%s) - Logging in: %s", proto_name[gc->protocol], gc->username, msg );
+        serv_got_crap( gc, "Logging in: %s", msg );
 }
 
@@ -222 +222 @@
 void hide_login_progress( struct gaim_connection *gc, char *msg )
 {
-        irc_usermsg( gc->irc, "%s(%s) - Login error: %s", proto_name[gc->protocol], gc->username, msg );
+        serv_got_crap( gc, "Login error: %s", msg );
 }
 
@@ -228 +228 @@
 void hide_login_progress_error( struct gaim_connection *gc, char *msg )
 {
-        irc_usermsg( gc->irc, "%s(%s) - Logged out: %s", proto_name[gc->protocol], gc->username, msg );
+        serv_got_crap( gc, "Logged out: %s", msg );
 }
 
@@ -276 +276 @@
         u = user_find( gc->irc, gc->irc->nick );
         
-        irc_usermsg( gc->irc, "%s(%s) - Logged in", proto_name[gc->protocol], gc->username );
+        serv_got_crap( gc, "Logged in" );
         
         gc->keepalive = g_timeout_add( 60000, send_keepalive, gc );
@@ -290 +290 @@
                 
                 if( u == NULL )
-                        irc_usermsg( gc->irc, "\x02""***\x02"" BitlBee now supports ICQ server-side contact lists. "
+                        serv_got_crap( gc, "\x02""***\x02"" BitlBee now supports ICQ server-side contact lists. "
                                               "See \x02""help import_buddies\x02"" for more information." );
         }
@@ -323 +323 @@
         account_t *a;
         
-        irc_usermsg( gc->irc, "%s(%s) - Signing off..", proto_name[gc->protocol], gc->username );
+        serv_got_crap( gc, "Signing off.." );
 
         gaim_input_remove( gc->keepalive );
@@ -355 +355 @@
         {
                 int delay = set_getint( irc, "auto_reconnect_delay" );
-                irc_usermsg( gc->irc, "%s(%s) - Reconnecting in %d seconds..", proto_name[gc->protocol], gc->username, delay);
+                serv_got_crap( gc, "Reconnecting in %d seconds..", delay );
                 
                 a->reconnect = 1;
@@ -369 +369 @@
 void do_error_dialog( struct gaim_connection *gc, char *msg, char *title )
 {
-        irc_usermsg( gc->irc, "%s(%s) - Error: %s", proto_name[gc->protocol], gc->username, msg );
+        serv_got_crap( gc, "Error: %s", msg );
 }
 
@@ -398 +398 @@
         
         if( set_getint( irc, "debug" ) && 0 ) /* This message is too useless */
-                irc_usermsg( irc, "Receiving user add from protocol: %s", handle );
+                serv_got_crap( gc, "Receiving user add from handle: %s", handle );
         
         if( user_findhandle( gc, handle ) )
         {
                 if( set_getint( irc, "debug" ) )
-                        irc_usermsg( irc, "User already exists, ignoring add request: %s", handle );
+                        serv_got_crap( gc, "User already exists, ignoring add request: %s", handle );
                 
                 return;
@@ -496 +496 @@
                 
                 if( ( gc->flags & OPT_LOGGED_IN ) && set_getint( gc->irc, "display_namechanges" ) )
-                        irc_usermsg( gc->irc, "User `%s' changed name to `%s'", u->nick, u->realname );
+                        serv_got_crap( gc, "User `%s' changed name to `%s'", u->nick, u->realname );
         }
 }
@@ -529 +529 @@
                         if( set_getint( gc->irc, "debug" ) || g_strcasecmp( set_getstr( gc->irc, "handle_unknown" ), "ignore" ) != 0 )
                         {
-                                irc_usermsg( gc->irc, "serv_got_update() for handle %s on connection %s(%s):", handle, proto_name[gc->protocol], gc->username );
-                                irc_usermsg( gc->irc, "loggedin = %d, type = %d", loggedin, type );
+                                serv_got_crap( gc, "serv_got_update() for handle %s:", handle );
+                                serv_got_crap( gc, "loggedin = %d, type = %d", loggedin, type );
                         }
                         
@@ -610 +610 @@
                 {
                         if( set_getint( irc, "debug" ) )
-                                irc_usermsg( irc, "Ignoring message from unknown handle %s on connection %s(%s)", handle, proto_name[gc->protocol], gc->username );
+                                serv_got_crap( gc, "Ignoring message from unknown handle %s", handle );
                         
                         return;
@@ -632 +632 @@
                 else
                 {
-                        irc_usermsg( irc, "Message from unknown handle %s on connection %s(%s):", handle, proto_name[gc->protocol], gc->username );
+                        serv_got_crap( gc, "Message from unknown handle %s:", handle );
                         u = user_find( irc, irc->mynick );
                 }
@@ -692 +692 @@
         
         if( set_getint( gc->irc, "debug" ) )
-                irc_usermsg( gc->irc, "You were removed from conversation %d", (int) id );
+                serv_got_crap( gc, "You were removed from conversation %d", (int) id );
         
         for( c = gc->conversations; c && c->id != id; c = (l=c)->next );
@@ -748 +748 @@
                 irc_privmsg( gc->irc, u, "PRIVMSG", c->channel, "", msg );
         else
-                irc_usermsg( gc->irc, "Message from/to conversation %s@%d (unknown conv/user): %s", who, id, msg );
+                serv_got_crap( gc, "Message from/to conversation %s@%d (unknown conv/user): %s", who, id, msg );
 }
 
@@ -776 +776 @@
         
         if( set_getint( gc->irc, "debug" ) )
-                irc_usermsg( gc->irc, "Creating new conversation: (id=%d,handle=%s)", id, handle );
+                serv_got_crap( gc, "Creating new conversation: (id=%d,handle=%s)", id, handle );
         
         return( c );
@@ -795 +795 @@
         
         if( set_getint( b->gc->irc, "debug" ) )
-                irc_usermsg( b->gc->irc, "User %s added to conversation %d", handle, b->id );
+                serv_got_crap( b->gc, "User %s added to conversation %d", handle, b->id );
         
         /* It might be yourself! */
@@ -829 +829 @@
         
         if( set_getint( b->gc->irc, "debug" ) )
-                irc_usermsg( b->gc->irc, "User %s removed from conversation %d (%s)", handle, b->id, reason ? reason : "" );
+                serv_got_crap( b->gc, "User %s removed from conversation %d (%s)", handle, b->id, reason ? reason : "" );
         
         /* It might be yourself! */

query.c

@@ -127 +127 @@
                 disp = 1;
         }
-        
+        //Using irc_usermsg instead of serv_got_crap because \x02A is a char too, so a SPACE is needed. 
         if( ans )
         {
                 q->yes( NULL, q->data );
-                irc_usermsg( irc, "Accepted: %s", q->question );
+                serv_got_crap( q->gc, "\2Accepted\2: %s", q->question );
         }
         else
         {
                 q->no( NULL, q->data );
-                irc_usermsg( irc, "Rejected: %s", q->question );
+                serv_got_crap( q->gc, "\2Rejected\2: %s", q->question );
         }
         q->data = NULL;
@@ -149 +149 @@
 {
         if( q->gc )
-                irc_usermsg( irc, "Question on %s connection (handle %s):", proto_name[q->gc->protocol], q->gc->username );
+        {
+                serv_got_crap( q->gc, "New request:" );
+                serv_got_crap( q->gc, "%s\nYou can use the yes/no commands to accept/reject this request.", q->question );
+        }
         else
-                irc_usermsg( irc, "Question:" );
-        
-        irc_usermsg( irc, "%s\nYou can use the yes/no commands to answer this question.", q->question );
+        {
+                irc_usermsg( irc, "New request:" );
+                irc_usermsg( irc, "%s\nYou can use the yes/no commands to accept/reject this request.", q->question );
+        }
 }