From b43b50d64b57b2f41ffebe2f50eb5976152b9ad1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 18 Jun 2015 17:31:01 +0000 Subject: "Status" became resident for all protocols, in a constructor git-svn-id: http://svn.miranda-ng.org/main/trunk@14246 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/FacebookRM/src/proto.cpp | 1 - protocols/IRCG/src/ircproto.cpp | 2 -- protocols/IcqOscarJ/src/icq_proto.cpp | 1 - protocols/JabberG/src/jabber_proto.cpp | 2 -- protocols/MRA/src/MraProto.cpp | 1 - protocols/MSN/src/msn_proto.cpp | 1 - protocols/Sametime/src/sametime_proto.cpp | 1 - protocols/SkypeWeb/src/skype_proto.cpp | 1 - protocols/Steam/src/steam_proto.cpp | 1 - protocols/VKontakte/src/vk_proto.cpp | 2 -- protocols/WhatsApp/src/proto.cpp | 1 - protocols/Yahoo/src/services.cpp | 1 - src/mir_core/src/protos.cpp | 1 + 13 files changed, 1 insertion(+), 15 deletions(-) diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index c88b030eba..923a371f0a 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -79,7 +79,6 @@ FacebookProto::FacebookProto(const char* proto_name, const TCHAR* username) : HookProtoEvent(ME_GC_BUILDMENU, &FacebookProto::OnGCMenuHook); HookProtoEvent(ME_DB_EVENT_MARKED_READ, &FacebookProto::OnDbEventRead); - db_set_resident(m_szModuleName, "Status"); db_set_resident(m_szModuleName, "IdleTS"); db_set_resident(m_szModuleName, FACEBOOK_KEY_MESSAGE_READ); db_set_resident(m_szModuleName, FACEBOOK_KEY_MESSAGE_READERS); diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp index a29b5c9a6d..6df0a82319 100644 --- a/protocols/IRCG/src/ircproto.cpp +++ b/protocols/IRCG/src/ircproto.cpp @@ -68,8 +68,6 @@ CIrcProto::CIrcProto(const char* szModuleName, const TCHAR* tszUserName) : InitPrefs(); - db_set_resident(m_szModuleName, "Status"); - CList_SetAllOffline(true); IRC_MAP_ENTRY("PING", PING) diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp index 25bb80d2c2..7b672381ea 100644 --- a/protocols/IcqOscarJ/src/icq_proto.cpp +++ b/protocols/IcqOscarJ/src/icq_proto.cpp @@ -94,7 +94,6 @@ CIcqProto::CIcqProto(const char* aProtoName, const TCHAR* aUserName) : wCookieSeq = 2; // Initialize temporary DB settings - db_set_resident(m_szModuleName, "Status"); // NOTE: XStatus cannot be temporary db_set_resident(m_szModuleName, "TemporaryVisible"); db_set_resident(m_szModuleName, "TickTS"); db_set_resident(m_szModuleName, "IdleTS"); diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index 5b558257ef..df78bae751 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -136,9 +136,7 @@ CJabberProto::CJabberProto(const char *aProtoName, const TCHAR *aUserName) : m_pepServices.insert(new CPepMood(this)); m_pepServices.insert(new CPepActivity(this)); - db_set_resident(m_szModuleName, "Status"); db_set_resident(m_szModuleName, DBSETTING_DISPLAY_UID); - db_set_resident(m_szModuleName, "SubscriptionText"); db_set_resident(m_szModuleName, "Subscription"); db_set_resident(m_szModuleName, "Auth"); diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp index 702d23e347..bddac7dc98 100644 --- a/protocols/MRA/src/MraProto.cpp +++ b/protocols/MRA/src/MraProto.cpp @@ -94,7 +94,6 @@ int CMraProto::OnModulesLoaded(WPARAM, LPARAM) SetContactBasicInfoW(hContact, SCBIFSI_LOCK_CHANGES_EVENTS, (SCBIF_ID | SCBIF_GROUP_ID | SCBIF_SERVER_FLAG | SCBIF_STATUS), -1, -1, 0, 0, ID_STATUS_OFFLINE, 0, 0, 0); // unsaved values - db_set_resident(m_szModuleName, "Status");// NOTE: XStatus cannot be temporary db_set_resident(m_szModuleName, "LogonTS"); db_set_resident(m_szModuleName, "ContactID"); db_set_resident(m_szModuleName, "GroupID"); diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp index cccdb9064f..c5709e7fbd 100644 --- a/protocols/MSN/src/msn_proto.cpp +++ b/protocols/MSN/src/msn_proto.cpp @@ -47,7 +47,6 @@ CMsnProto::CMsnProto(const char* aProtoName, const TCHAR* aUserName) : lsAvatarQueue(1), msgCache(5, CompareId) { - db_set_resident(m_szModuleName, "Status"); db_set_resident(m_szModuleName, "IdleTS"); db_set_resident(m_szModuleName, "p2pMsgId"); db_set_resident(m_szModuleName, "MobileEnabled"); diff --git a/protocols/Sametime/src/sametime_proto.cpp b/protocols/Sametime/src/sametime_proto.cpp index 8b3a9f9843..446f477672 100644 --- a/protocols/Sametime/src/sametime_proto.cpp +++ b/protocols/Sametime/src/sametime_proto.cpp @@ -40,7 +40,6 @@ CSametimeProto::CSametimeProto(const char* pszProtoName, const TCHAR* tszUserNam HookProtoEvent(ME_OPT_INITIALISE, &CSametimeProto::OptInit); // Initialize temporary DB settings - db_set_resident(m_szModuleName, "Status"); db_set_resident(m_szModuleName, "IdleTS"); RegisterPopups(); diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp index 30febdd140..90b9715ca3 100644 --- a/protocols/SkypeWeb/src/skype_proto.cpp +++ b/protocols/SkypeWeb/src/skype_proto.cpp @@ -49,7 +49,6 @@ PROTO(protoName, userName), password(NULL) if (dwAttributes == 0xffffffff || (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) CreateDirectoryTreeT(m_tszAvatarFolder.c_str()); - db_set_resident(m_szModuleName, "Status"); db_set_resident(m_szModuleName, "LastAuthRequestTime"); //hooks diff --git a/protocols/Steam/src/steam_proto.cpp b/protocols/Steam/src/steam_proto.cpp index f613f339a2..9a36e5df52 100644 --- a/protocols/Steam/src/steam_proto.cpp +++ b/protocols/Steam/src/steam_proto.cpp @@ -39,7 +39,6 @@ CSteamProto::CSteamProto(const char* protoName, const TCHAR* userName) : IcoLib_AddIcon(&sid); // temporary DB settings - db_set_resident(m_szModuleName, "Status"); db_set_resident(m_szModuleName, "XStatusId"); db_set_resident(m_szModuleName, "XStatusName"); db_set_resident(m_szModuleName, "XStatusMsg"); diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp index e0143d6f53..45b1bc47cf 100644 --- a/protocols/VKontakte/src/vk_proto.cpp +++ b/protocols/VKontakte/src/vk_proto.cpp @@ -65,8 +65,6 @@ CVkProto::CVkProto(const char *szModuleName, const TCHAR *ptszUserName) : m_defaultGroup = mir_tstrdup(_T("VKontakte")); Clist_CreateGroup(NULL, m_defaultGroup); - db_set_resident(m_szModuleName, "Status"); - m_bServerDelivery = getBool("ServerDelivery", true); m_bHideChats = getBool("HideChats", true); m_bMesAsUnread = getBool("MesAsUnread", false); diff --git a/protocols/WhatsApp/src/proto.cpp b/protocols/WhatsApp/src/proto.cpp index 8dd01e8c35..13dc91d1d1 100644 --- a/protocols/WhatsApp/src/proto.cpp +++ b/protocols/WhatsApp/src/proto.cpp @@ -18,7 +18,6 @@ WhatsAppProto::WhatsAppProto(const char *proto_name, const TCHAR *username) { update_loop_lock_ = CreateEvent(NULL, false, false, NULL); - db_set_resident(m_szModuleName, "Status"); db_set_resident(m_szModuleName, "StatusMsg"); CreateProtoService(PS_CREATEACCMGRUI, &WhatsAppProto::SvcCreateAccMgrUI); diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp index 8877bd076b..d77b172cd6 100644 --- a/protocols/Yahoo/src/services.cpp +++ b/protocols/Yahoo/src/services.cpp @@ -526,7 +526,6 @@ void CYahooProto::LoadYahooServices(void) db_set_resident(m_szModuleName, "IdleTS"); db_set_resident(m_szModuleName, "PictLastCheck"); db_set_resident(m_szModuleName, "PictLoading"); - db_set_resident(m_szModuleName, "Status"); db_set_resident(m_szModuleName, "YAway"); db_set_resident(m_szModuleName, "YGMsg"); diff --git a/src/mir_core/src/protos.cpp b/src/mir_core/src/protos.cpp index ddddbec440..f3d3f79f63 100644 --- a/src/mir_core/src/protos.cpp +++ b/src/mir_core/src/protos.cpp @@ -106,6 +106,7 @@ MIR_CORE_DLL(void) ProtoConstructor(PROTO_INTERFACE *pThis, LPCSTR pszModuleName pThis->m_szModuleName = mir_strdup(pszModuleName); pThis->m_hProtoIcon = IcoLib_IsManaged(Skin_LoadProtoIcon(pszModuleName, ID_STATUS_ONLINE)); pThis->m_tszUserName = mir_tstrdup(ptszUserName); + db_set_resident(pThis->m_szModuleName, "Status"); } MIR_CORE_DLL(void) ProtoDestructor(PROTO_INTERFACE *pThis) -- cgit v1.2.3