From d385efebe356aebb92376fcd9c796a636df4be9a Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Fri, 20 Aug 2010 11:45:24 +0300 Subject: modified: init.cpp modified: messages.cpp modified: new_gpg.rc modified: options.cpp modified: resource.h modified: utilities.cpp --- utilities.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'utilities.cpp') diff --git a/utilities.cpp b/utilities.cpp index 2cef87e..eb14cae 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -313,7 +313,16 @@ int GetJabberInterface(WPARAM w, LPARAM l) //get interface for all jabber accoun if(JIftmp) { (*p)->setJabberInterface(JIftmp); - (*p)->setAccountName(accounts[i]->tszAccountName); + if(accounts[i]->tszAccountName) + { + TCHAR* tmp = mir_tstrdup(accounts[i]->tszAccountName); + (*p)->setAccountName(tmp); + } + else + { + TCHAR *tmp = mir_a2t(accounts[i]->szModuleName); + (*p)->setAccountName(tmp); + } (*p)->setAccountNumber(a); (*p)->setSendHandler(INVALID_HANDLE_VALUE); a++; @@ -328,6 +337,9 @@ int GetJabberInterface(WPARAM w, LPARAM l) //get interface for all jabber accoun static JABBER_HANDLER_FUNC SendHandler(IJabberInterface *ji, HXML node, void *pUserData) { + extern bool bJabberAPI; + if(!bJabberAPI) + return FALSE; HXML local_node = node; for(int n = 0; n <= xi.getChildCount(node); n++) { -- cgit v1.2.3