summaryrefslogtreecommitdiff
path: root/protocols/Xfire
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/Xfire')
-rw-r--r--protocols/Xfire/src/Xfire_avatar_loader.cpp2
-rw-r--r--protocols/Xfire/src/Xfire_avatar_loader.h34
-rw-r--r--protocols/Xfire/src/baseProtocol.h4
-rw-r--r--protocols/Xfire/src/buddylist.cpp2
-rw-r--r--protocols/Xfire/src/buddylist.h2
-rw-r--r--protocols/Xfire/src/main.cpp86
-rw-r--r--protocols/Xfire/src/processbuddyinfo.cpp2
-rw-r--r--protocols/Xfire/src/processbuddyinfo.h2
-rw-r--r--protocols/Xfire/src/recvremovebuddypacket.h2
-rw-r--r--protocols/Xfire/src/userdetails.cpp20
10 files changed, 78 insertions, 78 deletions
diff --git a/protocols/Xfire/src/Xfire_avatar_loader.cpp b/protocols/Xfire/src/Xfire_avatar_loader.cpp
index 674329f762..b27b755059 100644
--- a/protocols/Xfire/src/Xfire_avatar_loader.cpp
+++ b/protocols/Xfire/src/Xfire_avatar_loader.cpp
@@ -66,7 +66,7 @@ void Xfire_avatar_loader::loadThread(LPVOID lparam) {
return;
}
-BOOL Xfire_avatar_loader::loadAvatar(HCONTACT hcontact,char*username,unsigned int userid)
+BOOL Xfire_avatar_loader::loadAvatar(MCONTACT hcontact,char*username,unsigned int userid)
{
Xfire_avatar_process process={0};
diff --git a/protocols/Xfire/src/Xfire_avatar_loader.h b/protocols/Xfire/src/Xfire_avatar_loader.h
index c6305270d1..92b89184e1 100644
--- a/protocols/Xfire/src/Xfire_avatar_loader.h
+++ b/protocols/Xfire/src/Xfire_avatar_loader.h
@@ -1,21 +1,21 @@
/*
* Plugin of miranda IM(ICQ) for Communicating with users of the XFire Network.
*
- * Copyright (C) 2009 by
- * dufte <dufte@justmail.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * Copyright (C) 2009 by
+ * dufte <dufte@justmail.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*
@@ -37,7 +37,7 @@
using namespace xfirelib;
struct Xfire_avatar_process {
- HCONTACT hcontact;
+ MCONTACT hcontact;
char username[128];
unsigned int userid;
};
@@ -50,7 +50,7 @@ private:
public:
vector<Xfire_avatar_process> list;
BOOL threadrunning;
- BOOL loadAvatar(HCONTACT hcontact,char*username,unsigned int userid);
+ BOOL loadAvatar(MCONTACT hcontact,char*username,unsigned int userid);
Xfire_avatar_loader(xfirelib::Client* client);
~Xfire_avatar_loader();
};
diff --git a/protocols/Xfire/src/baseProtocol.h b/protocols/Xfire/src/baseProtocol.h
index 64abc5720c..7bd05730a1 100644
--- a/protocols/Xfire/src/baseProtocol.h
+++ b/protocols/Xfire/src/baseProtocol.h
@@ -58,7 +58,7 @@ INT_PTR GetStatus(WPARAM wParam,LPARAM lParam);
INT_PTR TMLoadIcon(WPARAM wParam,LPARAM lParam);
INT_PTR SetNickName(WPARAM newnick, LPARAM lparam);
-BOOL IsXFireContact(HCONTACT h);
+BOOL IsXFireContact(MCONTACT h);
int displayPopup(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType,HICON hhicon=NULL);
BOOL CreateToolTip(int toolID, HWND hDlg, CHAR* pText);
void EnableDlgItem(HWND hwndDlg, UINT control, int state);
@@ -155,7 +155,7 @@ struct XFire_FoundGame
struct XFire_SetAvatar
{
- HCONTACT hContact;
+ MCONTACT hContact;
char* username;
};
diff --git a/protocols/Xfire/src/buddylist.cpp b/protocols/Xfire/src/buddylist.cpp
index a7f2ba8042..315c3e2a6e 100644
--- a/protocols/Xfire/src/buddylist.cpp
+++ b/protocols/Xfire/src/buddylist.cpp
@@ -36,7 +36,7 @@
//buddylist verarbeitung von der main in buddylist verschoben, um doppelte schleifenverarbeitung zuunterbinden
#include "baseProtocol.h"
-extern HCONTACT handlingBuddys(xfirelib::BuddyListEntry *entry, int clan=0,char* group=NULL,BOOL dontscan=FALSE);
+extern MCONTACT handlingBuddys(xfirelib::BuddyListEntry *entry, int clan=0,char* group=NULL,BOOL dontscan=FALSE);
extern void setBuddyStatusMsg(xfirelib::BuddyListEntry *entry);
namespace xfirelib {
diff --git a/protocols/Xfire/src/buddylist.h b/protocols/Xfire/src/buddylist.h
index ee6f2a22b4..13fdd0b02d 100644
--- a/protocols/Xfire/src/buddylist.h
+++ b/protocols/Xfire/src/buddylist.h
@@ -83,7 +83,7 @@ namespace xfirelib {
string gameinfo;
long game;
long game2;
- HCONTACT hcontact;
+ MCONTACT hcontact;
int clanid;
//lastpopup
diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp
index 51d217717f..e331f44302 100644
--- a/protocols/Xfire/src/main.cpp
+++ b/protocols/Xfire/src/main.cpp
@@ -148,13 +148,13 @@ INT_PTR RecvMessage(WPARAM wParam, LPARAM lParam);
INT_PTR SendMessage(WPARAM wParam, LPARAM lParam);
int FillList(WPARAM wParam, LPARAM lParam);
-HCONTACT CList_AddContact(XFireContact xfc, bool InList, bool SetOnline,int clan);
-HCONTACT CList_FindContact (int uid);
+MCONTACT CList_AddContact(XFireContact xfc, bool InList, bool SetOnline,int clan);
+MCONTACT CList_FindContact (int uid);
void CList_MakeAllOffline();
static INT_PTR UserIsTyping(WPARAM wParam, LPARAM lParam);
HANDLE LoadGameIcon(char* g, int id, HICON* ico,BOOL onyico=FALSE,char * gamename=NULL,int*uu=NULL);
BOOL GetAvatar(char* username,XFireAvatar* av);
-//void SetAvatar(HCONTACT hContact, char* username);
+//void SetAvatar(MCONTACT hContact, char* username);
static void SetAvatar(LPVOID lparam);
static INT_PTR GetIPPort(WPARAM /*wParam*/,LPARAM lParam);
static INT_PTR GetVIPPort(WPARAM /*wParam*/,LPARAM lParam);
@@ -187,7 +187,7 @@ INT_PTR SetAwayMsg(WPARAM wParam, LPARAM lParam);
INT_PTR GetXStatusIcon(WPARAM wParam, LPARAM lParam);
static INT_PTR GotoProfile2(WPARAM wParam,LPARAM lParam);
-HCONTACT handlingBuddys(BuddyListEntry *entry, int clan=0,char* group=NULL,BOOL dontscan=FALSE);
+MCONTACT handlingBuddys(BuddyListEntry *entry, int clan=0,char* group=NULL,BOOL dontscan=FALSE);
int StatusIcon(WPARAM wParam,LPARAM lParam);
void CreateGroup(char*grpn,char*field); //void CreateGroup(char*grp);
@@ -221,7 +221,7 @@ class XFireClient : public PacketListener {
void getBuddyList();
void sendmsg(char*usr,char*msg);
void setNick(char*nnick);
- void handlingBuddy(HCONTACT handle);
+ void handlingBuddy(MCONTACT handle);
void CheckAvatar(BuddyListEntry* entry);
private:
@@ -259,7 +259,7 @@ void XFireClient::CheckAvatar(BuddyListEntry* entry) {
}
}
-void XFireClient::handlingBuddy(HCONTACT handle)
+void XFireClient::handlingBuddy(MCONTACT handle)
{
vector<BuddyListEntry*> *entries = client->getBuddyList()->getEntries();
for(uint i = 0 ; i < entries->size() ; i ++) {
@@ -515,7 +515,7 @@ void XFireClient::sendmsg(char*usr,char*cmsg) {
db_free(&dbv);
}
CreateGroup(Translate(fofname),"fofgroup");
- HCONTACT hc=handlingBuddys(entry,-1,Translate(fofname));
+ MCONTACT hc=handlingBuddys(entry,-1,Translate(fofname));
if (hc)
{
CheckAvatar(entry);
@@ -609,7 +609,7 @@ void XFireClient::sendmsg(char*usr,char*cmsg) {
xfire_newc.nick=(char*)invite->nick.c_str();
xfire_newc.id=0;
- HCONTACT handle = CList_AddContact(xfire_newc,TRUE,TRUE,0);
+ MCONTACT handle = CList_AddContact(xfire_newc,TRUE,TRUE,0);
if (handle) { // invite nachricht mitsenden
string str = (char*)invite->msg.c_str();
@@ -999,7 +999,7 @@ int ExtraListRebuild(WPARAM wparam, LPARAM lparam)
int ExtraImageApply1(WPARAM wparam, LPARAM lparam)
{
- HCONTACT hContact = (HCONTACT)wparam;
+ MCONTACT hContact = (MCONTACT)wparam;
char *szProto = GetContactProto(hContact);
if (szProto != NULL && !lstrcmpiA(szProto, protocolname) && db_get_w(hContact, protocolname, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE) {
int gameid = db_get_w(hContact, protocolname, "GameId", 0);
@@ -1011,7 +1011,7 @@ int ExtraImageApply1(WPARAM wparam, LPARAM lparam)
int ExtraImageApply2(WPARAM wparam, LPARAM lparam)
{
- HCONTACT hContact=(HCONTACT)wparam;
+ MCONTACT hContact=(MCONTACT)wparam;
// TODO: maybe need to fix extra icons
char *szProto = GetContactProto(hContact);
if ( szProto != NULL && !lstrcmpiA( szProto, protocolname ) && db_get_w(hContact, protocolname, "Status", ID_STATUS_OFFLINE)!=ID_STATUS_OFFLINE) {
@@ -1327,17 +1327,17 @@ static void SetStatusLate( LPVOID param )
static void SendAck( LPVOID param )
{
- ProtoBroadcastAck(protocolname, (HCONTACT)param, ACKTYPE_MESSAGE, ACKRESULT_SUCCESS, (HANDLE) 1, 0);
+ ProtoBroadcastAck(protocolname, (MCONTACT)param, ACKTYPE_MESSAGE, ACKRESULT_SUCCESS, (HANDLE) 1, 0);
}
static void SendBadAck( LPVOID param )
{
- ProtoBroadcastAck(protocolname, (HCONTACT)param, ACKTYPE_MESSAGE, ACKRESULT_FAILED, (HANDLE) 0, LPARAM(Translate("XFire does not support offline messaging!")));
+ ProtoBroadcastAck(protocolname, (MCONTACT)param, ACKTYPE_MESSAGE, ACKRESULT_FAILED, (HANDLE) 0, LPARAM(Translate("XFire does not support offline messaging!")));
}
static INT_PTR UserIsTyping(WPARAM wParam, LPARAM lParam)
{
- HCONTACT hContact = (HCONTACT)wParam;
+ MCONTACT hContact = (MCONTACT)wParam;
DBVARIANT dbv;
if (lParam==PROTOTYPE_SELFTYPING_ON)
@@ -1595,15 +1595,15 @@ INT_PTR GetStatus(WPARAM wParam,LPARAM lParam)
return ID_STATUS_OFFLINE;
}
-HCONTACT CList_AddContact(XFireContact xfc, bool InList, bool SetOnline,int clan)
+MCONTACT CList_AddContact(XFireContact xfc, bool InList, bool SetOnline,int clan)
{
- HCONTACT hContact;
+ MCONTACT hContact;
if (xfc.username == NULL)
return 0;
// here we create a new one since no one is to be found
- hContact = (HCONTACT) CallService(MS_DB_CONTACT_ADD, 0, 0);
+ hContact = (MCONTACT) CallService(MS_DB_CONTACT_ADD, 0, 0);
if ( hContact ) {
CallService(MS_PROTO_ADDTOCONTACT, (WPARAM) hContact, (LPARAM)protocolname );
@@ -1665,7 +1665,7 @@ HCONTACT CList_AddContact(XFireContact xfc, bool InList, bool SetOnline,int clan
return false;
}
-BOOL IsXFireContact(HCONTACT hContact)
+BOOL IsXFireContact(MCONTACT hContact)
{
char *szProto = GetContactProto(hContact);
if (szProto != NULL && !lstrcmpiA(szProto, protocolname))
@@ -1674,9 +1674,9 @@ BOOL IsXFireContact(HCONTACT hContact)
return FALSE;
}
-HCONTACT CList_FindContact (int uid)
+MCONTACT CList_FindContact (int uid)
{
- for (HCONTACT hContact = db_find_first(protocolname); hContact; hContact = db_find_next(hContact, protocolname))
+ for (MCONTACT hContact = db_find_first(protocolname); hContact; hContact = db_find_next(hContact, protocolname))
if ( db_get_dw(hContact, protocolname, "UserId", -1) == uid)
return hContact;
@@ -1685,8 +1685,8 @@ HCONTACT CList_FindContact (int uid)
void CList_MakeAllOffline()
{
- vector<HCONTACT> fhandles;
- for (HCONTACT hContact = db_find_first(protocolname); hContact; hContact = db_find_next(hContact, protocolname)) {
+ vector<MCONTACT> fhandles;
+ for (MCONTACT hContact = db_find_first(protocolname); hContact; hContact = db_find_next(hContact, protocolname)) {
//freunde von freunden in eine seperate liste setzen
//nur wenn das nicht abgestellt wurde
if (db_get_b(hContact,protocolname,"friendoffriend",0)==1 && db_get_b(NULL,protocolname,"fofdbremove",0)==1)
@@ -1767,7 +1767,7 @@ void SetAvatar2(LPVOID lparam) {
}
void SetAvatar(LPVOID lparam)
-//void SetAvatar(HCONTACT hContact, char* username)
+//void SetAvatar(MCONTACT hContact, char* username)
{
//EnterCriticalSection(&avatarMutex);
//WaitForSingleObject(hMutex, INFINITE);
@@ -1929,14 +1929,14 @@ static INT_PTR GetIPPort(WPARAM wParam,LPARAM lParam)
HGLOBAL clipbuffer;
char* buffer;
- if (db_get_w((HCONTACT)wParam, protocolname, "Port", -1)==0)
+ if (db_get_w((MCONTACT)wParam, protocolname, "Port", -1)==0)
return 0;
DBVARIANT dbv;
- if (db_get_s((HCONTACT)wParam, protocolname, "ServerIP",&dbv))
+ if (db_get_s((MCONTACT)wParam, protocolname, "ServerIP",&dbv))
return 0;
- mir_snprintf(temp, SIZEOF(temp), "%s:%d", dbv.pszVal, db_get_w((HCONTACT)wParam, protocolname, "Port", -1));
+ mir_snprintf(temp, SIZEOF(temp), "%s:%d", dbv.pszVal, db_get_w((MCONTACT)wParam, protocolname, "Port", -1));
db_free(&dbv);
@@ -1962,14 +1962,14 @@ static INT_PTR GetVIPPort(WPARAM wParam,LPARAM lParam)
HGLOBAL clipbuffer;
char* buffer;
- if (db_get_w((HCONTACT)wParam, protocolname, "VPort", -1)==0)
+ if (db_get_w((MCONTACT)wParam, protocolname, "VPort", -1)==0)
return 0;
DBVARIANT dbv;
- if (db_get_s((HCONTACT)wParam, protocolname, "VServerIP",&dbv))
+ if (db_get_s((MCONTACT)wParam, protocolname, "VServerIP",&dbv))
return 0;
- mir_snprintf(temp, SIZEOF(temp), "%s:%d", dbv.pszVal, db_get_w((HCONTACT)wParam, protocolname, "VPort", -1));
+ mir_snprintf(temp, SIZEOF(temp), "%s:%d", dbv.pszVal, db_get_w((MCONTACT)wParam, protocolname, "VPort", -1));
db_free(&dbv);
@@ -1994,7 +1994,7 @@ static INT_PTR GotoProfile(WPARAM wParam,LPARAM lParam)
DBVARIANT dbv;
char temp[64]="";
- if (db_get_s((HCONTACT)wParam, protocolname, "Username",&dbv))
+ if (db_get_s((MCONTACT)wParam, protocolname, "Username",&dbv))
return 0;
strcpy(temp,"http://xfire.com/profile/");
@@ -2010,7 +2010,7 @@ static INT_PTR GotoXFireClanSite(WPARAM wParam,LPARAM lParam) {
DBVARIANT dbv;
char temp[64]="";
- int clanid=db_get_dw((HCONTACT)wParam, protocolname, "Clan",-1);
+ int clanid=db_get_dw((MCONTACT)wParam, protocolname, "Clan",-1);
mir_snprintf(temp, SIZEOF(temp), "ClanUrl_%d", clanid);
if (db_get_s(NULL, protocolname, temp,&dbv))
@@ -2071,7 +2071,7 @@ static INT_PTR GotoProfileAct(WPARAM wParam,LPARAM lParam)
int RebuildContactMenu( WPARAM wParam, LPARAM lParam )
{
- HCONTACT hContact = (HCONTACT)wParam;
+ MCONTACT hContact = (MCONTACT)wParam;
bool bEnabled = true, bEnabled2 = true;
DBVARIANT dbv;
@@ -2685,9 +2685,9 @@ void setBuddyStatusMsg(BuddyListEntry *entry)
}
}*/
-HCONTACT handlingBuddys(BuddyListEntry *entry, int clan,char*group,BOOL dontscan)
+MCONTACT handlingBuddys(BuddyListEntry *entry, int clan,char*group,BOOL dontscan)
{
- HCONTACT hContact;
+ MCONTACT hContact;
string game;
if (entry==NULL)
@@ -3254,14 +3254,14 @@ INT_PTR SendPrefs(WPARAM wparam, LPARAM lparam)
int ContactDeleted(WPARAM wParam,LPARAM lParam)
{
- if (!db_get_b((HCONTACT)wParam, protocolname, "DontSendDenyPacket", 0))
- if (db_get_b((HCONTACT)wParam,"CList","NotOnList",0))
+ if (!db_get_b((MCONTACT)wParam, protocolname, "DontSendDenyPacket", 0))
+ if (db_get_b((MCONTACT)wParam,"CList","NotOnList",0))
{
if (myClient!=NULL)
if (myClient->client->connected)
{
DBVARIANT dbv2;
- if (!db_get((HCONTACT)wParam,protocolname,"Username",&dbv2)) {
+ if (!db_get((MCONTACT)wParam,protocolname,"Username",&dbv2)) {
SendDenyInvitationPacket deny;
deny.name = dbv2.pszVal;
myClient->client->send( &deny );
@@ -3294,7 +3294,7 @@ INT_PTR RemoveFriend(WPARAM wParam,LPARAM lParam)
char temp[256];
DBVARIANT dbv;
- if (!db_get_s((HCONTACT)wParam, protocolname, "Username",&dbv))
+ if (!db_get_s((MCONTACT)wParam, protocolname, "Username",&dbv))
{
mir_snprintf(temp, SIZEOF(temp), Translate("Do you really want to delete your friend %s?"), dbv.pszVal);
if (MessageBoxA(NULL,temp,Translate("Confirm Delete"),MB_YESNO|MB_ICONQUESTION)==IDYES)
@@ -3305,7 +3305,7 @@ INT_PTR RemoveFriend(WPARAM wParam,LPARAM lParam)
{
SendRemoveBuddyPacket removeBuddy;
- removeBuddy.userid=db_get_dw((HCONTACT)wParam,protocolname,"UserId",0);
+ removeBuddy.userid=db_get_dw((MCONTACT)wParam,protocolname,"UserId",0);
if (removeBuddy.userid!=0)
{
@@ -3323,7 +3323,7 @@ INT_PTR BlockFriend(WPARAM wParam,LPARAM lParam)
{
DBVARIANT dbv;
- if (!db_get_s((HCONTACT)wParam, protocolname, "Username",&dbv))
+ if (!db_get_s((MCONTACT)wParam, protocolname, "Username",&dbv))
{
if (MessageBox(NULL,TranslateT("Block this user from ever contacting you again?"),TranslateT("Block Confirmation"),MB_YESNO|MB_ICONQUESTION)==IDYES)
{
@@ -3350,7 +3350,7 @@ INT_PTR StartThisGame(WPARAM wParam,LPARAM lParam) {
xgamelist.Block(TRUE);
//hole die gameid des spiels
- int id=db_get_w((HCONTACT)wParam, protocolname, "GameId",0);
+ int id=db_get_w((MCONTACT)wParam, protocolname, "GameId",0);
//hole passendes spielobjekt
Xfire_game*game=xgamelist.getGamebyGameid(id);
@@ -3370,7 +3370,7 @@ INT_PTR JoinGame(WPARAM wParam,LPARAM lParam) {
xgamelist.Block(TRUE);
//hole die gameid des spiels
- int id=db_get_w((HCONTACT)wParam, protocolname, "GameId",0);
+ int id=db_get_w((MCONTACT)wParam, protocolname, "GameId",0);
//hole passendes spielobjekt
Xfire_game*game=xgamelist.getGamebyGameid(id);
@@ -3379,8 +3379,8 @@ INT_PTR JoinGame(WPARAM wParam,LPARAM lParam) {
if (game)
{
DBVARIANT dbv; //dbv.pszVal
- int port=db_get_w((HCONTACT)wParam, protocolname, "Port",0);
- if (!db_get_s((HCONTACT)wParam, protocolname, "ServerIP",&dbv))
+ int port=db_get_w((MCONTACT)wParam, protocolname, "Port",0);
+ if (!db_get_s((MCONTACT)wParam, protocolname, "ServerIP",&dbv))
{
//starte spiel mit netzwerk parametern
game->start_game(dbv.pszVal,port);
diff --git a/protocols/Xfire/src/processbuddyinfo.cpp b/protocols/Xfire/src/processbuddyinfo.cpp
index 28eb283f66..014894cf54 100644
--- a/protocols/Xfire/src/processbuddyinfo.cpp
+++ b/protocols/Xfire/src/processbuddyinfo.cpp
@@ -27,7 +27,7 @@ extern HANDLE XFireAvatarFolder;
return h;
}*/
-void ProcessBuddyInfo(xfirelib::BuddyInfoPacket *buddyinfo,HCONTACT hcontact,char* username) {
+void ProcessBuddyInfo(xfirelib::BuddyInfoPacket *buddyinfo,MCONTACT hcontact,char* username) {
char temp[255] = "";
char filename[1024] = "";
BOOL dl=FALSE;
diff --git a/protocols/Xfire/src/processbuddyinfo.h b/protocols/Xfire/src/processbuddyinfo.h
index e4fad3b387..c9f3e396b9 100644
--- a/protocols/Xfire/src/processbuddyinfo.h
+++ b/protocols/Xfire/src/processbuddyinfo.h
@@ -4,4 +4,4 @@
#include "getbuddyinfo.h"
#include "buddyinfo.h"
-void ProcessBuddyInfo(xfirelib::BuddyInfoPacket *buddyinfo, HCONTACT hcontact,char* username); \ No newline at end of file
+void ProcessBuddyInfo(xfirelib::BuddyInfoPacket *buddyinfo, MCONTACT hcontact,char* username);
diff --git a/protocols/Xfire/src/recvremovebuddypacket.h b/protocols/Xfire/src/recvremovebuddypacket.h
index 842163ad1a..c617215d66 100644
--- a/protocols/Xfire/src/recvremovebuddypacket.h
+++ b/protocols/Xfire/src/recvremovebuddypacket.h
@@ -47,7 +47,7 @@ namespace xfirelib {
* (it will be set by the BuddyList, not when parsing the packet)
*/
std::string username;
- HCONTACT handle; // handle eingefügt, damit ich schnell den buddy killen kann - dufte
+ MCONTACT handle; // handle eingefügt, damit ich schnell den buddy killen kann - dufte
};
};
diff --git a/protocols/Xfire/src/userdetails.cpp b/protocols/Xfire/src/userdetails.cpp
index d2301f4fe6..1db5474f2f 100644
--- a/protocols/Xfire/src/userdetails.cpp
+++ b/protocols/Xfire/src/userdetails.cpp
@@ -61,7 +61,7 @@ void LoadProfilStatus(LPVOID lparam) {
delete[] lparam;
}
-void SetItemTxt(HWND hwndDlg,int feldid,char*feld,HCONTACT hcontact,int type)
+void SetItemTxt(HWND hwndDlg,int feldid,char*feld,MCONTACT hcontact,int type)
{
DBVARIANT dbv;
if (!db_get(hcontact,protocolname,feld,&dbv)) {
@@ -85,20 +85,20 @@ void SetItemTxt(HWND hwndDlg,int feldid,char*feld,HCONTACT hcontact,int type)
}
}
-static int GetIPPortUDetails(HCONTACT wParam,char* feld1,char* feld2)
+static int GetIPPortUDetails(MCONTACT wParam,char* feld1,char* feld2)
{
char temp[255];
HGLOBAL clipbuffer;
char* buffer;
- if (db_get_w((HCONTACT)wParam, protocolname, feld2, -1)==0)
+ if (db_get_w((MCONTACT)wParam, protocolname, feld2, -1)==0)
return 0;
DBVARIANT dbv;
- if (db_get_s((HCONTACT)wParam, protocolname, feld1,&dbv))
+ if (db_get_s((MCONTACT)wParam, protocolname, feld1,&dbv))
return 0;
- mir_snprintf(temp, SIZEOF(temp), "%s:%d", dbv.pszVal, db_get_w((HCONTACT)wParam, protocolname, feld2, -1));
+ mir_snprintf(temp, SIZEOF(temp), "%s:%d", dbv.pszVal, db_get_w((MCONTACT)wParam, protocolname, feld2, -1));
db_free(&dbv);
@@ -118,7 +118,7 @@ static int GetIPPortUDetails(HCONTACT wParam,char* feld1,char* feld2)
return 0;
}
-void addToList(HWND listbox,HCONTACT hContact,char*key,char*val)
+void addToList(HWND listbox,MCONTACT hContact,char*key,char*val)
{
DBVARIANT dbv;
if (!db_get(hContact,protocolname,val,&dbv))
@@ -185,7 +185,7 @@ static INT_PTR CALLBACK DlgProcUserDetails(HWND hwndDlg, UINT msg, WPARAM wParam
static WCHAR wpath[256];
static HICON gameicon=0;
static HICON voiceicon=0;
- static HCONTACT uhandle=0;
+ static MCONTACT uhandle=0;
static HWND listbox;
LVCOLUMNA pcol;
@@ -245,7 +245,7 @@ static INT_PTR CALLBACK DlgProcUserDetails(HWND hwndDlg, UINT msg, WPARAM wParam
case PSN_INFOCHANGED:
{
char* szProto;
- HCONTACT hContact = (HCONTACT)((LPPSHNOTIFY)lParam)->lParam;
+ MCONTACT hContact = (MCONTACT)((LPPSHNOTIFY)lParam)->lParam;
uhandle=hContact; //handle sichern
if (hContact == NULL)
@@ -370,7 +370,7 @@ static INT_PTR CALLBACK DlgProcUserDetails(HWND hwndDlg, UINT msg, WPARAM wParam
case PSN_INFOCHANGED:
{
char* szProto;
- HCONTACT hContact = (HCONTACT)((LPPSHNOTIFY)lParam)->lParam;
+ MCONTACT hContact = (MCONTACT)((LPPSHNOTIFY)lParam)->lParam;
if (hContact == NULL)
szProto = protocolname;
@@ -429,7 +429,7 @@ static INT_PTR CALLBACK DlgProcUserDetails(HWND hwndDlg, UINT msg, WPARAM wParam
int OnDetailsInit(WPARAM wParam,LPARAM lParam)
{
- if (!IsXFireContact((HCONTACT)lParam))
+ if (!IsXFireContact((MCONTACT)lParam))
return 0;
OPTIONSDIALOGPAGE odp = { sizeof(odp) };
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 22:55:48 +0000