diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-11-19 20:01:52 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-11-19 20:01:52 +0000 |
| commit | ed78c5f078e4fb266c22845db4ab0eddc560d066 (patch) | |
| tree | ad613a99cd7228cb392f8162fe4f3908896220ae /protocols/JabberG/src/jabber_groupchat.cpp | |
| parent | 3344e2189f3585a9ac407b56aa78547b3f769bc8 (diff) | |
chats are always present in NG
git-svn-id: http://svn.miranda-ng.org/main/trunk@6942 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_groupchat.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_groupchat.cpp | 19 |
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;
}
|