Facebook: Rework popup behavior and options page

Now items in status menu/services are much more useful, as you can disable automatic loading of newsfeeds/notifications/on this day, but you can trigger it manually via status menu/services menu

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

1 files changed, 1 insertions, 17 deletions

diff --git a/protocols/FacebookRM/src/events.cpp b/protocols/FacebookRM/src/events.cpp
index f52385f30b..ce35ee55a0 100644
--- a/protocols/FacebookRM/src/events.cpp
+++ b/protocols/FacebookRM/src/events.cpp
@@ -32,57 +32,41 @@ HWND FacebookProto::NotifyEvent(TCHAR* title, TCHAR* info, MCONTACT contact, DWO
 	switch (flags)
 	{
 	case FACEBOOK_EVENT_CLIENT:
-		if (!getByte(FACEBOOK_KEY_EVENT_CLIENT_ENABLE, DEFAULT_EVENT_CLIENT_ENABLE))
-			return NULL;
 		mir_snprintf(name, "%s_%s", m_szModuleName, "Client");
 		flags |= NIIF_WARNING;
 		break;
 
 	case FACEBOOK_EVENT_NEWSFEED:
-		if (!getByte(FACEBOOK_KEY_EVENT_FEEDS_ENABLE, DEFAULT_EVENT_FEEDS_ENABLE))
-			return NULL;
 		mir_snprintf(name, "%s_%s", m_szModuleName, "Newsfeed");
-		SkinPlaySound("NewsFeed");
 		flags |= NIIF_INFO;
 		break;
 
 	case FACEBOOK_EVENT_NOTIFICATION:
-		if (!getByte(FACEBOOK_KEY_EVENT_NOTIFICATIONS_ENABLE, DEFAULT_EVENT_NOTIFICATIONS_ENABLE))
-			return NULL;
 		mir_snprintf(name, "%s_%s", m_szModuleName, "Notification");
 		SkinPlaySound("Notification");
 		flags |= NIIF_INFO;
 		break;
 
 	case FACEBOOK_EVENT_OTHER:
-		if (!getByte(FACEBOOK_KEY_EVENT_OTHER_ENABLE, DEFAULT_EVENT_OTHER_ENABLE))
-			return NULL;
 		mir_snprintf(name, "%s_%s", m_szModuleName, "Other");
 		SkinPlaySound("OtherEvent");
 		flags |= NIIF_INFO;
 		break;
 
 	case FACEBOOK_EVENT_FRIENDSHIP:
-		if (!getByte(FACEBOOK_KEY_EVENT_FRIENDSHIP_ENABLE, DEFAULT_EVENT_FRIENDSHIP_ENABLE))
-			return NULL;
 		mir_snprintf(name, "%s_%s", m_szModuleName, "Friendship");
 		SkinPlaySound("Friendship");
 		flags |= NIIF_INFO;
 		break;
 
 	case FACEBOOK_EVENT_TICKER:
-		if (!getByte(FACEBOOK_KEY_EVENT_TICKER_ENABLE, DEFAULT_EVENT_TICKER_ENABLE))
-			return NULL;
 		mir_snprintf(name, "%s_%s", m_szModuleName, "Ticker");
 		SkinPlaySound("Ticker");
 		flags |= NIIF_INFO;
 		break;
 
 	case FACEBOOK_EVENT_ON_THIS_DAY:
-		if (!getByte(FACEBOOK_KEY_EVENT_ON_THIS_DAY_ENABLE, DEFAULT_EVENT_ON_THIS_DAY_ENABLE))
-			return NULL;
-		mir_snprintf(name, "%s_%s", m_szModuleName, "OnThisDay");
-		SkinPlaySound("OnThisDay");
+		mir_snprintf(name, "%s_%s", m_szModuleName, "OnThisDay");		
 		flags |= NIIF_INFO;
 		break;
 	}