More consistency in error/warning errors. Until now "WARNING:" was usually

in upper case while "Error:" wasn't .... that doesn't really make sense.

9 files changed, 15 insertions, 15 deletions

diff --git a/configure b/configure
index 15e22623..6f8d8ea6 100755
--- a/configure
+++ b/configure
@@ -453,7 +453,7 @@ else
 fi
 
 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
 
diff --git a/irc.c b/irc.c
index 01d4c47e..2b86aebb 100644
--- a/irc.c
+++ b/irc.c
@@ -325,7 +325,7 @@ void irc_process( irc_t *irc )
 				if( do_iconv( cs, "UTF-8", lines[i], conv, 0, IRC_MAX_LINE - 2 ) == -1 )
 				{
 					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 "
 						                  "that charset, or tell BitlBee which charset to "
diff --git a/nick.c b/nick.c
index 4b05f4a7..52f9e5ad 100644
--- a/nick.c
+++ b/nick.c
@@ -110,7 +110,7 @@ void nick_dedupe( account_t *acc, const char *handle, char nick[MAX_NICK_LENGTH+
 		{
 			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. "
 			                       "If it does, please *do* send us a bug report! "
diff --git a/protocols/jabber/iq.c b/protocols/jabber/iq.c
index 069e3af3..e1bab29e 100644
--- a/protocols/jabber/iq.c
+++ b/protocols/jabber/iq.c
@@ -53,7 +53,7 @@ xt_status jabber_pkt_iq( struct xt_node *node, gpointer data )
 		       ( c = xt_find_node( node->children, "ping" ) ) ) || /* O_o WHAT is wrong with just <query/> ????? */
 		    !( 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;
 		}
 		
@@ -124,7 +124,7 @@ xt_status jabber_pkt_iq( struct xt_node *node, gpointer data )
 		if( !( c = xt_find_node( node->children, "query" ) ) ||
 		    !( 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;
 		}
 		
@@ -146,7 +146,7 @@ xt_status jabber_pkt_iq( struct xt_node *node, gpointer data )
 			}
 			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 );
 				reply = jabber_make_error_packet( node, "not-allowed", "cancel" );
@@ -211,7 +211,7 @@ static xt_status jabber_do_iq_auth( struct im_connection *ic, struct xt_node *no
 	
 	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;
 	}
@@ -269,7 +269,7 @@ static xt_status jabber_finish_iq_auth( struct im_connection *ic, struct xt_node
 	
 	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;
 	}
@@ -345,7 +345,7 @@ static xt_status jabber_parse_roster( struct im_connection *ic, struct xt_node *
 	
 	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;
 	}
 	
diff --git a/protocols/jabber/jabber_util.c b/protocols/jabber/jabber_util.c
index 9d84e099..b84be49b 100644
--- a/protocols/jabber/jabber_util.c
+++ b/protocols/jabber/jabber_util.c
@@ -199,7 +199,7 @@ xt_status jabber_cache_handle_packet( struct im_connection *ic, struct xt_node *
 	
 	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 );
 	}
 	else if( entry->func )
diff --git a/protocols/jabber/presence.c b/protocols/jabber/presence.c
index c3d7dced..f2dca26c 100644
--- a/protocols/jabber/presence.c
+++ b/protocols/jabber/presence.c
@@ -49,7 +49,7 @@ xt_status jabber_pkt_presence( struct xt_node *node, gpointer data )
 		if( !( bud = jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT | GET_BUDDY_CREAT ) ) )
 		{
 			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;
 		}
 		
@@ -90,7 +90,7 @@ xt_status jabber_pkt_presence( struct xt_node *node, gpointer data )
 		if( ( bud = jabber_buddy_by_jid( ic, from, 0 ) ) == NULL )
 		{
 			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;
 		}
 		
diff --git a/protocols/msn/msn_util.c b/protocols/msn/msn_util.c
index 04ee799d..fae2877d 100644
--- a/protocols/msn/msn_util.c
+++ b/protocols/msn/msn_util.c
@@ -351,7 +351,7 @@ void msn_msgq_purge( struct im_connection *ic, GSList **list )
 	
 	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" );
 	
 	while( l )
diff --git a/protocols/oscar/service.c b/protocols/oscar/service.c
index 3a180780..acd09150 100644
--- a/protocols/oscar/service.c
+++ b/protocols/oscar/service.c
@@ -893,7 +893,7 @@ int aim_sendmemblock(aim_session_t *sess, aim_conn_t *conn, guint32 offset, guin
 			aimbs_put32(&fr->data, 0xecf8427e);
 */
 		} else
-			imcb_error(sess->aux_data, "WARNING: unknown hash request");
+			imcb_error(sess->aux_data, "Warning: unknown hash request");
 
 	}
 
diff --git a/protocols/oscar/txqueue.c b/protocols/oscar/txqueue.c
index 4416025a..d38986d0 100644
--- a/protocols/oscar/txqueue.c
+++ b/protocols/oscar/txqueue.c
@@ -79,7 +79,7 @@ static int aim_tx_enqueue__queuebased(aim_session_t *sess, aim_frame_t *fr)
 {
 
 	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);
 	}