- 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

6 files changed, 168 insertions, 289 deletions

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;

diff --git a/src/modules/metacontacts/meta_menu.cpp b/src/modules/metacontacts/meta_menu.cpp
index f231449c2c..545042a443 100644
--- a/src/modules/metacontacts/meta_menu.cpp
+++ b/src/modules/metacontacts/meta_menu.cpp
@@ -321,6 +321,7 @@ INT_PTR Meta_ForceDefault(WPARAM wParam, LPARAM lParam)
 int Meta_ModifyMenu(WPARAM wParam, LPARAM lParam)

 {

 	CLISTMENUITEM mi = { sizeof(mi) };

+	Menu_ShowItem(hMenuRoot, false);

 

 	if (db_get_dw(wParam, META_PROTO, META_ID, -1) != (DWORD)-1) {

 		// save the mouse pos in case they open a subcontact menu

@@ -334,7 +335,7 @@ int Meta_ModifyMenu(WPARAM wParam, LPARAM lParam)
 		Menu_ShowItem(hMenuDelete, false);

 

 		mi.flags = CMIM_NAME;

-		mi.pszName = LPGEN("Remove from MetaContact");

+		mi.pszName = LPGEN("Remove from metacontact");

 		Menu_ModifyItem(hMenuDelete, &mi);

 

 		//show subcontact menu items

@@ -397,7 +398,6 @@ int Meta_ModifyMenu(WPARAM wParam, LPARAM lParam)
 		CallService(MS_NUDGE_SHOWMENU, (WPARAM)META_PROTO, (LPARAM)ServiceExists(serviceFunc));

 	}

 	else { // This is a simple contact

-		Menu_ShowItem(hMenuRoot, false);

 		if (!Meta_IsEnabled()) {

 			// groups disabled - all meta menu options hidden

 			Menu_ShowItem(hMenuDefault, false);

@@ -411,7 +411,7 @@ int Meta_ModifyMenu(WPARAM wParam, LPARAM lParam)
 			Menu_ShowItem(hMenuDefault, true);

 

 			mi.flags = CMIM_NAME;

-			mi.pszName = LPGEN("Remove from MetaContact");

+			mi.pszName = LPGEN("Remove from metacontact");

 			Menu_ModifyItem(hMenuDelete, &mi);

 

 			Menu_ShowItem(hMenuAdd, false);

diff --git a/src/modules/metacontacts/meta_options.cpp b/src/modules/metacontacts/meta_options.cpp
index e51b4b63bc..8e87d8a22b 100644
--- a/src/modules/metacontacts/meta_options.cpp
+++ b/src/modules/metacontacts/meta_options.cpp
@@ -69,7 +69,9 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 			EnableWindow(hw, FALSE);

 		}

 

-		CheckDlgButton(hwndDlg, IDC_CHK_COPYHISTORY, options_changes.copy_subcontact_history ? TRUE : FALSE);

+		EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_COPYHISTORY), FALSE);

+		CheckDlgButton(hwndDlg, IDC_CHK_COPYHISTORY, FALSE);

+

 		hw = GetDlgItem(hwndDlg, IDC_ED_DAYS);

 		_itot(options_changes.days_history, buff, 10);

 		SetWindowText(hw, buff);

@@ -95,10 +97,6 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 				options_changes.suppress_status = IsDlgButtonChecked(hwndDlg, IDC_CHK_SUPPRESSSTATUS);

 				SendMessage( GetParent(hwndDlg), PSM_CHANGED, 0, 0);

 				break;

-			case IDC_CHK_COPYHISTORY:

-				options_changes.copy_subcontact_history = IsDlgButtonChecked(hwndDlg, IDC_CHK_COPYHISTORY);

-				SendMessage( GetParent(hwndDlg), PSM_CHANGED, 0, 0);

-				break;

 			case IDC_CHK_METAHISTORY:

 				options_changes.metahistory = IsDlgButtonChecked(hwndDlg, IDC_CHK_METAHISTORY);

 				SendMessage( GetParent(hwndDlg), PSM_CHANGED, 0, 0);

@@ -220,7 +218,6 @@ int Meta_WriteOptions(MetaOptions *opt)
 	db_set_w(NULL, META_PROTO, "MenuContactLabel", (WORD)opt->menu_contact_label);

 	db_set_w(NULL, META_PROTO, "MenuContactFunction", (WORD)opt->menu_function);

 	db_set_w(NULL, META_PROTO, "CListContactName", (WORD)opt->clist_contact_name);

-	db_set_b(NULL, META_PROTO, "CopyHistory", (BYTE)(opt->copy_subcontact_history ? 1 : 0));

 	db_set_dw(NULL, META_PROTO, "DaysHistory", (DWORD)(opt->days_history));

 	db_set_dw(NULL, META_PROTO, "SetStatusFromOfflineDelay", (DWORD)(opt->set_status_from_offline_delay));

 	db_set_b(NULL, META_PROTO, "SubcontactWindows", (BYTE)(opt->subcontact_windows ? 1 : 0));

@@ -252,7 +249,6 @@ int Meta_ReadOptions(MetaOptions *opt)
 	opt->menu_contact_label = (int)db_get_w(NULL, META_PROTO, "MenuContactLabel", DNT_UID);

 	opt->menu_function = (int)db_get_w(NULL, META_PROTO, "MenuContactFunction", FT_MENU);

 	opt->clist_contact_name = (int)db_get_w(NULL, META_PROTO, "CListContactName", CNNT_NICK);

-	opt->copy_subcontact_history = (db_get_b(NULL, META_PROTO, "CopyHistory", 1) == 1 ? TRUE : FALSE);

 	opt->days_history = (int)db_get_dw(NULL, META_PROTO, "DaysHistory", 0);

 	opt->set_status_from_offline_delay = (int)db_get_dw(NULL, META_PROTO, "SetStatusFromOfflineDelay", DEFAULT_SET_STATUS_SLEEP_TIME);

 	opt->subcontact_windows = (db_get_b(NULL, META_PROTO, "SubcontactWindows", 0) == 1 ? TRUE : FALSE);

@@ -604,3 +600,31 @@ INT_PTR CALLBACK DlgProcOptsPriorities(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 

 	return FALSE;

 }

+

+/////////////////////////////////////////////////////////////////////////////////////////

+

+int Meta_OptInit(WPARAM wParam, LPARAM lParam)

+{

+	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

+	odp.position = -790000000;

+	odp.hInstance = hInst;

+	odp.flags = ODPF_BOLDGROUPS;

+

+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_METAOPTIONS);

+	odp.pszTitle = LPGEN("MetaContacts");

+	odp.pszGroup = LPGEN("Contacts");

+	odp.pszTab = LPGEN("General");

+	odp.pfnDlgProc = DlgProcOpts;

+	Options_AddPage(wParam, &odp);

+

+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_METAPRIORITIES);

+	odp.pszTab = LPGEN("Priorities");

+	odp.pfnDlgProc = DlgProcOptsPriorities;

+	Options_AddPage(wParam, &odp);

+

+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_METAHISTORY);

+	odp.pszTab = LPGEN("History");

+	odp.pfnDlgProc = DlgProcOpts;

+	Options_AddPage(wParam, &odp);

+	return 0;

+}

diff --git a/src/modules/metacontacts/meta_services.cpp b/src/modules/metacontacts/meta_services.cpp
index e5a721e7da..f718756750 100644
--- a/src/modules/metacontacts/meta_services.cpp
+++ b/src/modules/metacontacts/meta_services.cpp
@@ -26,25 +26,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "metacontacts.h"

 

-#define PREF_METANODB	0x2000	//!< Flag to indicate message should not be added to db by filter when sending

+#define PREF_METANODB	0x2000	// Flag to indicate message should not be added to db by filter when sending

 

-char *pendingACK = 0;		//!< Name of the protocol in which an ACK is about to come.

+char *pendingACK = 0;		// Name of the protocol in which an ACK is about to come.

 

-int previousMode,			//!< Previous status of the MetaContacts Protocol

-	mcStatus;				//!< Current status of the MetaContacts Protocol

+int previousMode,			// Previous status of the MetaContacts Protocol

+	mcStatus;				// Current status of the MetaContacts Protocol

 

 HANDLE

-	hEventDefaultChanged, //!< \c HANDLE to the 'default changed' event

-	hEventForceSend,		 //!< \c HANDLE to the 'force send' event

-	hEventUnforceSend,    //!< \c HANDLE to the 'unforce send' event

-	hSubcontactsChanged,  //!< \c HANDLE to the 'contacts changed' event

+	hEventDefaultChanged, // HANDLE to the 'default changed' event

+	hEventForceSend,		 // HANDLE to the 'force send' event

+	hEventUnforceSend,    // HANDLE to the 'unforce send' event

+	hSubcontactsChanged,  // HANDLE to the 'contacts changed' event

 	hEventNudge;

 

 

 DWORD nextMetaID;	//!< Global variable specifying the ID value the next MetaContact will have.

 

-BOOL message_window_api_enabled = FALSE; //!< Global variable specifying whether the message window api ver 0.0.0.1+ is available

-

 // stuff for mw_clist extra icon

 HANDLE hExtraImage[MAX_PROTOCOLS * 2]; // online and offline icons

 char proto_names[MAX_PROTOCOLS * 128];

@@ -352,12 +350,10 @@ INT_PTR MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam)
 	MCONTACT hMeta;

 

 	// Can't find the MetaID of the metacontact linked to this contact, let through the protocol chain

-	if ((hMeta = (MCONTACT)db_get_dw(ccs->hContact, META_PROTO, "Handle", 0)) == 0)

+	if ((hMeta = db_get_dw(ccs->hContact, META_PROTO, "Handle", 0)) == 0)

 		return CallService(MS_PROTO_CHAINRECV, wParam, (LPARAM)ccs);

 

 	if (options.set_default_on_recv) {

-		if (options.temp_default && db_get_dw(hMeta, META_PROTO, "SavedDefault", (DWORD)-1) == (DWORD)-1)

-			db_set_dw(hMeta, META_PROTO, "SavedDefault", db_get_dw(hMeta, META_PROTO, "Default", 0));

 		db_set_dw(hMeta, META_PROTO, "Default", db_get_dw(ccs->hContact, META_PROTO, "ContactNumber", 0));

 		NotifyEventHooks(hEventDefaultChanged, (WPARAM)hMeta, (LPARAM)ccs->hContact); // nick set in event handler

 	}

@@ -368,10 +364,9 @@ INT_PTR MetaFilter_RecvMessage(WPARAM wParam,LPARAM lParam)
 

 		// add a clist event, so that e.g. there is an icon flashing

 		// (only add it when message api available, 'cause then we can remove the event when the message window is opened)

-		if (message_window_api_enabled

-			&& db_get_b(ccs->hContact, META_PROTO, "WindowOpen", 0) == 0

-			&& db_get_b(hMeta, META_PROTO, "WindowOpen", 0) == 0

-			&& options.flash_meta_message_icon)

+		if (db_get_b(ccs->hContact, META_PROTO, "WindowOpen", 0) == 0 &&

+			 db_get_b(hMeta, META_PROTO, "WindowOpen", 0) == 0 &&

+			 options.flash_meta_message_icon)

 		{

 			TCHAR toolTip[256];

 

@@ -856,40 +851,23 @@ int Meta_UserInfo(WPARAM wParam, LPARAM lParam)
 

 // handle message window api ver 0.0.0.1+ events - record window open/close status for subcontacts, so we know whether to

 // let received messages through and add db history to metacontact, or vice versa

-int Meta_MessageWindowEvent(WPARAM wParam, LPARAM lParam) {

+int Meta_MessageWindowEvent(WPARAM wParam, LPARAM lParam)

+{

 	MessageWindowEventData *mwed = (MessageWindowEventData *)lParam;

 	MCONTACT hMeta = 0;

 

-	message_window_api_enabled = TRUE;

-

-	if ((hMeta = (MCONTACT)db_get_dw(mwed->hContact, META_PROTO, "Handle", 0)) != 0

+	if ((hMeta = db_get_dw(mwed->hContact, META_PROTO, "Handle", 0)) != 0

 		|| db_get_dw(mwed->hContact, META_PROTO, META_ID, (DWORD)-1) != (DWORD)-1)

 	{

 		// contact is subcontact of metacontact, or an actual metacontact - record whether window is open or closed

 		if (mwed->uType == MSG_WINDOW_EVT_OPEN || mwed->uType == MSG_WINDOW_EVT_OPENING) {

 			db_set_b(mwed->hContact, META_PROTO, "WindowOpen", 1);

 

-			if (hMeta) { // subcontact window opened - remove clist events we added for metacontact

-				while(!CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hMeta, (LPARAM)mwed->hContact));

-			}

-		} else if (mwed->uType == MSG_WINDOW_EVT_CLOSE || mwed->uType == MSG_WINDOW_EVT_CLOSING) {

-			db_set_b(mwed->hContact, META_PROTO, "WindowOpen", 0);

-			if ( !hMeta) { // hMeta is 0 for metacontact (sorry)

-				DWORD saved_def;

-

-				MetaAPI_UnforceSendContact((WPARAM)mwed->hContact, 0);

-

-				// restore saved default contact

-				if (options.set_default_on_recv) {

-					saved_def = db_get_dw(mwed->hContact, META_PROTO, "SavedDefault", -1);

-					if (options.temp_default && saved_def != (DWORD)-1) {

-						db_set_dw(mwed->hContact, META_PROTO, "Default", saved_def);

-						db_set_dw(mwed->hContact, META_PROTO, "SavedDefault", (DWORD)-1);

-						NotifyEventHooks(hEventDefaultChanged, (WPARAM)mwed->hContact, (LPARAM)Meta_GetContactHandle(hMeta, saved_def)); // nick set in event handler

-					}

-				}

-			}

+			if (hMeta)  // subcontact window opened - remove clist events we added for metacontact

+				while(!CallService(MS_CLIST_REMOVEEVENT, hMeta, mwed->hContact));

 		}

+		else if (mwed->uType == MSG_WINDOW_EVT_CLOSE || mwed->uType == MSG_WINDOW_EVT_CLOSING)

+			db_set_b(mwed->hContact, META_PROTO, "WindowOpen", 0);

 	}

 

 	return 0;

@@ -907,9 +885,9 @@ int Meta_ClistDoubleClicked(WPARAM wParam, LPARAM lParam)
 

 	if (options.subcontact_windows) {

 		if (lParam) // contact from incoming message in lParam via (at this point) clist message event

-			CallService(MS_CLIST_CONTACTDOUBLECLICKED, (WPARAM)lParam, 0);

+			CallService(MS_CLIST_CONTACTDOUBLECLICKED, lParam, 0);

 		else // simulate double click on most_online contact and stop event processing

-			CallService(MS_CLIST_CONTACTDOUBLECLICKED, (WPARAM)most_online, 0);

+			CallService(MS_CLIST_CONTACTDOUBLECLICKED, most_online, 0);

 		return 1;

 	}

 

@@ -922,13 +900,13 @@ int Meta_ClistDoubleClicked(WPARAM wParam, LPARAM lParam)
 	strcat(buffer, PS_GETCAPS);

 

 	// get the contacts messaging capabilities

-	int caps = CallService(buffer, (WPARAM)PFLAGNUM_1, 0);

+	int caps = CallService(buffer, PFLAGNUM_1, 0);

 	if ((caps & PF1_IMSEND) || (caps & PF1_CHAT) || (proto && strcmp(proto, "IRC") == 0))

 		// let event process normally

 		return 0;

 

 	// simulate double click on most_online contact and stop event processing

-	CallService(MS_CLIST_CONTACTDOUBLECLICKED, (WPARAM)most_online, 0);

+	CallService(MS_CLIST_CONTACTDOUBLECLICKED, most_online, 0);

 	return 1;

 }

 

@@ -950,9 +928,6 @@ int NudgeRecieved(WPARAM wParam, LPARAM lParam)
 */

 int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam)

 {

-	if (ServiceExists(MS_MSG_GETWINDOWAPI))

-		message_window_api_enabled = TRUE;

-

 	// disable group hack for older nicer versions without the fix

 	if (ServiceExists(MS_CLUI_GETVERSION)) {

 		char *version = (char *)CallService(MS_CLUI_GETVERSION, 0, 0);

@@ -967,8 +942,7 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam)
 	InitMenus();

 

 	// hook srmm window close/open events - message api ver 0.0.0.1+

-	if (HookEvent(ME_MSG_WINDOWEVENT, Meta_MessageWindowEvent))

-		message_window_api_enabled = TRUE;

+	HookEvent(ME_MSG_WINDOWEVENT, Meta_MessageWindowEvent);

 

 	// hook protocol nudge events to forward to subcontacts

 	int numberOfProtocols;

@@ -1004,38 +978,29 @@ INT_PTR Meta_ContactMenuFunc(WPARAM wParam, LPARAM lParam)
 

 	if (options.menu_function == FT_MSG) {

 		// open message window if protocol supports message sending or chat, else simulate double click

-

-		int caps;

-		char *proto;

-		char buffer[512];

-

-		proto = GetContactProto(hContact);

-

+		char *proto = GetContactProto(hContact);

 		if (proto) {

+			char buffer[512];

 			strcpy(buffer, proto);

 			strcat(buffer, PS_GETCAPS);

 

-			caps = CallService(buffer, (WPARAM)PFLAGNUM_1, 0);

-

+			int caps = CallService(buffer, (WPARAM)PFLAGNUM_1, 0);

 			if ((caps & PF1_IMSEND) || (caps & PF1_CHAT) || (proto && strcmp(proto, "IRC") == 0)) {

 				// set default contact for sending/status and open message window

 				db_set_dw(wParam, META_PROTO, "Default", (DWORD)(int)lParam);

 				NotifyEventHooks(hEventDefaultChanged, wParam, (LPARAM)hContact);

 				CallService(MS_MSG_SENDMESSAGE, wParam, 0);

-			} else

-				// protocol does not support messaging - simulate double click

+			}

+			else // protocol does not support messaging - simulate double click

 				CallService(MS_CLIST_CONTACTDOUBLECLICKED, hContact, 0);

-		} else

-			// protocol does not support messaging - simulate double click

+		}

+		else // protocol does not support messaging - simulate double click

 			CallService(MS_CLIST_CONTACTDOUBLECLICKED, hContact, 0);

-

-	} else if (options.menu_function == FT_MENU) {

-		// show contact's context menu

+	}

+	else if (options.menu_function == FT_MENU) // show contact's context menu

 		CallFunctionAsync(sttMenuThread, (void*)hContact);

-	} else if (options.menu_function == FT_INFO) {

-		// show user info for subcontact

+	else if (options.menu_function == FT_INFO) // show user info for subcontact

 		CallService(MS_USERINFO_SHOWDIALOG, hContact, 0);

-	}

 

 	return 0;

 }

@@ -1171,56 +1136,28 @@ INT_PTR Meta_GetInfo(WPARAM wParam, LPARAM lParam)
 	return CallContactService(ccs->hContact, PSS_GETINFO, ccs->wParam, ccs->lParam);

 }

 

-int Meta_OptInit(WPARAM wParam, LPARAM lParam)

+int Meta_CallMostOnline(WPARAM hContact, LPARAM lParam)

 {

-	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

-	odp.position = -790000000;

-	odp.hInstance = hInst;

-	odp.flags = ODPF_BOLDGROUPS;

-

-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_METAOPTIONS);

-	odp.pszTitle = LPGEN("MetaContacts");

-	odp.pszGroup = LPGEN("Contacts");

-	odp.pszTab = LPGEN("General");

-	odp.pfnDlgProc = DlgProcOpts;

-	Options_AddPage(wParam, &odp);

-

-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_METAPRIORITIES);

-	odp.pszTab = LPGEN("Priorities");

-	odp.pfnDlgProc = DlgProcOptsPriorities;

-	Options_AddPage(wParam, &odp);

-

-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_METAHISTORY);

-	odp.pszTab = LPGEN("History");

-	odp.pfnDlgProc = DlgProcOpts;

-	Options_AddPage(wParam, &odp);

-	return 0;

-}

-

-int Meta_CallMostOnline(WPARAM wParam, LPARAM lParam)

-{

-	MCONTACT most_online_im = Meta_GetMostOnline(wParam);

+	MCONTACT most_online_im = Meta_GetMostOnline(hContact);

 

 	// fix nick

-	Meta_CopyContactNick(wParam, most_online_im);

+	Meta_CopyContactNick(hContact, most_online_im);

 

 	// fix status

-	Meta_FixStatus(wParam);

+	Meta_FixStatus(hContact);

 

 	// copy all other data

-	Meta_CopyData((MCONTACT) wParam);

+	Meta_CopyData(hContact);

 	return 0;

 }

 

-int Meta_PreShutdown(WPARAM wParam, LPARAM lParam) {

+int Meta_PreShutdown(WPARAM wParam, LPARAM lParam)

+{

 	Meta_SetStatus((WPARAM)ID_STATUS_OFFLINE, 0);

 	Meta_UnhideLinkedContacts();

 	Meta_SuppressStatus(FALSE);

-	//MessageBox(0, "Status is OFFLINE", "MC", MB_OK);

-	//MessageBox(0, "Preshutdown complete", "MC", MB_OK);

-

-	if (setStatusTimerId) KillTimer(0, setStatusTimerId);

-

+	if (setStatusTimerId)

+		KillTimer(0, setStatusTimerId);

 	return 0;

 }

 

diff --git a/src/modules/metacontacts/meta_utils.cpp b/src/modules/metacontacts/meta_utils.cpp
index 74da8a74a9..dfb7be0685 100644
--- a/src/modules/metacontacts/meta_utils.cpp
+++ b/src/modules/metacontacts/meta_utils.cpp
@@ -355,9 +355,8 @@ BOOL Meta_Assign(MCONTACT src, MCONTACT dest, BOOL set_as_default)
 	// Hide the contact

 	Meta_SetGroup(src);

 

-	// copy history

-	if (options.copy_subcontact_history)

-		copyHistory(src, dest);

+	// !!!!!!!!!!!!!!!!!!!!!!!!!

+	// copyHistory(src, dest);

 

 	// Ignore status if the option is on

 	if (options.suppress_status)

@@ -699,8 +698,8 @@ int Meta_SetHandles(void)
 	TCHAR nick_buffer[128], buffer2[40];

 	BOOL found;

 

-	while ( hContact != NULL ) {

-		if ((meta_id = db_get_dw(hContact, META_PROTO, META_LINK,(DWORD)-1))!=(DWORD)-1) {

+	while (hContact != NULL) {

+		if ((meta_id = db_get_dw(hContact, META_PROTO, META_LINK, (DWORD)-1)) != (DWORD)-1) {

 			// is a subcontact

 

 			// get nick for debug messages

@@ -718,7 +717,7 @@ int Meta_SetHandles(void)
 				hNextContact = db_find_next(hContact);

 				Meta_Delete(hContact, (LPARAM)1);

 				hContact = hNextContact;

-				continue;		

+				continue;

 				//return 1;

 			}

 

@@ -729,16 +728,16 @@ int Meta_SetHandles(void)
 			found = FALSE;

 			hContact2 = db_find_first();

 

-			while ( hContact2 != NULL ) {

-				if (db_get_dw(hContact2, META_PROTO, META_ID,(DWORD)-1) == meta_id) {

+			while (hContact2 != NULL) {

+				if (db_get_dw(hContact2, META_PROTO, META_ID, (DWORD)-1) == meta_id) {

 					found = TRUE;

 

 					// set handle

 					db_set_dw(hContact, META_PROTO, "Handle", (DWORD)hContact2);

 

 					// increment contact counter (cleared in Load function)

-					db_set_b(hContact2, META_PROTO, "ContactCountCheck", 

-						(unsigned char)(db_get_b(hContact2, META_PROTO, "ContactCountCheck", 0) + 1));

+					db_set_b(hContact2, META_PROTO, "ContactCountCheck",

+								(unsigned char)(db_get_b(hContact2, META_PROTO, "ContactCountCheck", 0) + 1));

 

 					num_contacts = db_get_dw(hContact2, META_PROTO, "NumContacts", (DWORD)-1);

 					if (contact_number >= 0 && contact_number < num_contacts) {

@@ -757,14 +756,14 @@ int Meta_SetHandles(void)
 						hNextContact = db_find_next(hContact);

 						Meta_Delete(hContact, (LPARAM)1);

 						hContact = hNextContact;

-						continue;		

+						continue;

 					}

 				}

 

 				hContact2 = db_find_next(hContact2);

 			}

 

-			if ( !found) {

+			if (!found) {

 				// problem - subcontact's meta not found

 				MessageBox(0, TranslateT("Subcontact's MetaContact not found - deleting MetaContact data"), nick_buffer, MB_OK | MB_ICONERROR);

 

@@ -782,13 +781,13 @@ int Meta_SetHandles(void)
 

 			}

 			else {

-				if ( !db_get_b(hContact, META_PROTO, "IsSubcontact", 0))

+				if (!db_get_b(hContact, META_PROTO, "IsSubcontact", 0))

 					db_set_b(hContact, META_PROTO, "IsSubcontact", 1);

 			}

 		}

 		else db_unset(hContact, META_PROTO, "Handle");

 

-		if ((meta_id = db_get_dw(hContact, META_PROTO, META_ID,(DWORD)-1))!=(DWORD)-1) {

+		if ((meta_id = db_get_dw(hContact, META_PROTO, META_ID, (DWORD)-1)) != (DWORD)-1) {

 			// is a metacontact

 

 			// get nick for debug messages

@@ -808,7 +807,7 @@ int Meta_SetHandles(void)
 				hNextContact = db_find_next(hContact);

 				Meta_Delete(hContact, (LPARAM)1);

 				hContact = hNextContact;

-				continue;		

+				continue;

 			}

 

 			if (contact_number < 0 || contact_number >= num_contacts) {

@@ -817,7 +816,7 @@ int Meta_SetHandles(void)
 				hNextContact = db_find_next(hContact);

 				Meta_Delete(hContact, (LPARAM)1);

 				hContact = hNextContact;

-				continue;		

+				continue;

 			}

 		}

 

@@ -826,8 +825,8 @@ int Meta_SetHandles(void)
 

 	// loop through one more time - check contact counts match

 	hContact = db_find_first();

-	while ( hContact != NULL ) {

-		if ((meta_id = db_get_dw(hContact, META_PROTO, META_ID,(DWORD)-1))!=(DWORD)-1) {

+	while (hContact != NULL) {

+		if ((meta_id = db_get_dw(hContact, META_PROTO, META_ID, (DWORD)-1)) != (DWORD)-1) {

 			// get nick for debug messages

 

 			num_contacts = db_get_b(hContact, META_PROTO, "ContactCountCheck", -2);

@@ -837,10 +836,10 @@ int Meta_SetHandles(void)
 				_tcscpy(nick_buffer, TranslateT("Meta ID: "));

 				_tcscat(nick_buffer, _itot(meta_id, buffer2, 10));

 				MessageBox(0, TranslateT("MetaContact corrupted - the number of subcontacts is incorrect.\nDeleting MetaContact."), nick_buffer, MB_OK | MB_ICONERROR);

-				

+

 				Meta_Delete(hContact, (LPARAM)1);

 				hContact = hNextContact;

-				continue;		

+				continue;

 			}

 		}

 		hContact = db_find_next(hContact);

@@ -864,7 +863,8 @@ MetaContacts continues to function correctly, you should:\n\
    - synchronize your contacts with the server\n\

    - re-enable MetaContacts")

 

-int Meta_HideLinkedContacts(void) {

+int Meta_HideLinkedContacts(void)

+{

 	DBVARIANT dbv, dbv2;

 	DWORD meta_id, num_contacts, contact_number;

 	WORD status;

@@ -876,7 +876,7 @@ int Meta_HideLinkedContacts(void) {
 

 	// ensure the hidden group does not exist (how this occurs i wonder but there have been reports!)

 	// (sometimes protocol server side groups are to blame - msn and icq)

-	if ( !meta_group_hack_disabled) do {

+	if (!meta_group_hack_disabled) do {

 		group_name = (char *)CallService(MS_CLIST_GROUPGETNAME, (WPARAM)hGroup, 0);

 		if (group_name && !strcmp(group_name, META_HIDDEN_GROUP)) {

 			// disabled because it shows a message box

@@ -885,10 +885,10 @@ int Meta_HideLinkedContacts(void) {
 			break;

 		}

 		hGroup++;

-	} while(group_name);

-	

+	} while (group_name);

+

 	while (hContact != NULL) {

-		if ((meta_id = db_get_dw(hContact, META_PROTO, META_LINK,(DWORD)-1))!=(DWORD)-1) {

+		if ((meta_id = db_get_dw(hContact, META_PROTO, META_LINK, (DWORD)-1)) != (DWORD)-1) {

 			// get contact number

 			contact_number = db_get_dw(hContact, META_PROTO, "ContactNumber", (DWORD)-1);

 

@@ -901,16 +901,16 @@ int Meta_HideLinkedContacts(void) {
 			// find metacontact

 			hContact2 = db_find_first();

 

-			while ( hContact2 != NULL ) {

-				if (db_get_dw(hContact2, META_PROTO, META_ID,(DWORD)-1) == meta_id) {

+			while (hContact2 != NULL) {

+				if (db_get_dw(hContact2, META_PROTO, META_ID, (DWORD)-1) == meta_id) {

 					num_contacts = db_get_dw(hContact2, META_PROTO, "NumContacts", (DWORD)-1);

 					if (contact_number >= 0 && contact_number < num_contacts) {

 

-						if ( !szProto)

+						if (!szProto)

 							status = ID_STATUS_OFFLINE;

 						else

 							status = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);

-						

+

 						// update metacontact's record of status for this contact

 						strcpy(buffer, "Status");

 						strcat(buffer, _itoa(contact_number, buffer2, 10));

@@ -921,19 +921,21 @@ int Meta_HideLinkedContacts(void) {
 							strcpy(buffer, "Nick");

 							strcat(buffer, _itoa(contact_number, buffer2, 10));

 							db_set(hContact2, META_PROTO, buffer, &dbv);

-							

+

 							strcpy(buffer, "CListName");

 							strcat(buffer, _itoa(contact_number, buffer2, 10));

 							if (db_get(hContact, "CList", "MyHandle", &dbv2)) {

 								db_set(hContact2, META_PROTO, buffer, &dbv);

-							} else {

+							}

+							else {

 								db_set(hContact2, META_PROTO, buffer, &dbv2);

 								db_free(&dbv2);

 							}

 

 							db_free(&dbv);

-						} else {

-							if ( !db_get(hContact, "CList", "MyHandle", &dbv)) {

+						}

+						else {

+							if (!db_get(hContact, "CList", "MyHandle", &dbv)) {

 								strcpy(buffer, "CListName");

 								strcat(buffer, _itoa(contact_number, buffer2, 10));

 								db_set(hContact2, META_PROTO, buffer, &dbv);

@@ -951,12 +953,12 @@ int Meta_HideLinkedContacts(void) {
 		}

 

 		hContact = db_find_next(hContact);

-	}	

+	}

 

 	// do metacontacts after handles set properly above

 	hContact = db_find_first();

-	while ( hContact != NULL ) {

-		if (db_get_dw(hContact, META_PROTO, META_ID,(DWORD)-1)!=(DWORD)-1) {

+	while (hContact != NULL) {

+		if (db_get_dw(hContact, META_PROTO, META_ID, (DWORD)-1) != (DWORD)-1) {

 			// is a meta contact

 			MCONTACT hMostOnline = Meta_GetMostOnline(hContact); // set nick

 			Meta_CopyContactNick(hContact, hMostOnline);

@@ -966,7 +968,7 @@ int Meta_HideLinkedContacts(void) {
 		}

 

 		hContact = db_find_next(hContact);

-	}	

+	}

 

 	return 0;

 }

@@ -977,12 +979,12 @@ int Meta_HideLinkedContacts(void) {
 int Meta_UnhideLinkedContacts(void)

 {

 	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

-		if (db_get_dw(hContact, META_PROTO, META_LINK,(DWORD)-1)!=(DWORD)-1) {

+		if (db_get_dw(hContact, META_PROTO, META_LINK, (DWORD)-1) != (DWORD)-1) {

 			// has a link - unhide it

 			// restore old group

-			Meta_RestoreGroup(hContact);			

+			Meta_RestoreGroup(hContact);

 		}

-	}	

+	}

 

 	return 0;

 }

@@ -994,26 +996,27 @@ int Meta_HideMetaContacts(int hide)
 	else Meta_SuppressStatus(options.suppress_status);

 

 	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

-		if (db_get_dw(hContact, META_PROTO, META_ID,(DWORD)-1)!=(DWORD)-1) {

+		if (db_get_dw(hContact, META_PROTO, META_ID, (DWORD)-1) != (DWORD)-1) {

 			// is a meta contact

 			if (hide)

 				db_set_b(hContact, "CList", "Hidden", 1);

 			else

 				db_unset(hContact, "CList", "Hidden");

 		}

-		else if (db_get_dw(hContact, META_PROTO, META_LINK,(DWORD)-1)!=(DWORD)-1) {

+		else if (db_get_dw(hContact, META_PROTO, META_LINK, (DWORD)-1) != (DWORD)-1) {

 			// when metacontacts are hidden, show subcontacts, and vice versa

 			if (hide)

 				Meta_RestoreGroup(hContact);

 			else

 				Meta_SetGroup(hContact);

 		}

-	}	

+	}

 

 	return 0;

 }

 

-void Meta_RestoreGroup(MCONTACT hContact) {

+void Meta_RestoreGroup(MCONTACT hContact)

+{

 

 	if (meta_group_hack_disabled) return; // clist has called api function to disable group hack - yay!

 

@@ -1024,19 +1027,20 @@ void Meta_RestoreGroup(MCONTACT hContact) {
 	// possible suspect - server side groups cause hidden group hack to fail, users hide contacts via clist->delete->hide option

 	db_unset(hContact, META_PROTO, "Hidden");

 

-	if (db_get_b(hContact, META_PROTO, "Hidden", 0) == 1)

-	{

+	if (db_get_b(hContact, META_PROTO, "Hidden", 0) == 1) {

 		// if we hid it, unhide it

 		db_unset(hContact, META_PROTO, "Hidden");

 		db_unset(hContact, "CList", "Hidden");

-	} else {

+	}

+	else {

 		DBCONTACTWRITESETTING cws;

 

-		if ( !db_get(hContact, META_PROTO, "OldCListGroup", &cws.value)) {

+		if (!db_get(hContact, META_PROTO, "OldCListGroup", &cws.value)) {

 

 			if ((cws.value.type == DBVT_ASCIIZ || cws.value.type == DBVT_UTF8) && !strcmp(cws.value.pszVal, META_HIDDEN_GROUP)) {

 				db_unset(hContact, "CList", "Group");

-			} else {

+			}

+			else {

 				int hGroup = 1;

 				char *name = 0;

 				BOOL found = FALSE;

@@ -1047,7 +1051,7 @@ void Meta_RestoreGroup(MCONTACT hContact) {
 						break;

 					}

 					hGroup++;

-				} while(name);

+				} while (name);

 

 				if (found)

 					db_set(hContact, "CList", "Group", &cws.value);

@@ -1066,7 +1070,7 @@ void Meta_RestoreGroup(MCONTACT hContact) {
 		}

 		db_unset(hContact, META_PROTO, "OldCListGroup");

 

-		if ( !db_get(hContact, "CList", "Group", &cws.value)) {

+		if (!db_get(hContact, "CList", "Group", &cws.value)) {

 			if ((cws.value.type == DBVT_ASCIIZ || cws.value.type == DBVT_UTF8) && !strcmp(cws.value.pszVal, META_HIDDEN_GROUP)) {

 				db_unset(hContact, "CList", "Group");

 			}

@@ -1079,7 +1083,8 @@ void Meta_RestoreGroup(MCONTACT hContact) {
 	db_unset(hContact, "CList", "Hidden");

 }

 

-void Meta_SetGroup(MCONTACT hContact) {

+void Meta_SetGroup(MCONTACT hContact)

+{

 	char *szProto, *uid;

 

 	if (meta_group_hack_disabled) return; // clist has called api function to disable group hack - yay!

@@ -1089,7 +1094,7 @@ void Meta_SetGroup(MCONTACT hContact) {
 

 	szProto = GetContactProto(hContact);

 	if (szProto)

-		uid   = (char *)CallProtoService(szProto, PS_GETCAPS, PFLAG_UNIQUEIDSETTING, 0);

+		uid = (char *)CallProtoService(szProto, PS_GETCAPS, PFLAG_UNIQUEIDSETTING, 0);

 

 	if (szProto && uid && (INT_PTR)uid != CALLSERVICE_NOTFOUND && !strcmp(JABBER_UNIQUE_ID_SETTING, uid)) {

 		// if it's a jabber contact, hide it, and record the fact that it was us who did

@@ -1099,7 +1104,7 @@ void Meta_SetGroup(MCONTACT hContact) {
 	else {

 		DBVARIANT dbv;

 		// save old group and move to invisible group (i.e. non-existent group)

-		if ( !Mydb_get(hContact, "CList", "Group", &dbv)) {

+		if (!Mydb_get(hContact, "CList", "Group", &dbv)) {

 			if ((dbv.type == DBVT_ASCIIZ || dbv.type == DBVT_UTF8) && !strcmp(dbv.pszVal, META_HIDDEN_GROUP))

 				; // it's already in the group (shouldn't be - but maybe a crash)

 			else

@@ -1116,19 +1121,20 @@ void Meta_SetGroup(MCONTACT hContact) {
 int Meta_SuppressStatus(BOOL suppress)

 {

 	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

-		if (db_get_dw(hContact, META_PROTO, META_LINK,(DWORD)-1)!=(DWORD)-1) {

+		if (db_get_dw(hContact, META_PROTO, META_LINK, (DWORD)-1) != (DWORD)-1) {

 			// is a subcontact

 			if (suppress)

 				CallService(MS_IGNORE_IGNORE, hContact, (WPARAM)IGNOREEVENT_USERONLINE);

 			else

 				CallService(MS_IGNORE_UNIGNORE, hContact, (WPARAM)IGNOREEVENT_USERONLINE);

 		}

-	}	

+	}

 

 	return 0;

 }

 

-int Meta_CopyContactNick(MCONTACT hMeta, MCONTACT hContact) {

+int Meta_CopyContactNick(MCONTACT hMeta, MCONTACT hContact)

+{

 	DBVARIANT dbv, dbv_proto;

 	char *szProto;

 

@@ -1136,15 +1142,15 @@ int Meta_CopyContactNick(MCONTACT hMeta, MCONTACT hContact) {
 		hContact = Meta_GetContactHandle(hMeta, 0);

 	}

 

-	if ( !hContact) return 1;

+	if (!hContact) return 1;

 

 	//szProto = GetContactProto(hContact);

 	// read szProto direct from db, since we do this on load and other szProto plugins may not be loaded yet

-	if ( !db_get(hContact, "Protocol", "p", &dbv_proto)) {

+	if (!db_get(hContact, "Protocol", "p", &dbv_proto)) {

 

 		szProto = dbv_proto.pszVal;

 		if (options.clist_contact_name == CNNT_NICK && szProto) {

-			if ( !Mydb_get(hContact, szProto, "Nick", &dbv)) {

+			if (!Mydb_get(hContact, szProto, "Nick", &dbv)) {

 				db_set(hMeta, META_PROTO, "Nick", &dbv);

 				db_free(&dbv);

 				//CallService(MS_CLIST_INVALIDATEDISPLAYNAME, (WPARAM)hMeta, 0);

@@ -1152,7 +1158,8 @@ int Meta_CopyContactNick(MCONTACT hMeta, MCONTACT hContact) {
 				db_free(&dbv_proto);

 				return 0;

 			}

-		} else if (options.clist_contact_name == CNNT_DISPLAYNAME) {

+		}

+		else if (options.clist_contact_name == CNNT_DISPLAYNAME) {

 			TCHAR *name = cli.pfnGetContactDisplayName(hContact, GCDNF_TCHAR);

 			if (name && _tcscmp(name, TranslateT("(Unknown Contact)")) != 0) {

 				db_set_ts(hMeta, META_PROTO, "Nick", name);

@@ -1168,13 +1175,13 @@ int Meta_CopyContactNick(MCONTACT hMeta, MCONTACT hContact) {
 int Meta_SetAllNicks()

 {

 	for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

-		if (db_get_dw(hContact, META_PROTO, META_ID,(DWORD)-1)!=(DWORD)-1) {

+		if (db_get_dw(hContact, META_PROTO, META_ID, (DWORD)-1) != (DWORD)-1) {

 			MCONTACT most_online = Meta_GetMostOnline(hContact);

 			Meta_CopyContactNick(hContact, most_online);

 			Meta_FixStatus(hContact);

 			Meta_CopyData(hContact);

 		}

-	

+

 	}

 	return 0;

 }

@@ -1187,10 +1194,11 @@ int Meta_IsHiddenGroup(const char *group_name)
 	return 0;

 }

 

-int Meta_SwapContacts(MCONTACT hMeta, DWORD contact_number1, DWORD contact_number2) {

+int Meta_SwapContacts(MCONTACT hMeta, DWORD contact_number1, DWORD contact_number2)

+{

 	DBVARIANT dbv1, dbv2;

 

-	MCONTACT hContact1 = Meta_GetContactHandle(hMeta, contact_number1), 

+	MCONTACT hContact1 = Meta_GetContactHandle(hMeta, contact_number1),

 		hContact2 = Meta_GetContactHandle(hMeta, contact_number2);

 	char buff1[512], buff12[512], buff2[512], buff22[512];

 	BOOL ok1, ok2;

@@ -1271,15 +1279,14 @@ int Meta_SwapContacts(MCONTACT hMeta, DWORD contact_number1, DWORD contact_numbe
 	if (ok1) {

 		db_set(hMeta, META_PROTO, buff2, &dbv1);

 		db_free(&dbv1);

-	} else {

-		db_unset(hMeta, META_PROTO, buff2);

 	}

+	else db_unset(hMeta, META_PROTO, buff2);

+

 	if (ok2) {

 		db_set(hMeta, META_PROTO, buff1, &dbv2);

 		db_free(&dbv2);

-	} else {

-		db_unset(hMeta, META_PROTO, buff1);

 	}

+	else db_unset(hMeta, META_PROTO, buff1);

 

 	// swap the clist name

 	strcpy(buff1, "CListName");

@@ -1291,15 +1298,14 @@ int Meta_SwapContacts(MCONTACT hMeta, DWORD contact_number1, DWORD contact_numbe
 	if (ok1) {

 		db_set(hMeta, META_PROTO, buff2, &dbv1);

 		db_free(&dbv1);

-	} else {

-		db_unset(hMeta, META_PROTO, buff2);

 	}

+	else db_unset(hMeta, META_PROTO, buff2);

+

 	if (ok2) {

 		db_set(hMeta, META_PROTO, buff1, &dbv2);

 		db_free(&dbv2);

-	} else {

-		db_unset(hMeta, META_PROTO, buff1);

 	}

+	else db_unset(hMeta, META_PROTO, buff1);

 

 	// swap the handle

 	strcpy(buff1, "Handle");

@@ -1311,101 +1317,35 @@ int Meta_SwapContacts(MCONTACT hMeta, DWORD contact_number1, DWORD contact_numbe
 	if (ok1) {

 		db_set(hMeta, META_PROTO, buff2, &dbv1);

 		db_free(&dbv1);

-	} else {

-		db_unset(hMeta, META_PROTO, buff2);

 	}

+	else db_unset(hMeta, META_PROTO, buff2);

+

 	if (ok2) {

 		db_set(hMeta, META_PROTO, buff1, &dbv2);

 		db_free(&dbv2);

-	} else {

-		db_unset(hMeta, META_PROTO, buff1);

 	}

+	else db_unset(hMeta, META_PROTO, buff1);

 

 	// finally, inform the contacts of their change in position

 	db_set_dw(hContact1, META_PROTO, "ContactNumber", (DWORD)contact_number2);

 	db_set_dw(hContact2, META_PROTO, "ContactNumber", (DWORD)contact_number1);

-

 	return 0;

 }

 

 INT_PTR CALLBACK DlgProcNull(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	switch(msg) {

+	switch (msg) {

 	case WM_INITDIALOG:

-		{

-			HWND prog = GetDlgItem(hwndDlg, IDC_PROG);

+		HWND prog = GetDlgItem(hwndDlg, IDC_PROG);

 

-			TranslateDialogDefault( hwndDlg );

-			

-			SendMessage(prog, PBM_SETPOS, 0, 0);

-			return TRUE;

-		}

+		TranslateDialogDefault(hwndDlg);

+

+		SendMessage(prog, PBM_SETPOS, 0, 0);

+		return TRUE;

 	}

 	return FALSE;

 }

 

-// function to copy history from one contact to another - courtesy JdGordon (thx)

-void copyHistory(MCONTACT hContactFrom, MCONTACT hContactTo) 

-{ 

-	HANDLE hDbEvent; 

-	DBEVENTINFO dbei; 

-	//char *id;

-	//DWORD id_length;

-	//DWORD oldBlobSize;

-	DWORD time_now = time(0);

-	DWORD earliest_time = time_now - options.days_history * 24 * 60 * 60;

-	BYTE *buffer = 0;

-	HWND progress_dialog, prog;

-

-	if ( !hContactFrom || !hContactTo) return; 

-

-	//id = Meta_GetUniqueIdentifier(hContactFrom, &id_length);

-	//if ( !id) return;

-

-	progress_dialog = CreateDialog(hInst, MAKEINTRESOURCE(IDD_METACOPYPROGRESS), 0, DlgProcNull);

-	ShowWindow(progress_dialog, SW_SHOW);

-

-	prog = GetDlgItem(progress_dialog, IDC_PROG);

-

-	//CallService(MS_DB_SETSAFETYMODE, (WPARAM)FALSE, 0);

-	for (hDbEvent = db_event_first(hContactFrom); hDbEvent; hDbEvent = db_event_next(hDbEvent)) 

-	{ 

-		// get the event 

-		ZeroMemory(&dbei, sizeof(dbei)); 

-		dbei.cbSize = sizeof(dbei); 

-

-		if ((dbei.cbBlob = db_event_getBlobSize(hDbEvent)) == -1)

-			break;

-

-		buffer = (BYTE *)mir_realloc(buffer, dbei.cbBlob);// + id_length);

-		dbei.pBlob = buffer; 

-		if ( db_event_get(hDbEvent, &dbei)) 

-			break; 

-

-		// i.e. optoins.days_history == 0;

-		if (time_now == earliest_time) earliest_time = dbei.timestamp;

-

-		if (dbei.timestamp < earliest_time)

-			continue;

-

-		if (dbei.eventType != EVENTTYPE_MESSAGE && dbei.eventType != EVENTTYPE_FILE && dbei.eventType != EVENTTYPE_URL)

-			continue;

-

-		if (time_now > earliest_time) { // just in case!

-			SendMessage(prog, PBM_SETPOS, (WPARAM)(int)(100.0 * (dbei.timestamp - earliest_time) / (time_now - earliest_time)), 0);	

-			UpdateWindow(progress_dialog);

-		}

-

-		dbei.szModule = META_PROTO;

-		dbei.flags &= ~DBEF_FIRST;

-		db_event_add(hContactTo, &dbei); 

-	}		

-

-	DestroyWindow(progress_dialog);

-	if (buffer) mir_free(buffer);

-	//mir_free(id);

-}

-

 void Meta_FixStatus(MCONTACT hMeta)

 {

 	MCONTACT most_online = Meta_GetMostOnlineSupporting(hMeta, PFLAGNUM_1, 0);

@@ -1420,9 +1360,7 @@ void Meta_FixStatus(MCONTACT hMeta)
 	else db_set_w(hMeta, META_PROTO, "Status", (WORD)ID_STATUS_OFFLINE);

 }

 

-INT_PTR Meta_IsEnabled() {

+INT_PTR Meta_IsEnabled()

+{

 	return db_get_b(0, META_PROTO, "Enabled", 1) && (meta_group_hack_disabled || db_get_b(NULL, "CList", "UseGroups", 1));

 }

-

-

-

diff --git a/src/modules/metacontacts/metacontacts.h b/src/modules/metacontacts/metacontacts.h
index 6e97c990ac..cce2686c09 100644
--- a/src/modules/metacontacts/metacontacts.h
+++ b/src/modules/metacontacts/metacontacts.h
@@ -102,7 +102,6 @@ struct MetaOptions
 	BYTE set_default_on_recv;

 	BYTE always_use_default;

 	BYTE suppress_status;

-	BYTE copy_subcontact_history;

 	BYTE subcontact_windows;

 	BYTE metahistory;

 	BYTE subhistory;

@@ -122,8 +121,7 @@ struct MetaOptions
 

 extern MetaOptions options;

 

-INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

-INT_PTR CALLBACK DlgProcOptsPriorities(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

+int Meta_OptInit(WPARAM wParam, LPARAM lParam);

 int Meta_WriteOptions(MetaOptions *opt);

 int Meta_ReadOptions(MetaOptions *opt);

 

@@ -161,8 +159,6 @@ extern HANDLE hEventDefaultChanged, hEventForceSend, hEventUnforceSend, hSubcont
 

 extern POINT menuMousePoint;

 

-extern BOOL message_window_api_enabled;

-

 #define MAX_PROTOCOLS	20

 extern char proto_names[MAX_PROTOCOLS * 128];