soc.2009.transport: 0dcf1c91: Fixed Ad-Hoc Commands

[hanzz at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 0dcf1c9187d398a246ba00598ccbcdec94448127
Ancestor: 1ab691af036fed0ccf287475afb4f53191a5dd16
Author: hanzz at soc.pidgin.im
Date: 2009-06-23T05:37:09
Branch: im.pidgin.soc.2009.transport
URL: http://d.pidgin.im/viewmtn/revision/info/0dcf1c9187d398a246ba00598ccbcdec94448127

Modified files:
        adhochandler.cpp

ChangeLog: 

Fixed Ad-Hoc Commands

-------------- next part --------------
============================================================
--- adhochandler.cpp	4540027637a1a7d64faaa9ec04e0098b26765d9b
+++ adhochandler.cpp	b978791f34b7a879fa9416525df64ba0eb5cb8ef
@@ -64,7 +64,7 @@ Disco::ItemList GlooxAdhocHandler::handl
 			User *user = main->userManager()->getUserByJID(from);
 			if (user) {
 				for(std::map<std::string, adhocCommand>::iterator u = m_handlers.begin(); u != m_handlers.end() ; u++) {
-					lst.push_back( new Disco::Item( main->jid(),(*u).first, (std::string) tr(user->getLang(), "transport_" + (*u).second.name) ) );
+					lst.push_back( new Disco::Item( main->jid(),"transport_" + (*u).first, (std::string) tr(user->getLang(), (*u).second.name) ) );
 				}
 				if (user->isConnected() && purple_account_get_connection(user->account())) {
 					PurpleConnection *gc = purple_account_get_connection(user->account());
@@ -78,7 +78,7 @@ Disco::ItemList GlooxAdhocHandler::handl
 						for (l = actions; l != NULL; l = l->next) {
 							if (l->data) {
 								action = (PurplePluginAction *) l->data;
-								lst.push_back( new Disco::Item( main->jid(), (std::string) tr(user->getLang(), action->label), "transport_" + (std::string) action->label ) );
+								lst.push_back( new Disco::Item( main->jid(), "transport_" + (std::string) action->label,(std::string) tr(user->getLang(), action->label) ) );
 								purple_plugin_action_free(action);
 							}
 						}
@@ -104,7 +104,7 @@ Disco::ItemList GlooxAdhocHandler::handl
 
 					for(l = ll = prpl_info->blist_node_menu((PurpleBlistNode*)buddy); l; l = l->next) {
 						PurpleMenuAction *action = (PurpleMenuAction *) l->data;
-						lst.push_back( new Disco::Item( _to.bare(), (std::string) tr(user->getLang(), action->label), "transport_" + (std::string) action->label ) );
+						lst.push_back( new Disco::Item( _to.bare(), "transport_" + (std::string) action->label, (std::string) tr(user->getLang(), action->label) ) );
 						purple_menu_action_free(action);
 					}
 				}