Changeset 43462708

Timestamp:

2008-01-06T12:37:55Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

181e47a, fc82be6

Parents:

46dca11

Message:

More consistency in error/warning errors. Until now "WARNING:" was usually
in upper case while "Error:" wasn't .... that doesn't really make sense.

Files:

• configure (modified) (1 diff)
• irc.c (modified) (1 diff)
• nick.c (modified) (1 diff)
• protocols/jabber/iq.c (modified) (6 diffs)
• protocols/jabber/jabber_util.c (modified) (1 diff)
• protocols/jabber/presence.c (modified) (2 diffs)
• protocols/msn/msn_util.c (modified) (1 diff)
• protocols/oscar/service.c (modified) (1 diff)
• protocols/oscar/txqueue.c (modified) (1 diff)

configure

@@ -454 +454 @@
 
 if [ "$protocols" = "PROTOCOLS = " ]; then
-        echo "WARNING: You haven't selected any communication protocol to compile!"
+        echo "Warning: You haven't selected any communication protocol to compile!"
         echo "         BitlBee will run, but you will be unable to connect to IM servers!"
 fi

irc.c

@@ -326 +326 @@
                                 {
                                         if( irc->status & USTATUS_LOGGED_IN )
-                                                irc_usermsg( irc, "ERROR: Charset mismatch detected. The charset "
+                                                irc_usermsg( irc, "Error: Charset mismatch detected. The charset "
                                                                   "setting is currently set to %s, so please make "
                                                                   "sure your IRC client will send and accept text in "

nick.c

@@ -111 +111 @@
                         int i;
                         
-                        irc_usermsg( acc->irc, "WARNING: Almost had an infinite loop in nick_get()! "
+                        irc_usermsg( acc->irc, "Warning: Almost had an infinite loop in nick_get()! "
                                                "This used to be a fatal BitlBee bug, but we tried to fix it. "
                                                "This message should *never* appear anymore. "

protocols/jabber/iq.c

@@ -54 +54 @@
                     !( s = xt_find_attr( c, "xmlns" ) ) )
                 {
-                        imcb_log( ic, "WARNING: Received incomplete IQ-%s packet", type );
+                        imcb_log( ic, "Warning: Received incomplete IQ-%s packet", type );
                         return XT_HANDLED;
                 }
@@ -125 +125 @@
                     !( s = xt_find_attr( c, "xmlns" ) ) )
                 {
-                        imcb_log( ic, "WARNING: Received incomplete IQ-%s packet", type );
+                        imcb_log( ic, "Warning: Received incomplete IQ-%s packet", type );
                         return XT_HANDLED;
                 }
@@ -147 +147 @@
                         else
                         {
-                                imcb_log( ic, "WARNING: %s tried to fake a roster push!", s ? s : "(unknown)" );
+                                imcb_log( ic, "Warning: %s tried to fake a roster push!", s ? s : "(unknown)" );
                                 
                                 xt_free_node( reply );
@@ -212 +212 @@
         if( !( query = xt_find_node( node->children, "query" ) ) )
         {
-                imcb_log( ic, "WARNING: Received incomplete IQ packet while authenticating" );
+                imcb_log( ic, "Warning: Received incomplete IQ packet while authenticating" );
                 imc_logout( ic, FALSE );
                 return XT_HANDLED;
@@ -270 +270 @@
         if( !( type = xt_find_attr( node, "type" ) ) )
         {
-                imcb_log( ic, "WARNING: Received incomplete IQ packet while authenticating" );
+                imcb_log( ic, "Warning: Received incomplete IQ packet while authenticating" );
                 imc_logout( ic, FALSE );
                 return XT_HANDLED;
@@ -346 +346 @@
         if( !( query = xt_find_node( node->children, "query" ) ) )
         {
-                imcb_log( ic, "WARNING: Received NULL roster packet" );
+                imcb_log( ic, "Warning: Received NULL roster packet" );
                 return XT_HANDLED;
         }

protocols/jabber/jabber_util.c

@@ -200 +200 @@
         if( entry == NULL )
         {
-                imcb_log( ic, "WARNING: Received %s-%s packet with unknown/expired ID %s!",
+                imcb_log( ic, "Warning: Received %s-%s packet with unknown/expired ID %s!",
                               node->name, xt_find_attr( node, "type" ) ? : "(no type)", s );
         }

protocols/jabber/presence.c

@@ -50 +50 @@
                 {
                         if( set_getbool( &ic->irc->set, "debug" ) )
-                                imcb_log( ic, "WARNING: Could not handle presence information from JID: %s", from );
+                                imcb_log( ic, "Warning: Could not handle presence information from JID: %s", from );
                         return XT_HANDLED;
                 }
@@ -91 +91 @@
                 {
                         if( set_getbool( &ic->irc->set, "debug" ) )
-                                imcb_log( ic, "WARNING: Received presence information from unknown JID: %s", from );
+                                imcb_log( ic, "Warning: Received presence information from unknown JID: %s", from );
                         return XT_HANDLED;
                 }

protocols/msn/msn_util.c

@@ -352 +352 @@
         m = l->data;
         ret = g_string_sized_new( 1024 );
-        g_string_printf( ret, "WARNING: Cleaning up MSN (switchboard) connection with unsent "
+        g_string_printf( ret, "Warning: Cleaning up MSN (switchboard) connection with unsent "
                               "messages to %s:", m->who ? m->who : "unknown recipient" );
         

protocols/oscar/service.c

@@ -894 +894 @@
 */
                 } else
-                        imcb_error(sess->aux_data, "WARNING: unknown hash request");
+                        imcb_error(sess->aux_data, "Warning: unknown hash request");
 
         }

protocols/oscar/txqueue.c

@@ -80 +80 @@
 
         if (!fr->conn) {
-                imcb_error(sess->aux_data, "WARNING: enqueueing packet with no connection");
+                imcb_error(sess->aux_data, "Warning: enqueueing packet with no connection");
                 fr->conn = aim_getconn_type(sess, AIM_CONN_TYPE_BOS);
         }