- HANDLE hContact => HCONTACT

- GCF_* prefix was added to chat constants to avoid name conflicts

git-svn-id: http://svn.miranda-ng.org/main/trunk@8078 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 4 insertions, 4 deletions

diff --git a/plugins/SmileyAdd/src/dlgboxsubclass.cpp b/plugins/SmileyAdd/src/dlgboxsubclass.cpp
index aed46dc9c6..d46eb2da72 100644
--- a/plugins/SmileyAdd/src/dlgboxsubclass.cpp
+++ b/plugins/SmileyAdd/src/dlgboxsubclass.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // we are not supposed to use this object, so be aware

 typedef struct NewMessageWindowLParam 

 {

-	HANDLE hContact;

+	HCONTACT hContact;

 	int isSend;

 	const char *szInitialText;

 } 

@@ -56,7 +56,7 @@ public:
 	mutable HBITMAP hSmlBmp;

 	mutable HICON hSmlIco;

 	int idxLastChar;

-	HANDLE hContact;

+	HCONTACT hContact;

 	bool doSmileyReplace;

 	bool doSmileyButton;

 	bool OldButtonPlace;

@@ -290,7 +290,7 @@ static MsgWndData* IsMsgWnd(HWND hwnd)
 }

 

 

-static void MsgWndDetect(HWND hwndDlg, HANDLE hContact, msgData* datm)

+static void MsgWndDetect(HWND hwndDlg, HCONTACT hContact, msgData* datm)

 {

 	MsgWndData dat;

 

@@ -303,7 +303,7 @@ static void MsgWndDetect(HWND hwndDlg, HANDLE hContact, msgData* datm)
 		else dat.hContact = hContact;

 

 		// Get the protocol for this contact to display correct smileys.

-		char *protonam = GetContactProto( DecodeMetaContact(dat.hContact));

+		char *protonam = GetContactProto(DecodeMetaContact(dat.hContact));

 		if (protonam) {

 			strncpy(dat.ProtocolName, protonam, sizeof(dat.ProtocolName));

 			dat.ProtocolName[sizeof(dat.ProtocolName)-1] = 0;