From 6f20d680f5f175ca2b4669ea7fc27fa34ca7dfd3 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 29 Sep 2014 12:45:17 +0000
Subject: Import: all auth messages to be suppressed

git-svn-id: http://svn.miranda-ng.org/main/trunk@10625 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Import/src/import.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'plugins/Import')

diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp
index 403cf703ec..d0bb4d6a2f 100644
--- a/plugins/Import/src/import.cpp
+++ b/plugins/Import/src/import.cpp
@@ -255,16 +255,16 @@ void ImportAccounts()
 			continue;
 		}
 
-		itoa(800+i, szSetting, 10);
+		itoa(800 + i, szSetting, 10);
 		ptrT tszAccountName(myGetWs(NULL, "Protocols", szSetting));
 		if (tszAccountName == NULL)
 			tszAccountName = mir_a2t(szProto);
-		
+
 		ACC_CREATE newacc;
 		newacc.pszBaseProto = szBaseProto;
 		newacc.pszInternal = NULL;
 		newacc.ptszAccountName = tszAccountName;
-		
+
 		pa = ProtoCreateAccount(&newacc);
 		if (pa == NULL) {
 			arAccountMap.insert(new AccountMap(szProto, NULL));
@@ -555,12 +555,12 @@ static void ImportHistory(MCONTACT hContact, PROTOACCOUNT **protocol, int protoC
 			// check protocols during system history import
 			if (hDst == NULL) {
 				skipAll = 1;
-				for (int i = 0; i < protoCount; i++)
+				for (int i = 0; i < protoCount; i++) {
 					if (!strcmp(dbei.szModule, protocol[i]->szModuleName)) {
 						skipAll = 0;
 						break;
 					}
-
+				}
 				skip = skipAll;
 			}
 
@@ -604,6 +604,10 @@ static void ImportHistory(MCONTACT hContact, PROTOACCOUNT **protocol, int protoC
 			if (!skip) {
 				// Check for duplicate entries
 				if (!IsDuplicateEvent(hDst, dbei)) {
+					// no need to display all these dialogs again
+					if (dbei.eventType == EVENTTYPE_AUTHREQUEST || dbei.eventType == EVENTTYPE_ADDED)
+						dbei.flags |= DBEF_READ;
+
 					// Add dbevent
 					if (dstDb->AddEvent(hDst, &dbei) != NULL)
 						nMessagesCount++;
-- 
cgit v1.2.3