From c494390841abd3b70e832f7f6f07ccadfeece96c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 27 Feb 2014 17:26:54 +0000 Subject: - removed option for copying mc history; - removed SavedDefault; - removed a bunch of terrors; - LPGEN for menu items returned back instead of Translate git-svn-id: http://svn.miranda-ng.org/main/trunk@8303 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/metacontacts/meta_main.cpp | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'src/modules/metacontacts/meta_main.cpp') diff --git a/src/modules/metacontacts/meta_main.cpp b/src/modules/metacontacts/meta_main.cpp index e8fc8f1366..d802a14db3 100644 --- a/src/modules/metacontacts/meta_main.cpp +++ b/src/modules/metacontacts/meta_main.cpp @@ -62,7 +62,6 @@ int LoadMetacontacts(void) db_set_resident(META_PROTO, "Status"); db_set_resident(META_PROTO, "IdleTS"); - db_set_resident(META_PROTO, "ContactCountCheck"); db_set_resident(META_PROTO, "Handle"); db_set_resident(META_PROTO, "WindowOpen"); @@ -70,13 +69,6 @@ int LoadMetacontacts(void) for (MCONTACT hContact = db_find_first(META_PROTO); hContact; hContact = db_find_next(hContact, META_PROTO)) { db_set_w(hContact, META_PROTO, "Status", ID_STATUS_OFFLINE); db_set_dw(hContact, META_PROTO, "IdleTS", 0); - db_set_b(hContact, META_PROTO, "ContactCountCheck", 0); - - // restore any saved defaults that might have remained if miranda was closed or crashed while a convo was happening - if (db_get_dw(hContact, META_PROTO, "SavedDefault", (DWORD)-1) != (DWORD)-1) { - db_set_dw(hContact, META_PROTO, "Default", db_get_dw(hContact, META_PROTO, "SavedDefault", 0)); - db_set_dw(hContact, META_PROTO, "SavedDefault", (DWORD)-1); - } } Meta_ReadOptions(&options); @@ -107,16 +99,8 @@ int LoadMetacontacts(void) CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd); // further db setup done in modules loaded (nick [protocol string required] & clist display name) - Meta_InitServices(); - // moved to 'modules loaded' event handler (in meta_services.c) because we need to - // check protocol for jabber hack, and the proto modules must be loaded - //Meta_HideLinkedContactsAndSetHandles(); - - if ( ServiceExists(MS_MSG_GETWINDOWAPI)) - message_window_api_enabled = TRUE; - // for clist_meta_mw - write hidden group name to DB db_set_s(0, META_PROTO, "HiddenGroupName", META_HIDDEN_GROUP); return 0; -- cgit v1.2.3