SkypeWeb: Blocked contacts add to miranda blocklist; Cleanup.

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

4 files changed, 3 insertions, 8 deletions

diff --git a/protocols/SkypeWeb/src/skype_contacts.cpp b/protocols/SkypeWeb/src/skype_contacts.cpp
index 9957c4d46b..cff325bc73 100644
--- a/protocols/SkypeWeb/src/skype_contacts.cpp
+++ b/protocols/SkypeWeb/src/skype_contacts.cpp
@@ -221,6 +221,7 @@ void CSkypeProto::LoadContactList(const NETLIBHTTPREQUEST *response)
 

 			node = json_get(item, "blocked");

 			setByte(hContact, "IsBlocked", json_as_bool(node));

+			db_set_dw(hContact, "Ignore", "Mask1", 127);

 

 			skypenames.insert(mir_strdup(skypename));

 		}

diff --git a/protocols/SkypeWeb/src/skype_menus.cpp b/protocols/SkypeWeb/src/skype_menus.cpp
index 775fe7b01c..29eccfacf7 100644
--- a/protocols/SkypeWeb/src/skype_menus.cpp
+++ b/protocols/SkypeWeb/src/skype_menus.cpp
@@ -120,7 +120,7 @@ int CSkypeProto::OnInitStatusMenu()
 	mir_strcpy(tDest, "/CreateNewChat");

 	CreateProtoService(tDest, &CSkypeProto::SvcCreateChat);

 	mi.ptszName = LPGENT("Create new chat");

-	mi.position = SMI_POSITION + PMI_CREATECHAT;

+	mi.position = SMI_POSITION + SMI_CREATECHAT;

 	mi.icolibItem = GetIconHandle("conference");

 	Menu_AddProtoMenuItem(&mi);

 

diff --git a/protocols/SkypeWeb/src/skype_menus.h b/protocols/SkypeWeb/src/skype_menus.h
index 99a15ef920..e04add88d3 100644
--- a/protocols/SkypeWeb/src/skype_menus.h
+++ b/protocols/SkypeWeb/src/skype_menus.h
@@ -29,12 +29,7 @@ enum
 };

 

 enum ProtoMenuIndexes {

-		PMI_CREATECHAT,

-		PMI_SETSTATUSMSG,

-		PMI_WALLPOST,

-		PMI_LOADVKNEWS,

-		PMI_VISITPROFILE,

-		PMI_COUNT

+		SMI_CREATECHAT

 };

 

 #define SMI_POSITION 200000

diff --git a/protocols/SkypeWeb/src/skype_messages.cpp b/protocols/SkypeWeb/src/skype_messages.cpp
index 97e87753b3..2bbb3bbe22 100644
--- a/protocols/SkypeWeb/src/skype_messages.cpp
+++ b/protocols/SkypeWeb/src/skype_messages.cpp
@@ -330,7 +330,6 @@ void CSkypeProto::MarkMessagesRead(MCONTACT hContact, MEVENT hDbEvent)
 {

 	debugLogA(__FUNCTION__);

 	ptrA username(db_get_sa(hContact, m_szModuleName, SKYPE_SETTINGS_ID));

-

 	DBEVENTINFO dbei = { sizeof(dbei) };

 

 	dbei.cbBlob = db_event_getBlobSize(hDbEvent);