sync

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

3 files changed, 1 insertions, 25 deletions

diff --git a/protocols/IcqOscarJ/icq_menu.cpp b/protocols/IcqOscarJ/icq_menu.cpp
index 46da48ad1a..7b62c370f7 100644
--- a/protocols/IcqOscarJ/icq_menu.cpp
+++ b/protocols/IcqOscarJ/icq_menu.cpp
@@ -240,7 +240,7 @@ int CIcqProto::OnPreBuildContactMenu(WPARAM wParam, LPARAM)
 			!DBGetContactSettingByte(hContact, "CList", "NotOnList", 0));

 	}

 	

-	sttEnableMenuItem(g_hContactMenuItems[ICMI_OPEN_PROFILE],getContactUin(hContact));

+	sttEnableMenuItem(g_hContactMenuItems[ICMI_OPEN_PROFILE],getContactUin(hContact) != 0);

 	BYTE bXStatus = getContactXStatus((HANDLE)wParam);

 	

 	sttEnableMenuItem(g_hContactMenuItems[ICMI_XSTATUS_DETAILS], m_bHideXStatusUI ? 0 : bXStatus != 0);

diff --git a/protocols/IcqOscarJ/icq_proto.h b/protocols/IcqOscarJ/icq_proto.h
index ef33b456f6..329ab4d897 100644
--- a/protocols/IcqOscarJ/icq_proto.h
+++ b/protocols/IcqOscarJ/icq_proto.h
@@ -735,8 +735,6 @@ struct CIcqProto : public PROTO_INTERFACE
 	DWORD  icq_removeServerPrivacyItem(HANDLE hContact, DWORD dwUin, char *szUid, WORD wItemId, WORD wType);

 	DWORD  icq_addServerPrivacyItem(HANDLE hContact, DWORD dwUin, char *szUid, WORD wItemId, WORD wType);

 

-	time_t dwLastCListGroupsChange;

-

 	int __cdecl ServListDbSettingChanged(WPARAM wParam, LPARAM lParam);

 	int __cdecl ServListDbContactDeleted(WPARAM wParam, LPARAM lParam);

 	int __cdecl ServListCListGroupChange(WPARAM wParam, LPARAM lParam);

diff --git a/protocols/IcqOscarJ/icq_servlist.cpp b/protocols/IcqOscarJ/icq_servlist.cpp
index 9da5e3e756..5be3c895d8 100644
--- a/protocols/IcqOscarJ/icq_servlist.cpp
+++ b/protocols/IcqOscarJ/icq_servlist.cpp
@@ -2667,15 +2667,6 @@ int CIcqProto::ServListDbSettingChanged(WPARAM wParam, LPARAM lParam)
 {

 	DBCONTACTWRITESETTING* cws = (DBCONTACTWRITESETTING*)lParam;

 

-	// We can't upload changes to NULL contact

-	if ((HANDLE)wParam == NULL)

-	{ // only note last change of CListGroups - contact/group operation detection

-		if (!strcmpnull(cws->szModule, "CListGroups"))

-			dwLastCListGroupsChange = time(NULL);

-

-		return 0;

-	}

-

 	// TODO: Queue changes that occur while offline

 	if (!icqOnline() || !m_bSsiEnabled || bIsSyncingCL)

 		return 0;

@@ -2689,15 +2680,6 @@ int CIcqProto::ServListDbSettingChanged(WPARAM wParam, LPARAM lParam)
 

 	if (!strcmpnull(cws->szModule, "CList"))

 	{

-		// Has a temporary contact just been added permanently?

-		if (!strcmpnull(cws->szSetting, "NotOnList") &&

-			(cws->value.type == DBVT_DELETED || (cws->value.type == DBVT_BYTE && cws->value.bVal == 0)))

-		{ // Add to server-list

-			setContactHidden((HANDLE)wParam, 0);

-			if (getSettingByte(NULL, "ServerAddRemove", DEFAULT_SS_ADDSERVER))

-				AddServerContact(wParam, 0);

-		}

-

 		// Has contact been renamed?

 		if (!strcmpnull(cws->szSetting, "MyHandle") &&

 			getSettingByte(NULL, "StoreServerDetails", DEFAULT_SS_STORE))

@@ -2711,10 +2693,6 @@ int CIcqProto::ServListDbSettingChanged(WPARAM wParam, LPARAM lParam)
 		{ // Read group from DB

 			char* szNewGroup = getContactCListGroup((HANDLE)wParam);

 

-			// it is contact operation only ? no, if CListGroups was changed less than 10 secs ago

-			if (szNewGroup && (dwLastCListGroupsChange + 10 < time(NULL)))

-				servlistMoveContact((HANDLE)wParam, szNewGroup);

-

 			SAFE_FREE(&szNewGroup);

 		}

 	}