Mercurial > pidgin

changeset 27894:9ff5bf0dc670

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify
author Mark Doliner <mark@kingant.net>
date Thu, 13 Aug 2009 02:05:10 +0000
parents 3157a8ea0012
children 72bf514cef92
files libpurple/protocols/msn/cmdproc.c
diffstat 1 files changed, 3 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/cmdproc.c	Thu Aug 13 01:47:54 2009 +0000
+++ b/libpurple/protocols/msn/cmdproc.c	Thu Aug 13 02:05:10 2009 +0000
@@ -337,30 +337,19 @@
 	{
 		if (trans != NULL)
 		{
-			MsnErrorCb error_cb = NULL;
+			MsnErrorCb error_cb;
 			int error;
 
 			error = atoi(cmd->command);
 
-			if (trans->error_cb != NULL)
-				error_cb = trans->error_cb;
-
-			if (error_cb == NULL && cmdproc->cbs_table->errors != NULL)
+			error_cb = trans->error_cb;
+			if (error_cb == NULL)
 				error_cb = g_hash_table_lookup(cmdproc->cbs_table->errors, trans->command);
 
 			if (error_cb != NULL)
-			{
 				error_cb(cmdproc, trans, error);
-			}
 			else
-			{
-#if 1
 				msn_error_handle(cmdproc->session, error);
-#else
-				purple_debug_warning("msn", "Unhandled error '%s'\n",
-								   cmd->command);
-#endif
-			}
 
 			return;
 		}