diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-10-03 14:24:18 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-10-03 14:24:18 +0000 |
| commit | 334c3a9d18f177f1b6c71d754219f56057d315c0 (patch) | |
| tree | 5273e0bea9c5fae70cca4fc5a6be6da8669d5561 /plugins/Import/src | |
| parent | d7d7fb4aa09838047c5aa7e205ac360d5f3703f4 (diff) | |
Import:
- "failed to add an event" message appears when a destination profile isn't empty;
- metahistory is correctly skipped during the sequentional import of the same profile;
- version bump
git-svn-id: http://svn.miranda-ng.org/main/trunk@10678 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Import/src')
| -rw-r--r-- | plugins/Import/src/import.cpp | 3 | ||||
| -rw-r--r-- | plugins/Import/src/version.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp index 94ec735979..5f5f322307 100644 --- a/plugins/Import/src/import.cpp +++ b/plugins/Import/src/import.cpp @@ -416,7 +416,7 @@ DBCachedContact* FindDestMeta(DBCachedContact *ccSrc) int i;
for (i = 0; i < ccSrc->nSubs; i++) {
MCONTACT hDest = MapContact(ccSrc->pSubs[i]);
- if (hDest == INVALID_CONTACT_ID || ccSrc->pSubs[i] != hDest)
+ if (hDest == INVALID_CONTACT_ID || cc->pSubs[i] != hDest)
break;
}
@@ -540,6 +540,7 @@ static MCONTACT ImportContact(MCONTACT hSrc) if (hDst != INVALID_CONTACT_ID) {
AddMessage(LPGENT("Skipping duplicate %S contact %s"), cc->szProto, pszUniqueID);
srcDb->FreeVariant(&dbv);
+ arContactMap.insert(new ContactMap(hSrc, hDst));
return NULL;
}
diff --git a/plugins/Import/src/version.h b/plugins/Import/src/version.h index dda2b434ea..d2ab9dffe9 100644 --- a/plugins/Import/src/version.h +++ b/plugins/Import/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0
#define __MINOR_VERSION 95
#define __RELEASE_NUM 3
-#define __BUILD_NUM 2
+#define __BUILD_NUM 3
#include <stdver.h>
|