From 8a74e7495ce5ad39de4f5c25121a84d35df90c36 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 20 May 2018 15:08:48 +0300
Subject: CMPlugin to receive a reference to PLUGININFOEX

---
 plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp      | 2 +-
 plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp | 6 +++---
 plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp     | 2 +-
 plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/UserInfoEx/src/ex_import')

diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
index fe7bedb5c7..e4f0f3d090 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp
@@ -167,7 +167,7 @@ INT_PTR CALLBACK SelectModulesToExport_DlgProc(HWND hDlg, UINT uMsg, WPARAM wPar
 					{ ICO_BTN_EXPORT,	BM_SETIMAGE,	IDOK		},
 					{ ICO_BTN_CANCEL,	BM_SETIMAGE,	IDCANCEL	}
 				};
-				const int numIconsToSet = db_get_b(NULL, MODNAME, SET_ICONS_BUTTONS, 1) ? _countof(idIcon) : 2;
+				const int numIconsToSet = db_get_b(NULL, MODULENAME, SET_ICONS_BUTTONS, 1) ? _countof(idIcon) : 2;
 				IcoLib_SetCtrlIcons(hDlg, idIcon, numIconsToSet);
 
 				// create imagelist for treeview
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
index fc1f62f342..df30690a1b 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
@@ -204,7 +204,7 @@ static void GetInitialDir(LPSTR pszInitialDir)
 
 	szRelative[0] = 0;
 	// is some standard path defined
-	if (!db_get_static(0, MODNAME, "vCardPath", szRelative, _countof(szRelative))) {
+	if (!db_get_static(0, MODULENAME, "vCardPath", szRelative, _countof(szRelative))) {
 		if (!PathToAbsolute(szRelative, pszInitialDir))
 			mir_strcpy(pszInitialDir, szRelative);
 	}
@@ -225,9 +225,9 @@ static void SaveInitialDir(LPSTR pszInitialDir)
 	if (p = mir_strrchr(pszInitialDir, '\\')) {
 		*p = 0;
 		if ( PathToRelative(pszInitialDir, szRelative))
-			db_set_s(0, MODNAME, "vCardPath", szRelative);
+			db_set_s(0, MODULENAME, "vCardPath", szRelative);
 		else
-			db_set_s(0, MODNAME, "vCardPath", pszInitialDir);
+			db_set_s(0, MODULENAME, "vCardPath", pszInitialDir);
 		*p = '\\';
 	}	
 }
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
index 4b68a0de12..db0e72e03a 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp
@@ -42,7 +42,7 @@ INT_PTR CALLBACK DlgProcProgress(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lPar
 				{ ICO_DLG_IMPORT,	STM_SETIMAGE,	ICO_DLGLOGO	},
 				{ ICO_BTN_CANCEL,	BM_SETIMAGE,	IDCANCEL	}
 			};
-			const int numIconsToSet = db_get_b(NULL, MODNAME, SET_ICONS_BUTTONS, 1) ? _countof(idIcon) : 2;
+			const int numIconsToSet = db_get_b(NULL, MODULENAME, SET_ICONS_BUTTONS, 1) ? _countof(idIcon) : 2;
 			IcoLib_SetCtrlIcons(hDlg, idIcon, numIconsToSet);
 
 			TranslateDialogDefault(hDlg);
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
index a3c8f29591..6db5af2457 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp
@@ -35,7 +35,7 @@ INT_PTR CALLBACK DlgProc_DataHistory(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
 				{ ICO_BTN_EXPORT,	BM_SETIMAGE,	IDOK		},
 				{ ICO_BTN_CANCEL,	BM_SETIMAGE,	IDCANCEL	}
 			};
-			const int numIconsToSet = db_get_b(NULL, MODNAME, SET_ICONS_BUTTONS, 1) ? _countof(idIcon) : 2;
+			const int numIconsToSet = db_get_b(NULL, MODULENAME, SET_ICONS_BUTTONS, 1) ? _countof(idIcon) : 2;
 			IcoLib_SetCtrlIcons(hDlg, idIcon, numIconsToSet);
 
 			SendDlgItemMessage(hDlg, IDOK, BUTTONTRANSLATE, NULL, NULL);
-- 
cgit v1.2.3