Facebook: Various fixes

- Fix getting own name and avatar
- Improve login error messages
- Fix turning off chat on logout and improve logout procedure
- Improve some options text
- Remove "DisableLogout" hidden option
- Some code cleanup

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

1 files changed, 23 insertions, 18 deletions

diff --git a/protocols/FacebookRM/src/db.h b/protocols/FacebookRM/src/db.h
index 9802f09c9e..341cb06be2 100644
--- a/protocols/FacebookRM/src/db.h
+++ b/protocols/FacebookRM/src/db.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 

 #pragma once

 

-// DB keys

+// Contact DB keys

 #define FACEBOOK_KEY_LOGIN					"Email"

 #define FACEBOOK_KEY_ID						"ID"

 #define FACEBOOK_KEY_TID					"ThreadID"

@@ -36,6 +36,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define FACEBOOK_KEY_AVATAR					"Avatar"

 #define FACEBOOK_KEY_DELETED				"Deleted"

 #define FACEBOOK_KEY_CONTACT_TYPE			"ContactType"

+#define FACEBOOK_KEY_MESSAGE_ID				"LastMessageId"

+#define FACEBOOK_KEY_MESSAGE_READ			"MessageRead"

+

+// Contact and account DB keys

+#define FACEBOOK_KEY_KEEP_UNREAD			"KeepUnread"	// (byte) 1 = don't mark messages as read on server (works globally or per contact)

+

+// Account DB keys

 #define FACEBOOK_KEY_DEF_GROUP				"DefaultGroup"

 #define FACEBOOK_KEY_FORCE_HTTPS			"ForceHTTPS"

 #define FACEBOOK_KEY_FORCE_HTTPS_CHANNEL    "ForceHTTPSChannel"

@@ -46,33 +53,31 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define FACEBOOK_KEY_DISCONNECT_CHAT		"DisconnectChatEnable"

 #define FACEBOOK_KEY_MAP_STATUSES			"MapStatuses"

 #define FACEBOOK_KEY_CUSTOM_SMILEYS			"CustomSmileys"

-#define FACEBOOK_KEY_MESSAGE_ID				"LastMessageId"

 #define FACEBOOK_KEY_SERVER_TYPE			"ServerType"

 #define FACEBOOK_KEY_LOCAL_TIMESTAMP		"UseLocalTimestamp"

 #define FACEBOOK_KEY_PRIVACY_TYPE			"PrivacyType"

 #define FACEBOOK_KEY_PLACE					"Place"

 #define FACEBOOK_KEY_LAST_WALL				"LastWall"

 #define FACEBOOK_KEY_LOAD_PAGES				"LoadPages"

-#define FACEBOOK_KEY_KEEP_UNREAD			"KeepUnread"	// (byte) 1 = don't mark messages as read on server (works globally or per contact)

 #define FACEBOOK_KEY_INBOX_ONLY				"InboxOnly"

 #define FACEBOOK_KEY_FILTER_ADS				"FilterAds"

 #define FACEBOOK_KEY_MESSAGES_ON_OPEN		"MessagesOnOpen"

 #define FACEBOOK_KEY_MESSAGES_ON_OPEN_COUNT	"MessagesOnOpenCount"

 #define FACEBOOK_KEY_HIDE_CHATS				"HideChats"

-#define FACEBOOK_KEY_MESSAGE_READ			"MessageRead"

 

-#define FACEBOOK_KEY_POLL_RATE				"PollRate"					// [HIDDEN]

-#define FACEBOOK_KEY_TIMEOUTS_LIMIT			"TimeoutsLimit"				// [HIDDEN]

-#define FACEBOOK_KEY_DISABLE_LOGOUT			"DisableLogout"				// [HIDDEN]

-#define	FACEBOOK_KEY_LOCALE					"Locale"					// [HIDDEN] - en_US, cs_CZ, etc.

-#define FACEBOOK_KEY_LOCAL_TIMESTAMP_UNREAD	"UseLocalTimestampUnread"	// [HIDDEN] - 1 = use local timestamp for offline messages

-#define FACEBOOK_KEY_NASEEMS_SPAM_MODE		"NaseemsSpamMode"			// [HIDDEN] - 1 = don't load messages sent from other instances (e.g., browser) - known as "Naseem's spam mode"

-#define FACEBOOK_KEY_NAME_AS_NICK			"NameAsNick"				// [HIDDEN] - 0 = don't use real name as nickname, use nickname if possible

-#define FACEBOOK_KEY_OPEN_URL_BROWSER		"OpenUrlBrowser"			// [HIDDEN] - (unicode) = absolute path to browser to open url links with

-#define FACEBOOK_KEY_ENABLE_CHAT			"EnableChat"				// [HIDDEN] - 0 = don't use multi user chat at all (default is 1)

+// Account DB keys - notifications

+#define FACEBOOK_KEY_EVENT_NOTIFICATIONS_ENABLE	"EventNotificationsEnable"

+#define FACEBOOK_KEY_EVENT_FEEDS_ENABLE		"EventFeedsEnable"

+#define FACEBOOK_KEY_EVENT_OTHER_ENABLE		"EventOtherEnable"

+#define FACEBOOK_KEY_EVENT_CLIENT_ENABLE	"EventClientEnable"

+#define FACEBOOK_KEY_FEED_TYPE				"EventFeedsType"

 

-#define FACEBOOK_KEY_EVENT_NOTIFICATIONS_ENABLE     "EventNotificationsEnable"

-#define FACEBOOK_KEY_EVENT_FEEDS_ENABLE             "EventFeedsEnable"

-#define FACEBOOK_KEY_EVENT_OTHER_ENABLE             "EventOtherEnable"

-#define FACEBOOK_KEY_EVENT_CLIENT_ENABLE            "EventClientEnable"

-#define FACEBOOK_KEY_FEED_TYPE                      "EventFeedsType"

+// Hidden account DB keys (can't be changed through GUI)

+#define FACEBOOK_KEY_POLL_RATE				"PollRate"					// [HIDDEN] - (byte)

+#define FACEBOOK_KEY_TIMEOUTS_LIMIT			"TimeoutsLimit"				// [HIDDEN] - (byte)

+#define	FACEBOOK_KEY_LOCALE					"Locale"					// [HIDDEN] - (string) en_US, cs_CZ, etc.

+#define FACEBOOK_KEY_LOCAL_TIMESTAMP_UNREAD	"UseLocalTimestampUnread"	// [HIDDEN] - (byte) 1 = use local timestamp for offline messages

+#define FACEBOOK_KEY_NASEEMS_SPAM_MODE		"NaseemsSpamMode"			// [HIDDEN] - (byte) 1 = don't load messages sent from other instances (e.g., browser) - known as "Naseem's spam mode"

+#define FACEBOOK_KEY_NAME_AS_NICK			"NameAsNick"				// [HIDDEN] - (byte) 0 = don't use real name as nickname, use nickname if possible

+#define FACEBOOK_KEY_OPEN_URL_BROWSER		"OpenUrlBrowser"			// [HIDDEN] - (unicode) = absolute path to browser to open url links with

+#define FACEBOOK_KEY_ENABLE_CHAT			"EnableChat"				// [HIDDEN] - (byte) 0 = don't use multi user chat at all (default is 1)