From 248b320bc7e6ce0cfd6621d47a95b55e2264dd23 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 27 Jun 2012 08:05:12 +0000
Subject: sync

git-svn-id: http://svn.miranda-ng.org/main/trunk@646 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Yahoo/services.cpp | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'protocols/Yahoo/services.cpp')

diff --git a/protocols/Yahoo/services.cpp b/protocols/Yahoo/services.cpp
index 363c000ad2..e36a27163c 100644
--- a/protocols/Yahoo/services.cpp
+++ b/protocols/Yahoo/services.cpp
@@ -34,7 +34,7 @@ void CYahooProto::logoff_buddies()
 	HANDLE hContact = ( HANDLE )YAHOO_CallService( MS_DB_CONTACT_FINDFIRST, 0, 0 );
 	while ( hContact != NULL ) 
 	{
-		if ( !lstrcmpA( m_szModuleName, ( char* )YAHOO_CallService( MS_PROTO_GETCONTACTBASEPROTO, ( WPARAM )hContact,0 ))) {
+		if (IsMyContact(hContact)) {
 			SetWord( hContact, "Status", ID_STATUS_OFFLINE );
 			SetDword(hContact, "IdleTS", 0);
 			SetDword(hContact, "PictLastCheck", 0);
@@ -87,7 +87,7 @@ void CYahooProto::BroadcastStatus(int s)
 //=======================================================
 //Contact deletion event
 //=======================================================
-INT_PTR __cdecl CYahooProto::OnContactDeleted( WPARAM wParam, LPARAM lParam )
+int __cdecl CYahooProto::OnContactDeleted( WPARAM wParam, LPARAM lParam )
 {
 	DBVARIANT dbv;
 	HANDLE hContact = (HANDLE) wParam;
@@ -340,7 +340,7 @@ INT_PTR __cdecl CYahooProto::OnRefreshCommand( WPARAM wParam, LPARAM lParam )
 	return 0;
 }
 
-INT_PTR __cdecl CYahooProto::OnIdleEvent(WPARAM wParam, LPARAM lParam)
+int __cdecl CYahooProto::OnIdleEvent(WPARAM wParam, LPARAM lParam)
 {
 	BOOL bIdle = (lParam & IDF_ISIDLE);
 
@@ -454,6 +454,14 @@ void CYahooProto::MenuMainInit( void )
 	mi.icolibItem = GetIconHandle( IDI_CALENDAR );
 	mi.pszName = LPGEN( "&Calendar" );
 	menuItemsAll[5] = Menu_AddProtoMenuItem(&mi);
+	strcpy( tDest, "/JoinChatRoom" );
+	YCreateService("/JoinChatRoom", &CYahooProto::CreateConference);
+
+	mi.position = 290018;
+	mi.icolibItem = GetIconHandle(IDI_YAHOO);
+	mi.pszName = LPGEN("Create Conference");
+	menuItemsAll[6] = Menu_AddProtoMenuItem(&mi);
+
 
 	// Show Refresh     
 	/*strcpy( tDest, YAHOO_REFRESH );
@@ -462,7 +470,7 @@ void CYahooProto::MenuMainInit( void )
 	mi.position = 500090015;
 	mi.icolibItem = GetIconHandle( IDI_REFRESH );
 	mi.pszName = LPGEN( "&Refresh" );
-	menuItemsAll[6] = Menu_AddProtoMenuItem(&mi);
+	menuItemsAll[7] = Menu_AddProtoMenuItem(&mi);
 	*/
 }
 	
@@ -497,16 +505,14 @@ void CYahooProto::MenuUninit( void )
 	YAHOO_CallService( MS_CLIST_REMOVECONTACTMENUITEM, ( WPARAM )hShowProfileMenuItem, 0 );
 }
 
-INT_PTR __cdecl CYahooProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM)
+int __cdecl CYahooProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM)
 {
     const HANDLE hContact = (HANDLE)wParam;
-	char *szProto;
 	
 	CLISTMENUITEM mi = {0};
 	mi.cbSize = sizeof(mi);
 
-    szProto = ( char* )YAHOO_CallService( MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0 );
-	if ( szProto == NULL || lstrcmpA( szProto, m_szModuleName ))  {
+	if (!IsMyContact(hContact))  {
 		DebugLog("[OnPrebuildContactMenu] Not a Yahoo Contact!!!");
 		return 0;
 	}
-- 
cgit v1.2.3