diff options
| -rw-r--r-- | protocols/JabberG/src/jabber.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber.h | 1 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_bookmarks.cpp | 5 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_disco.cpp | 5 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_groupchat.cpp | 19 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_iqid.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_proto.cpp | 28 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_thread.cpp | 3 |
8 files changed, 22 insertions, 43 deletions
diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp index f329037b06..65fada8970 100644 --- a/protocols/JabberG/src/jabber.cpp +++ b/protocols/JabberG/src/jabber.cpp @@ -59,8 +59,6 @@ TIME_API tmi; CLIST_INTERFACE* pcli;
FI_INTERFACE *FIP = NULL;
-BOOL jabberChatDllPresent = FALSE;
-
HANDLE hExtraActivity = NULL;
HANDLE hExtraMood = NULL;
HANDLE hExtListInit, hDiscoInfoResult;
diff --git a/protocols/JabberG/src/jabber.h b/protocols/JabberG/src/jabber.h index 195d046210..fcfe626e32 100644 --- a/protocols/JabberG/src/jabber.h +++ b/protocols/JabberG/src/jabber.h @@ -575,7 +575,6 @@ private: * Global variables
*******************************************************************/
extern HINSTANCE hInst;
-extern BOOL jabberChatDllPresent;
extern HANDLE hExtraMood;
extern HANDLE hExtraActivity;
diff --git a/protocols/JabberG/src/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp index e47575cf42..7c4870ea80 100644 --- a/protocols/JabberG/src/jabber_bookmarks.cpp +++ b/protocols/JabberG/src/jabber_bookmarks.cpp @@ -329,11 +329,6 @@ void CJabberDlgBookmarks::OpenBookmark() if (item == NULL) return;
if ( !lstrcmpi(item->type, _T("conference"))) {
- if ( !jabberChatDllPresent) {
- JabberChatDllError();
- return;
- }
-
m_lvBookmarks.SetItemState(iItem, 0, LVIS_SELECTED); // Unselect the item
/* some hack for using bookmark to transport not under XEP-0048 */
diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp index 0d37905b25..a60607d121 100644 --- a/protocols/JabberG/src/jabber_disco.cpp +++ b/protocols/JabberG/src/jabber_disco.cpp @@ -1372,10 +1372,7 @@ void CJabberProto::ServiceDiscoveryShowMenu(CJabberSDNode *pNode, HTREELISTITEM break;
case SD_ACT_JOIN:
- if (jabberChatDllPresent)
- GroupchatJoinRoomByJid(m_pDlgServiceDiscovery->GetHwnd(), pNode->GetJid());
- else
- JabberChatDllError();
+ GroupchatJoinRoomByJid(m_pDlgServiceDiscovery->GetHwnd(), pNode->GetJid());
break;
case SD_ACT_BOOKMARK:
diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp index 04a2debf41..099e6eb7e3 100644 --- a/protocols/JabberG/src/jabber_groupchat.cpp +++ b/protocols/JabberG/src/jabber_groupchat.cpp @@ -178,10 +178,7 @@ private: INT_PTR __cdecl CJabberProto::OnMenuHandleJoinGroupchat(WPARAM, LPARAM)
{
- if (jabberChatDllPresent)
- GroupchatJoinRoomByJid(NULL, NULL);
- else
- JabberChatDllError();
+ GroupchatJoinRoomByJid(NULL, NULL);
return 0;
}
@@ -200,14 +197,12 @@ INT_PTR __cdecl CJabberProto::OnJoinChat(WPARAM wParam, LPARAM) ptrT password( JGetStringCrypt(hContact, "LoginPassword"));
if (getWord(hContact, "Status", 0) != ID_STATUS_ONLINE) {
- if ( !jabberChatDllPresent)
- JabberChatDllError();
- else {
- TCHAR *p = _tcschr(jid, '@');
- if (p != NULL) {
- *p++ = 0;
- GroupchatJoinRoom(p, jid, nick, password);
- } } }
+ TCHAR *p = _tcschr(jid, '@');
+ if (p != NULL) {
+ *p++ = 0;
+ GroupchatJoinRoom(p, jid, nick, password);
+ }
+ }
return 0;
}
diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index c8352f60b1..7fd1035a92 100644 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -128,7 +128,7 @@ void CJabberProto::OnProcessLoginRq(ThreadData* info, DWORD rq) if (info->jabberServerCaps & JABBER_CAPS_ARCHIVE_AUTO)
EnableArchive(m_options.EnableMsgArchive != 0);
- if (jabberChatDllPresent && m_options.AutoJoinBookmarks) {
+ if (m_options.AutoJoinBookmarks) {
LIST<JABBER_LIST_ITEM> ll(10);
LISTFOREACH(i, this, LIST_BOOKMARK)
{
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index 4d0a5631ba..6830a578f6 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -226,22 +226,18 @@ int CJabberProto::OnModulesLoadedEx(WPARAM, LPARAM) m_pInfoFrame = new CJabberInfoFrame(this);
- if (ServiceExists(MS_GC_REGISTER)) {
- jabberChatDllPresent = true;
-
- GCREGISTER gcr = {0};
- gcr.cbSize = sizeof(GCREGISTER);
- gcr.dwFlags = GC_TYPNOTIF | GC_CHANMGR | GC_TCHAR;
- gcr.iMaxText = 0;
- gcr.nColors = 16;
- gcr.pColors = &crCols[0];
- gcr.ptszModuleDispName = m_tszUserName;
- gcr.pszModule = m_szModuleName;
- CallServiceSync(MS_GC_REGISTER, NULL, (LPARAM)&gcr);
-
- HookProtoEvent(ME_GC_EVENT, &CJabberProto::JabberGcEventHook);
- HookProtoEvent(ME_GC_BUILDMENU, &CJabberProto::JabberGcMenuHook);
- }
+ GCREGISTER gcr = {0};
+ gcr.cbSize = sizeof(GCREGISTER);
+ gcr.dwFlags = GC_TYPNOTIF | GC_CHANMGR | GC_TCHAR;
+ gcr.iMaxText = 0;
+ gcr.nColors = 16;
+ gcr.pColors = &crCols[0];
+ gcr.ptszModuleDispName = m_tszUserName;
+ gcr.pszModule = m_szModuleName;
+ CallServiceSync(MS_GC_REGISTER, NULL, (LPARAM)&gcr);
+
+ HookProtoEvent(ME_GC_EVENT, &CJabberProto::JabberGcEventHook);
+ HookProtoEvent(ME_GC_BUILDMENU, &CJabberProto::JabberGcMenuHook);
HICON hIcon = LoadIconEx("main");
StatusIconData sid = { sizeof(sid) };
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index f8b8c67034..97962bbb13 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -552,8 +552,7 @@ recvRest: SendMessage(m_hwndJabberChangePassword, WM_COMMAND, MAKEWORD(IDCANCEL, 0), 0);
}
- if (jabberChatDllPresent)
- CallFunctionAsync(JabberOfflineChatWindows, this);
+ CallFunctionAsync(JabberOfflineChatWindows, this);
ListRemoveList(LIST_CHATROOM);
ListRemoveList(LIST_BOOKMARK);
|