pidgin: f9a1fd3d: Simplify

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: f9a1fd3d9bc97ff89d91408f8f3ba4325005ad66
Ancestor: b9539e104c591c2ab83b282605eb3af7c4b3795c
Author: markdoliner at pidgin.im
Date: 2009-08-13T02:05:10
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f9a1fd3d9bc97ff89d91408f8f3ba4325005ad66

Modified files:
        libpurple/protocols/msn/cmdproc.c

ChangeLog: 

Simplify

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/cmdproc.c	013d8d58320a1b33c9f75028d6381e49bb80a6df
+++ libpurple/protocols/msn/cmdproc.c	16173c7d5f2918eb4fe9b75297dffa0cdcf84e1c
@@ -337,30 +337,19 @@ msn_cmdproc_process_cmd(MsnCmdProc *cmdp
 	{
 		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;
 		}