summaryrefslogtreecommitdiff
path: root/protocols/Tlen/src
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2013-08-19 06:23:18 +0000
committerKirill Volinsky <mataes2007@gmail.com>2013-08-19 06:23:18 +0000
commit6897c90c6003af7b21d271771320999ddfe2d09a (patch)
treec2ef69b0a53b4f5abfc1de48f48ca7292c2babb3 /protocols/Tlen/src
parent024260089ac38bdc8cbde65bdd047e6239fa8b46 (diff)
files renaming
compilation fix git-svn-id: http://svn.miranda-ng.org/main/trunk@5739 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Tlen/src')
-rw-r--r--protocols/Tlen/src/tlen.cpp16
-rw-r--r--protocols/Tlen/src/tlen.h (renamed from protocols/Tlen/src/jabber.h)2
-rw-r--r--protocols/Tlen/src/tlen_advsearch.cpp2
-rw-r--r--protocols/Tlen/src/tlen_avatar.cpp4
-rw-r--r--protocols/Tlen/src/tlen_file.cpp4
-rw-r--r--protocols/Tlen/src/tlen_file.h2
-rw-r--r--protocols/Tlen/src/tlen_iq.cpp (renamed from protocols/Tlen/src/jabber_iq.cpp)4
-rw-r--r--protocols/Tlen/src/tlen_iq.h (renamed from protocols/Tlen/src/jabber_iq.h)4
-rw-r--r--protocols/Tlen/src/tlen_iqid.cpp (renamed from protocols/Tlen/src/jabber_iqid.cpp)6
-rw-r--r--protocols/Tlen/src/tlen_list.cpp (renamed from protocols/Tlen/src/jabber_list.cpp)4
-rw-r--r--protocols/Tlen/src/tlen_list.h (renamed from protocols/Tlen/src/jabber_list.h)2
-rw-r--r--protocols/Tlen/src/tlen_misc.cpp (renamed from protocols/Tlen/src/jabber_misc.cpp)4
-rw-r--r--protocols/Tlen/src/tlen_muc.cpp12
-rw-r--r--protocols/Tlen/src/tlen_opt.cpp (renamed from protocols/Tlen/src/jabber_opt.cpp)4
-rw-r--r--protocols/Tlen/src/tlen_p2p_new.cpp2
-rw-r--r--protocols/Tlen/src/tlen_p2p_old.cpp2
-rw-r--r--protocols/Tlen/src/tlen_p2p_old.h2
-rw-r--r--protocols/Tlen/src/tlen_picture.cpp4
-rw-r--r--protocols/Tlen/src/tlen_picture.h2
-rw-r--r--protocols/Tlen/src/tlen_presence.cpp4
-rw-r--r--protocols/Tlen/src/tlen_svc.cpp (renamed from protocols/Tlen/src/jabber_svc.cpp)6
-rw-r--r--protocols/Tlen/src/tlen_thread.cpp (renamed from protocols/Tlen/src/jabber_thread.cpp)8
-rw-r--r--protocols/Tlen/src/tlen_userinfo.cpp4
-rw-r--r--protocols/Tlen/src/tlen_util.cpp (renamed from protocols/Tlen/src/jabber_util.cpp)4
-rw-r--r--protocols/Tlen/src/tlen_voice.cpp6
-rw-r--r--protocols/Tlen/src/tlen_voice.h2
-rw-r--r--protocols/Tlen/src/tlen_ws.cpp (renamed from protocols/Tlen/src/jabber_ws.cpp)2
-rw-r--r--protocols/Tlen/src/tlen_xml.cpp (renamed from protocols/Tlen/src/jabber_xml.cpp)2
-rw-r--r--protocols/Tlen/src/tlen_xml.h (renamed from protocols/Tlen/src/jabber_xml.h)0
29 files changed, 60 insertions, 60 deletions
diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp
index d03ad838b1..1206d4016c 100644
--- a/protocols/Tlen/src/tlen.cpp
+++ b/protocols/Tlen/src/tlen.cpp
@@ -21,12 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "commons.h"
-#include "jabber.h"
+#include "tlen.h"
#include "tlen_muc.h"
#include "tlen_file.h"
#include "tlen_voice.h"
-#include "jabber_list.h"
-#include "jabber_iq.h"
+#include "tlen_list.h"
+#include "tlen_iq.h"
#include "resource.h"
#include "tlen_picture.h"
#include <richedit.h>
@@ -53,7 +53,7 @@ PLUGININFOEX pluginInfoEx = {
{0x748f8934, 0x781a, 0x528d, { 0x52, 0x08, 0x00, 0x12, 0x65, 0x40, 0x4a, 0xb3 }}
};
-// Main jabber server connection thread global variables
+// Main tlen server connection thread global variables
BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpvReserved)
{
@@ -137,7 +137,7 @@ int TlenProtocol::PrebuildContactMenu(WPARAM wParam, LPARAM lParam)
return 0;
}
-int TlenProtocol::ContactMenuHandleRequestAuth(WPARAM wParam, LPARAM lParam)
+INT_PTR TlenProtocol::ContactMenuHandleRequestAuth(WPARAM wParam, LPARAM lParam)
{
HANDLE hContact = (HANDLE)wParam;
if (hContact != NULL && isOnline) {
@@ -150,7 +150,7 @@ int TlenProtocol::ContactMenuHandleRequestAuth(WPARAM wParam, LPARAM lParam)
return 0;
}
-int TlenProtocol::ContactMenuHandleGrantAuth(WPARAM wParam, LPARAM lParam)
+INT_PTR TlenProtocol::ContactMenuHandleGrantAuth(WPARAM wParam, LPARAM lParam)
{
HANDLE hContact = (HANDLE)wParam;
if (hContact != NULL && isOnline) {
@@ -163,7 +163,7 @@ int TlenProtocol::ContactMenuHandleGrantAuth(WPARAM wParam, LPARAM lParam)
return 0;
}
-int TlenProtocol::ContactMenuHandleSendPicture(WPARAM wParam, LPARAM lParam)
+INT_PTR TlenProtocol::ContactMenuHandleSendPicture(WPARAM wParam, LPARAM lParam)
{
HANDLE hContact = (HANDLE)wParam;
if (hContact != NULL && isOnline)
@@ -172,7 +172,7 @@ int TlenProtocol::ContactMenuHandleSendPicture(WPARAM wParam, LPARAM lParam)
return 0;
}
-int TlenProtocol::MenuHandleInbox(WPARAM wParam, LPARAM lParam)
+INT_PTR TlenProtocol::MenuHandleInbox(WPARAM wParam, LPARAM lParam)
{
char szFileName[ MAX_PATH ];
DBVARIANT dbv;
diff --git a/protocols/Tlen/src/jabber.h b/protocols/Tlen/src/tlen.h
index e8cd777b74..c2caef4230 100644
--- a/protocols/Tlen/src/jabber.h
+++ b/protocols/Tlen/src/tlen.h
@@ -83,7 +83,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_avatars.h>
#include <m_nudge.h>
-#include "jabber_xml.h"
+#include "tlen_xml.h"
#include "crypto/polarssl/aes.h"
#include "crypto/polarssl/bignum.h"
diff --git a/protocols/Tlen/src/tlen_advsearch.cpp b/protocols/Tlen/src/tlen_advsearch.cpp
index 5a338a3bd6..92611ac126 100644
--- a/protocols/Tlen/src/tlen_advsearch.cpp
+++ b/protocols/Tlen/src/tlen_advsearch.cpp
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
+#include "tlen.h"
#include "resource.h"
static void InitComboBox(HWND hwndCombo, JABBER_FIELD_MAP *fieldMap)
diff --git a/protocols/Tlen/src/tlen_avatar.cpp b/protocols/Tlen/src/tlen_avatar.cpp
index 340be5869c..a55c0321f0 100644
--- a/protocols/Tlen/src/tlen_avatar.cpp
+++ b/protocols/Tlen/src/tlen_avatar.cpp
@@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
-#include "jabber_list.h"
+#include "tlen.h"
+#include "tlen_list.h"
#include "tlen_avatar.h"
#include <stdio.h>
#include <io.h>
diff --git a/protocols/Tlen/src/tlen_file.cpp b/protocols/Tlen/src/tlen_file.cpp
index d45b2b014f..81bbbf298f 100644
--- a/protocols/Tlen/src/tlen_file.cpp
+++ b/protocols/Tlen/src/tlen_file.cpp
@@ -19,12 +19,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
+#include "tlen.h"
#include <io.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include "jabber_list.h"
+#include "tlen_list.h"
#include "tlen_p2p_old.h"
static void TlenFileReceiveParse(TLEN_FILE_TRANSFER *ft)
diff --git a/protocols/Tlen/src/tlen_file.h b/protocols/Tlen/src/tlen_file.h
index 1cd0704ea5..170c1b75ec 100644
--- a/protocols/Tlen/src/tlen_file.h
+++ b/protocols/Tlen/src/tlen_file.h
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define _TLEN_FILE_H_
#include <windows.h>
-#include "jabber.h"
+#include "tlen.h"
extern int TlenFileCancelAll(TlenProtocol *proto);
extern void TlenProcessF(XmlNode *node, ThreadData *userdata);
diff --git a/protocols/Tlen/src/jabber_iq.cpp b/protocols/Tlen/src/tlen_iq.cpp
index 01ce67129b..2b3431165e 100644
--- a/protocols/Tlen/src/jabber_iq.cpp
+++ b/protocols/Tlen/src/tlen_iq.cpp
@@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
-#include "jabber_iq.h"
+#include "tlen.h"
+#include "tlen_iq.h"
void JabberIqInit(TlenProtocol *proto)
diff --git a/protocols/Tlen/src/jabber_iq.h b/protocols/Tlen/src/tlen_iq.h
index d521c85c66..35be984430 100644
--- a/protocols/Tlen/src/jabber_iq.h
+++ b/protocols/Tlen/src/tlen_iq.h
@@ -23,8 +23,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef _JABBER_IQ_H_
#define _JABBER_IQ_H_
-#include "jabber_xml.h"
-#include "jabber.h"
+#include "tlen_xml.h"
+#include "tlen.h"
typedef void (*JABBER_IQ_PFUNC)(TlenProtocol *proto, XmlNode *iqNode);
diff --git a/protocols/Tlen/src/jabber_iqid.cpp b/protocols/Tlen/src/tlen_iqid.cpp
index 3a6cb87ec5..87893e2fc5 100644
--- a/protocols/Tlen/src/jabber_iqid.cpp
+++ b/protocols/Tlen/src/tlen_iqid.cpp
@@ -21,10 +21,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
+#include "tlen.h"
#include "resource.h"
-#include "jabber_list.h"
-#include "jabber_iq.h"
+#include "tlen_list.h"
+#include "tlen_iq.h"
#include "tlen_muc.h"
void JabberIqResultAuth(TlenProtocol *proto, XmlNode *iqNode)
diff --git a/protocols/Tlen/src/jabber_list.cpp b/protocols/Tlen/src/tlen_list.cpp
index de9fe21c78..7010a8e101 100644
--- a/protocols/Tlen/src/jabber_list.cpp
+++ b/protocols/Tlen/src/tlen_list.cpp
@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
-#include "jabber_list.h"
+#include "tlen.h"
+#include "tlen_list.h"
static void JabberListFreeItemInternal(JABBER_LIST_ITEM *item);
diff --git a/protocols/Tlen/src/jabber_list.h b/protocols/Tlen/src/tlen_list.h
index 30eb1abbdb..80b294e459 100644
--- a/protocols/Tlen/src/jabber_list.h
+++ b/protocols/Tlen/src/tlen_list.h
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
+#include "tlen.h"
#ifndef _JABBER_LIST_H_
#define _JABBER_LIST_H_
diff --git a/protocols/Tlen/src/jabber_misc.cpp b/protocols/Tlen/src/tlen_misc.cpp
index 631a6d7e99..f90bf62509 100644
--- a/protocols/Tlen/src/jabber_misc.cpp
+++ b/protocols/Tlen/src/tlen_misc.cpp
@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
-#include "jabber_list.h"
+#include "tlen.h"
+#include "tlen_list.h"
void JabberDBAddEvent(TlenProtocol *proto, HANDLE hContact, int eventType, DWORD flags, PBYTE pBlob, DWORD cbBlob)
{
diff --git a/protocols/Tlen/src/tlen_muc.cpp b/protocols/Tlen/src/tlen_muc.cpp
index fbf72e8ee6..393a19be27 100644
--- a/protocols/Tlen/src/tlen_muc.cpp
+++ b/protocols/Tlen/src/tlen_muc.cpp
@@ -19,9 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
-#include "jabber_list.h"
-#include "jabber_iq.h"
+#include "tlen.h"
+#include "tlen_list.h"
+#include "tlen_iq.h"
#include "resource.h"
#include "tlen_muc.h"
@@ -1000,7 +1000,7 @@ static int TlenMUCQueryContacts(TlenProtocol *proto, const char *roomId) {
return 1;
}
-int TlenProtocol::MUCMenuHandleMUC(WPARAM wParam, LPARAM lParam)
+INT_PTR TlenProtocol::MUCMenuHandleMUC(WPARAM wParam, LPARAM lParam)
{
if (!isOnline)
return 1;
@@ -1009,7 +1009,7 @@ int TlenProtocol::MUCMenuHandleMUC(WPARAM wParam, LPARAM lParam)
return 0;
}
-int TlenProtocol::MUCMenuHandleChats(WPARAM wParam, LPARAM lParam)
+INT_PTR TlenProtocol::MUCMenuHandleChats(WPARAM wParam, LPARAM lParam)
{
if (!isOnline)
return 1;
@@ -1023,7 +1023,7 @@ int TlenProtocol::MUCMenuHandleChats(WPARAM wParam, LPARAM lParam)
return 0;
}
-int TlenProtocol::MUCContactMenuHandleMUC(WPARAM wParam, LPARAM lParam)
+INT_PTR TlenProtocol::MUCContactMenuHandleMUC(WPARAM wParam, LPARAM lParam)
{
HANDLE hContact;
DBVARIANT dbv;
diff --git a/protocols/Tlen/src/jabber_opt.cpp b/protocols/Tlen/src/tlen_opt.cpp
index f73ac40f68..4c0be5e564 100644
--- a/protocols/Tlen/src/jabber_opt.cpp
+++ b/protocols/Tlen/src/tlen_opt.cpp
@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
-#include "jabber_list.h"
+#include "tlen.h"
+#include "tlen_list.h"
#include "tlen_voice.h"
#include <commctrl.h>
#include "resource.h"
diff --git a/protocols/Tlen/src/tlen_p2p_new.cpp b/protocols/Tlen/src/tlen_p2p_new.cpp
index 70ec288959..c09a1f61ba 100644
--- a/protocols/Tlen/src/tlen_p2p_new.cpp
+++ b/protocols/Tlen/src/tlen_p2p_new.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include "jabber_list.h"
+#include "tlen_list.h"
static void logInfo(const char *filename, const char *fmt, ...) {
diff --git a/protocols/Tlen/src/tlen_p2p_old.cpp b/protocols/Tlen/src/tlen_p2p_old.cpp
index da6217abbc..1f51178bd1 100644
--- a/protocols/Tlen/src/tlen_p2p_old.cpp
+++ b/protocols/Tlen/src/tlen_p2p_old.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include "jabber_list.h"
+#include "tlen_list.h"
void TlenP2PFreeFileTransfer(TLEN_FILE_TRANSFER *ft)
diff --git a/protocols/Tlen/src/tlen_p2p_old.h b/protocols/Tlen/src/tlen_p2p_old.h
index 4e2305310f..620d091351 100644
--- a/protocols/Tlen/src/tlen_p2p_old.h
+++ b/protocols/Tlen/src/tlen_p2p_old.h
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
+#include "tlen.h"
#ifndef _TLEN_P2P_OLD_H_
#define _TLEN_P2P_OLD_H_
diff --git a/protocols/Tlen/src/tlen_picture.cpp b/protocols/Tlen/src/tlen_picture.cpp
index 55c4a1c07d..407eb6067d 100644
--- a/protocols/Tlen/src/tlen_picture.cpp
+++ b/protocols/Tlen/src/tlen_picture.cpp
@@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
-#include "jabber_list.h"
+#include "tlen.h"
+#include "tlen_list.h"
#include "tlen_file.h"
#include "tlen_p2p_old.h"
diff --git a/protocols/Tlen/src/tlen_picture.h b/protocols/Tlen/src/tlen_picture.h
index ef98b02405..178134007d 100644
--- a/protocols/Tlen/src/tlen_picture.h
+++ b/protocols/Tlen/src/tlen_picture.h
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define _TLEN_PICTURE_H
#include <windows.h>
-#include "jabber.h"
+#include "tlen.h"
void TlenProcessPic(XmlNode *node, TlenProtocol *proto);
BOOL SendPicture(TlenProtocol *, HANDLE hContact);
diff --git a/protocols/Tlen/src/tlen_presence.cpp b/protocols/Tlen/src/tlen_presence.cpp
index 1207857241..a896635c59 100644
--- a/protocols/Tlen/src/tlen_presence.cpp
+++ b/protocols/Tlen/src/tlen_presence.cpp
@@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
-#include "jabber_list.h"
+#include "tlen.h"
+#include "tlen_list.h"
#include "tlen_avatar.h"
void TlenProcessPresence(XmlNode *node, TlenProtocol *proto)
diff --git a/protocols/Tlen/src/jabber_svc.cpp b/protocols/Tlen/src/tlen_svc.cpp
index 56df40f443..01388e7074 100644
--- a/protocols/Tlen/src/jabber_svc.cpp
+++ b/protocols/Tlen/src/tlen_svc.cpp
@@ -21,14 +21,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
+#include "tlen.h"
#include <io.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include "resource.h"
-#include "jabber_list.h"
-#include "jabber_iq.h"
+#include "tlen_list.h"
+#include "tlen_iq.h"
#include "tlen_p2p_old.h"
#include "tlen_avatar.h"
#include "tlen_file.h"
diff --git a/protocols/Tlen/src/jabber_thread.cpp b/protocols/Tlen/src/tlen_thread.cpp
index ab6130d1c5..4e26a83193 100644
--- a/protocols/Tlen/src/jabber_thread.cpp
+++ b/protocols/Tlen/src/tlen_thread.cpp
@@ -21,11 +21,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
+#include "tlen.h"
#include "commons.h"
-#include "jabber_list.h"
-#include "jabber_iq.h"
+#include "tlen_list.h"
+#include "tlen_iq.h"
#include "resource.h"
#include "tlen_p2p_old.h"
#include "tlen_file.h"
@@ -624,7 +624,7 @@ static void JabberProcessMessage(XmlNode *node, ThreadData *info)
if ((bodyNode=JabberXmlGetChild(node, "body")) != NULL) {
if (bodyNode->text != NULL) {
if ((subjectNode=JabberXmlGetChild(node, "subject")) != NULL && subjectNode->text != NULL && subjectNode->text[0] != '\0') {
- int size = strlen(subjectNode->text)+strlen(bodyNode->text)+5;
+ size_t size = strlen(subjectNode->text)+strlen(bodyNode->text)+5;
p = (char *)mir_alloc(size);
mir_snprintf(p, size, "%s\r\n%s", subjectNode->text, bodyNode->text);
localMessage = JabberTextDecode(p);
diff --git a/protocols/Tlen/src/tlen_userinfo.cpp b/protocols/Tlen/src/tlen_userinfo.cpp
index 8361bbee92..12e591dc97 100644
--- a/protocols/Tlen/src/tlen_userinfo.cpp
+++ b/protocols/Tlen/src/tlen_userinfo.cpp
@@ -21,13 +21,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
+#include "tlen.h"
#include <commctrl.h>
#include <io.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include "jabber_list.h"
+#include "tlen_list.h"
#include "resource.h"
#include "tlen_avatar.h"
diff --git a/protocols/Tlen/src/jabber_util.cpp b/protocols/Tlen/src/tlen_util.cpp
index 71a18155b6..ea054d882d 100644
--- a/protocols/Tlen/src/jabber_util.cpp
+++ b/protocols/Tlen/src/tlen_util.cpp
@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
-#include "jabber_list.h"
+#include "tlen.h"
+#include "tlen_list.h"
#include <ctype.h>
#include <win2k.h>
diff --git a/protocols/Tlen/src/tlen_voice.cpp b/protocols/Tlen/src/tlen_voice.cpp
index 2c81755c6d..4e9db3aa77 100644
--- a/protocols/Tlen/src/tlen_voice.cpp
+++ b/protocols/Tlen/src/tlen_voice.cpp
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
+#include "tlen.h"
#include <io.h>
#include <fcntl.h>
#include <sys/types.h>
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_button.h>
//#include <win2k.h>
#include "resource.h"
-#include "jabber_list.h"
+#include "tlen_list.h"
#include "tlen_voice.h"
#include "tlen_p2p_old.h"
#include "tlen_file.h"
@@ -697,7 +697,7 @@ int TlenVoiceCancelAll(TlenProtocol *proto)
return 0;
}
-int TlenProtocol::VoiceContactMenuHandleVoice(WPARAM wParam, LPARAM lParam)
+INT_PTR TlenProtocol::VoiceContactMenuHandleVoice(WPARAM wParam, LPARAM lParam)
{
HANDLE hContact;
DBVARIANT dbv;
diff --git a/protocols/Tlen/src/tlen_voice.h b/protocols/Tlen/src/tlen_voice.h
index cbd71aa1f1..b1f2a5e2a8 100644
--- a/protocols/Tlen/src/tlen_voice.h
+++ b/protocols/Tlen/src/tlen_voice.h
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <windows.h>
#include <mmsystem.h>
-#include "jabber.h"
+#include "tlen.h"
extern "C" {
#include "codec/gsm.h"
}
diff --git a/protocols/Tlen/src/jabber_ws.cpp b/protocols/Tlen/src/tlen_ws.cpp
index b1cb066d7a..f1931d5650 100644
--- a/protocols/Tlen/src/jabber_ws.cpp
+++ b/protocols/Tlen/src/tlen_ws.cpp
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
+#include "tlen.h"
BOOL JabberWsInit(TlenProtocol *proto)
{
diff --git a/protocols/Tlen/src/jabber_xml.cpp b/protocols/Tlen/src/tlen_xml.cpp
index 5786404dc6..2364bfcadd 100644
--- a/protocols/Tlen/src/jabber_xml.cpp
+++ b/protocols/Tlen/src/tlen_xml.cpp
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "jabber.h"
+#include "tlen.h"
#include <ctype.h>
static BOOL JabberXmlProcessElem(XmlState *xmlState, XmlElemType elemType, char *elemText, char *elemAttr);
diff --git a/protocols/Tlen/src/jabber_xml.h b/protocols/Tlen/src/tlen_xml.h
index 165a8fadc5..165a8fadc5 100644
--- a/protocols/Tlen/src/jabber_xml.h
+++ b/protocols/Tlen/src/tlen_xml.h