summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_groupchat.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/JabberG/src/jabber_groupchat.cpp')
-rw-r--r--protocols/JabberG/src/jabber_groupchat.cpp19
1 files changed, 7 insertions, 12 deletions
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;
}