5 files changed, 33 insertions, 31 deletions

diff --git a/protocols/Xfire/src/Xfire_avatar_loader.cpp b/protocols/Xfire/src/Xfire_avatar_loader.cpp
index 2e509d3b35..674329f762 100644
--- a/protocols/Xfire/src/Xfire_avatar_loader.cpp
+++ b/protocols/Xfire/src/Xfire_avatar_loader.cpp
@@ -66,7 +66,8 @@ void Xfire_avatar_loader::loadThread(LPVOID lparam) {
 	return;

 }

 

-BOOL Xfire_avatar_loader::loadAvatar(HANDLE hcontact,char*username,unsigned int userid) {

+BOOL Xfire_avatar_loader::loadAvatar(HCONTACT hcontact,char*username,unsigned int userid)

+{

 	Xfire_avatar_process process={0};

 

 	//struktur füllen

diff --git a/protocols/Xfire/src/Xfire_avatar_loader.h b/protocols/Xfire/src/Xfire_avatar_loader.h
index a51082629e..c6305270d1 100644
--- a/protocols/Xfire/src/Xfire_avatar_loader.h
+++ b/protocols/Xfire/src/Xfire_avatar_loader.h
@@ -37,7 +37,7 @@
 using namespace xfirelib;

 

 struct Xfire_avatar_process {

-	HANDLE hcontact;

+	HCONTACT hcontact;

 	char username[128];

 	unsigned int userid;

 };

@@ -50,7 +50,7 @@ private:
 public:

 	vector<Xfire_avatar_process> list;

 	BOOL threadrunning;

-	BOOL loadAvatar(HANDLE hcontact,char*username,unsigned int userid);

+	BOOL loadAvatar(HCONTACT hcontact,char*username,unsigned int userid);

 	Xfire_avatar_loader(xfirelib::Client* client);

 	~Xfire_avatar_loader();

 };

diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp
index bc9e744231..51d217717f 100644
--- a/protocols/Xfire/src/main.cpp
+++ b/protocols/Xfire/src/main.cpp
@@ -221,7 +221,7 @@ class XFireClient : public PacketListener {
 	void getBuddyList();

 	void sendmsg(char*usr,char*msg);

 	void setNick(char*nnick);

-	void handlingBuddy(HANDLE handle);

+	void handlingBuddy(HCONTACT handle);

 	void CheckAvatar(BuddyListEntry* entry);

 

   private:

@@ -259,11 +259,12 @@ void XFireClient::CheckAvatar(BuddyListEntry* entry) {
 	}

 }

 

-void XFireClient::handlingBuddy(HANDLE handle){

+void XFireClient::handlingBuddy(HCONTACT handle)

+{

 	vector<BuddyListEntry*> *entries = client->getBuddyList()->getEntries();

 	for(uint i = 0 ; i < entries->size() ; i ++) {

 		BuddyListEntry *entry = entries->at(i);

-		if (entry->hcontact==handle)

+		if (entry->hcontact == handle)

 		{

 			handlingBuddys(entry,0,NULL);

 			break;

@@ -1373,10 +1374,10 @@ INT_PTR SendMessage(WPARAM wParam, LPARAM lParam)
 		if (myClient->client->connected&&db_get_w(ccs->hContact, protocolname, "Status", -1)!=ID_STATUS_OFFLINE)

 		{

 			myClient->sendmsg(dbv.pszVal, ptrA( mir_utf8encode((char*)ccs->lParam)));

-			mir_forkthread(SendAck,ccs->hContact);

+			mir_forkthread(SendAck, (void*)ccs->hContact);

 			sended=1;

 		}

-		else mir_forkthread(SendBadAck,ccs->hContact);

+		else mir_forkthread(SendBadAck, (void*)ccs->hContact);

 

 	db_free(&dbv);

 	return sended;

@@ -1684,7 +1685,7 @@ HCONTACT CList_FindContact (int uid)
 

 void CList_MakeAllOffline()

 {

-	vector<HANDLE> fhandles;

+	vector<HCONTACT> fhandles;

 	for (HCONTACT 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

diff --git a/protocols/Xfire/src/recvremovebuddypacket.h b/protocols/Xfire/src/recvremovebuddypacket.h
index 87c75c0012..842163ad1a 100644
--- a/protocols/Xfire/src/recvremovebuddypacket.h
+++ b/protocols/Xfire/src/recvremovebuddypacket.h
@@ -29,26 +29,26 @@
 #define XFIRE_RECVREMOVEBUDDYPACKET 139
 
 namespace xfirelib {
-  class RecvRemoveBuddyPacket : public XFireRecvPacketContent {
-  public:
-    virtual ~RecvRemoveBuddyPacket() { }
-    int getPacketId() { return XFIRE_RECVREMOVEBUDDYPACKET; }
-
-    XFirePacketContent *newPacket() { return new RecvRemoveBuddyPacket(); }
-    void parseContent(char *buf, int length, int numberOfAtts);
-
-    long userid;
-
-    /**
-     * I've added this attribute altough it is not part of the actual packet
-     * because by the time the packet content reaches the client
-     * application the user will no longer be in the BuddyList .. so no
-     * way for the client application to know which buddy was just removed.
-     * (it will be set by the BuddyList, not when parsing the packet)
-     */
-    std::string username;
-	void* handle; // handle eingefügt, damit ich schnell den buddy killen kann - dufte
-  };
+	class RecvRemoveBuddyPacket : public XFireRecvPacketContent {
+	public:
+		virtual ~RecvRemoveBuddyPacket() { }
+		int getPacketId() { return XFIRE_RECVREMOVEBUDDYPACKET; }
+
+		XFirePacketContent *newPacket() { return new RecvRemoveBuddyPacket(); }
+		void parseContent(char *buf, int length, int numberOfAtts);
+
+		long userid;
+
+		/**
+		* I've added this attribute altough it is not part of the actual packet
+		* because by the time the packet content reaches the client
+		* application the user will no longer be in the BuddyList .. so no
+		* way for the client application to know which buddy was just removed.
+		* (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
+	};
 
 };
 
diff --git a/protocols/Xfire/src/userdetails.cpp b/protocols/Xfire/src/userdetails.cpp
index bb30eccb98..d2301f4fe6 100644
--- a/protocols/Xfire/src/userdetails.cpp
+++ b/protocols/Xfire/src/userdetails.cpp
@@ -85,7 +85,7 @@ void SetItemTxt(HWND hwndDlg,int feldid,char*feld,HCONTACT hcontact,int type)
 	}

 }

 

-static int GetIPPortUDetails(HANDLE wParam,char* feld1,char* feld2)

+static int GetIPPortUDetails(HCONTACT wParam,char* feld1,char* feld2)

 {

 	char temp[255];

     HGLOBAL clipbuffer;

@@ -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 HANDLE uhandle=0;

+	static HCONTACT uhandle=0;

 	static HWND listbox;

 	LVCOLUMNA pcol;