diff options
42 files changed, 34 insertions, 457 deletions
diff --git a/plugins/Actman/actman.dpr b/plugins/Actman/actman.dpr index d7e073ff1b..1296ab9f9c 100644 --- a/plugins/Actman/actman.dpr +++ b/plugins/Actman/actman.dpr @@ -140,9 +140,6 @@ begin hHookShutdown:=HookEvent(ME_SYSTEM_SHUTDOWN{ME_SYSTEM_OKTOEXIT},@PreShutdown);
NotifyEventHooks(hHookChanged,twparam(ACTM_LOADED),0);
- //----- DBEDITOR support -----
-// CallService('DBEditorpp/RegisterSingleModule',dword(PluginShort),0);
-
IsMultiThread:=true;
// Load additional modules
ptr:=ActionLink;
diff --git a/plugins/Actman30/actman.dpr b/plugins/Actman30/actman.dpr index b4a2cf1566..4515e35c1e 100644 --- a/plugins/Actman30/actman.dpr +++ b/plugins/Actman30/actman.dpr @@ -201,9 +201,6 @@ begin HookEvent(ME_SYSTEM_SHUTDOWN{ME_SYSTEM_OKTOEXIT},@PreShutdown);
NotifyEventHooks(hHookChanged,twparam(ACTM_LOADED),0);
- //----- DBEDITOR support -----
-// CallService(MS_DBEDIT_REGISTERSINGLEMODULE,twparam(PluginShort),0);
-
IsMultiThread:=true;
// Load additional modules
ptr:=ActionLink;
diff --git a/plugins/AssocMgr/src/main.cpp b/plugins/AssocMgr/src/main.cpp index fd257db7ac..58a65f5fbb 100644 --- a/plugins/AssocMgr/src/main.cpp +++ b/plugins/AssocMgr/src/main.cpp @@ -80,8 +80,6 @@ static int AssocMgrModulesLoaded(WPARAM wParam,LPARAM lParam) {
UNREFERENCED_PARAMETER(wParam);
UNREFERENCED_PARAMETER(lParam);
- if(ServiceExists("DBEditorpp/RegisterSingleModule"))
- CallService("DBEditorpp/RegisterSingleModule",(WPARAM)"AssocMgr",0);
InitTest();
return 0;
}
diff --git a/plugins/AutoShutdown/src/main.cpp b/plugins/AutoShutdown/src/main.cpp index 5341f7d7d0..0f3cfc1fc4 100644 --- a/plugins/AutoShutdown/src/main.cpp +++ b/plugins/AutoShutdown/src/main.cpp @@ -52,9 +52,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, VOID *pReserved) static int ShutdownModulesLoaded(WPARAM,LPARAM)
{
- if ( ServiceExists("DBEditorpp/RegisterSingleModule"))
- CallService("DBEditorpp/RegisterSingleModule",(WPARAM)"AutoShutdown",0);
-
/* Toolbar Item */
HookEvent(ME_TTB_MODULELOADED,ToolbarLoaded); /* no service to check for */
diff --git a/plugins/Boltun/src/boltun.cpp b/plugins/Boltun/src/boltun.cpp index 1c6b0aa59e..4ad9379bb5 100644 --- a/plugins/Boltun/src/boltun.cpp +++ b/plugins/Boltun/src/boltun.cpp @@ -639,8 +639,6 @@ extern "C" int __declspec(dllexport) Load(void) mir_sntprintf(path, SIZEOF(path), TranslateTS(FAILED_TO_LOAD_BASE), line, (const TCHAR*)Config.MindFileName);
MessageBox(NULL, path, TranslateTS(BOLTUN_ERROR), MB_ICONERROR|MB_TASKMODAL|MB_OK);
}
- /*record for Uninstall plugin*/
- db_set_s(NULL, "Uninstall", BOLTUN_NAME, BOLTUN_KEY);
return 0;
}
diff --git a/plugins/CountryFlags/src/extraimg.cpp b/plugins/CountryFlags/src/extraimg.cpp index 11dfeb9470..9310c8e4c5 100644 --- a/plugins/CountryFlags/src/extraimg.cpp +++ b/plugins/CountryFlags/src/extraimg.cpp @@ -203,10 +203,6 @@ static int ExtraImgSettingChanged(WPARAM wParam,LPARAM lParam) static int ExtraImgModulesLoaded(WPARAM wParam,LPARAM lParam)
{
- /* Options */
- if (ServiceExists("DBEditorpp/RegisterSingleModule"))
- CallService("DBEditorpp/RegisterSingleModule",(WPARAM)MODULENAME,0);
-
/* Extra Image */
hExtraIcon = ExtraIcon_Register("flags_extra", LPGEN("Country flag"));
HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY,ExtraImageApply);
diff --git a/plugins/DbEditorPP/dbeditorpp_10.vcxproj b/plugins/DbEditorPP/dbeditorpp_10.vcxproj index 6f5cecc9d8..5531534e76 100644 --- a/plugins/DbEditorPP/dbeditorpp_10.vcxproj +++ b/plugins/DbEditorPP/dbeditorpp_10.vcxproj @@ -183,7 +183,6 @@ <ItemGroup>
<ClCompile Include="src\exportimport.cpp" />
<ClCompile Include="src\icons.cpp" />
- <ClCompile Include="src\knownmodules.cpp" />
<ClCompile Include="src\stdafx.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
diff --git a/plugins/DbEditorPP/dbeditorpp_10.vcxproj.filters b/plugins/DbEditorPP/dbeditorpp_10.vcxproj.filters index a23baf1b16..8b6ce891ed 100644 --- a/plugins/DbEditorPP/dbeditorpp_10.vcxproj.filters +++ b/plugins/DbEditorPP/dbeditorpp_10.vcxproj.filters @@ -27,9 +27,6 @@ <ClCompile Include="src\icons.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\knownmodules.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/plugins/DbEditorPP/dbeditorpp_11.vcxproj b/plugins/DbEditorPP/dbeditorpp_11.vcxproj index 98c896d7d0..295c1f8e8a 100644 --- a/plugins/DbEditorPP/dbeditorpp_11.vcxproj +++ b/plugins/DbEditorPP/dbeditorpp_11.vcxproj @@ -186,7 +186,6 @@ <ItemGroup>
<ClCompile Include="src\exportimport.cpp" />
<ClCompile Include="src\icons.cpp" />
- <ClCompile Include="src\knownmodules.cpp" />
<ClCompile Include="src\stdafx.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
diff --git a/plugins/DbEditorPP/dbeditorpp_11.vcxproj.filters b/plugins/DbEditorPP/dbeditorpp_11.vcxproj.filters index a23baf1b16..8b6ce891ed 100644 --- a/plugins/DbEditorPP/dbeditorpp_11.vcxproj.filters +++ b/plugins/DbEditorPP/dbeditorpp_11.vcxproj.filters @@ -27,9 +27,6 @@ <ClCompile Include="src\icons.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\knownmodules.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="src\main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/plugins/DbEditorPP/res/Red.ico b/plugins/DbEditorPP/res/Red.ico Binary files differdeleted file mode 100644 index 3e313e5413..0000000000 --- a/plugins/DbEditorPP/res/Red.ico +++ /dev/null diff --git a/plugins/DbEditorPP/res/Red_open.ico b/plugins/DbEditorPP/res/Red_open.ico Binary files differdeleted file mode 100644 index d9c7b92692..0000000000 --- a/plugins/DbEditorPP/res/Red_open.ico +++ /dev/null diff --git a/plugins/DbEditorPP/res/resource.rc b/plugins/DbEditorPP/res/resource.rc index 5c766e606b..66a873c4bf 100644 --- a/plugins/DbEditorPP/res/resource.rc +++ b/plugins/DbEditorPP/res/resource.rc @@ -62,20 +62,14 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,13,283,10
CONTROL "Automatically expand ""settings"" when Database Editor ++ starts",IDC_EXPANDSETTINGS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,26,283,10
- CONTROL "Use known modules list",IDC_USEKNOWNMODS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,39,253,10
- CONTROL "Warn when deleting modules",IDC_WARNONDEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,52,280,10
- CONTROL """Open user tree in DBE++"" menu item",IDC_MENU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,65,280,10
+ CONTROL "Warn when deleting modules",IDC_WARNONDEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,39,280,10
+ CONTROL """Open user tree in DBE++"" menu item",IDC_MENU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,52,280,10
CONTROL "Use popups when watched settings change values",IDC_POPUPS,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,78,275,10
- EDITTEXT IDC_POPUPTIMEOUT,144,89,20,12,ES_NUMBER
- CONTROL "",IDC_COLOUR,"ColourPicker",WS_TABSTOP,257,89,26,12
- EDITTEXT IDC_MODULES,12,140,288,46,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
- GROUPBOX "Modules to ALWAYS mark as known (e.g core modules)",IDC_STATIC,7,105,300,96
- LTEXT "Put a space or comma between each module name",IDC_STATIC,12,116,286,8
- LTEXT "Changes to this list will take effect next time miranda starts",IDC_STATIC,12,189,284,8
- RTEXT "Popup timeout (0 for infinite)",IDC_STATIC,35,91,103,8
- RTEXT "Background color",IDC_STATIC,177,91,77,8
- LTEXT "If the module name has a space in it, put a \\ before the space. eg ""aaa\\ bbb""",IDC_STATIC,12,127,286,8
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,65,275,10
+ EDITTEXT IDC_POPUPTIMEOUT,144,76,20,12,ES_NUMBER
+ CONTROL "",IDC_COLOUR,"ColourPicker",WS_TABSTOP,257,76,26,12
+ RTEXT "Popup timeout (0 for infinite)",IDC_STATIC,35,78,103,8
+ RTEXT "Background color",IDC_STATIC,177,78,77,8
END
IDD_ADD_MODULE DIALOGEX 0, 0, 186, 67
@@ -253,8 +247,6 @@ END // remains consistent on all systems.
ICO_KNOWN ICON "Yellow.ico"
ICO_KNOWNOPEN ICON "Yellow_open.ico"
-ICO_UNKNOWNOPEN ICON "Red_open.ico"
-ICO_UNKNOWN ICON "Red.ico"
ICO_SETTINGS ICON "Icon_4.ico"
ICO_ONLINE ICON "online2.ico"
ICO_REGEDIT ICON "Icon_1.ico"
@@ -393,7 +385,6 @@ BEGIN MENUITEM "Copy To Contact", MENU_COPY_MOD
MENUITEM SEPARATOR
MENUITEM "Export Module", MENU_EXPORTMODULE
- MENUITEM "Add To Known Modules", MENU_ADDKNOWN
MENUITEM SEPARATOR
MENUITEM "&Watch", MENU_WATCH_ITEM
MENUITEM "&Delete", MENU_DELETE_MOD
@@ -438,7 +429,6 @@ BEGIN MENUITEM SEPARATOR
MENUITEM "Export Module", MENU_EXPORTMODULE
MENUITEM "Export Module from all contacts", MENU_EXPORTDB
- MENUITEM "Add To Known Modules", MENU_ADDKNOWN
MENUITEM SEPARATOR
MENUITEM "&Watch", MENU_WATCH_ITEM
MENUITEM "&Delete", MENU_DELETE_MOD
diff --git a/plugins/DbEditorPP/src/headers.h b/plugins/DbEditorPP/src/headers.h index 6d34b06761..15735b3cf0 100644 --- a/plugins/DbEditorPP/src/headers.h +++ b/plugins/DbEditorPP/src/headers.h @@ -46,7 +46,7 @@ #include "Version.h"
#include "modsettingenum.h"
-#define DEF_ICON 7
+#define DEF_ICON 5
#define crlf_string "\r\n\0"
/////// icons support
@@ -103,7 +103,6 @@ extern HGENMENU hUserMenu; #define CONTACT 1
#define MODULE 0x2
#define KNOWN_MODULE 2
-#define UNKNOWN_MODULE 3
#define STUB 4
#define EMPTY 8
@@ -228,14 +227,6 @@ void ImportSettingsFromFileMenuItem(HANDLE hContact, char* FilePath); // find window.c
INT_PTR CALLBACK FindWindowDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
-// knownmodules.c
-extern BYTE UseKnownModList;
-INT_PTR RegisterModule(WPARAM wParam, LPARAM lParam);
-INT_PTR RegisterSingleModule(WPARAM wParam, LPARAM lParam);
-void FreeKnownModuleList();
-int IsModuleKnown(char* moduleName);
-void doOldKnownModulesList();
-
// copymodule.c
void copyModuleMenuItem(char* module, HANDLE hContact);
void copyModule(char* module, HANDLE hContactFrom, HANDLE hContactTo);
diff --git a/plugins/DbEditorPP/src/icons.cpp b/plugins/DbEditorPP/src/icons.cpp index 88de410477..7aab4906e7 100644 --- a/plugins/DbEditorPP/src/icons.cpp +++ b/plugins/DbEditorPP/src/icons.cpp @@ -6,8 +6,6 @@ static IconItem iconList[] = {
{ LPGENT("Closed Known Module"), "DBE++_1", ICO_KNOWN },
{ LPGENT("Open Known Module"), "DBE++_2", ICO_KNOWNOPEN },
- { LPGENT("Closed Unknown Module"), "DBE++_3", ICO_UNKNOWN },
- { LPGENT("Open Unknown Module"), "DBE++_4", ICO_UNKNOWNOPEN },
{ LPGENT("Settings"), "DBE++_5", ICO_SETTINGS },
{ LPGENT("Contacts Group"), "DBE++_6", ICO_CONTACTS },
{ LPGENT("Unknown Contact"), "DBE++_7", ICO_OFFLINE },
diff --git a/plugins/DbEditorPP/src/knownmodules.cpp b/plugins/DbEditorPP/src/knownmodules.cpp deleted file mode 100644 index 4e44aa740c..0000000000 --- a/plugins/DbEditorPP/src/knownmodules.cpp +++ /dev/null @@ -1,84 +0,0 @@ -#include "headers.h"
-
-BYTE UseKnownModList;
-
-#define MAXMODS 1024
-char *KnownModules[MAXMODS];
-int KnownModulesCount = 0;
-
-INT_PTR RegisterModule(WPARAM wParam, LPARAM lParam)
-{
- char **mods = (char**)wParam;
- int count = lParam;
- int i;
- for (i=0;i<count && KnownModulesCount<MAXMODS;i++)
- KnownModules[KnownModulesCount++] = mir_tstrdup(mods[i]);
- return 0;
-}
-
-INT_PTR RegisterSingleModule(WPARAM wParam, LPARAM lParam)
-{
- char *mods = (char*)wParam;
- if (KnownModulesCount<MAXMODS)
- KnownModules[KnownModulesCount++] = mir_tstrdup(mods);
- return 0;
-}
-
-int IsModuleKnown(char *module)
-{
- int i;
-
- if (!UseKnownModList) return 1; // not using known list so all are "known"
-
- for(i=0;i<KnownModulesCount;i++)
- {
- if (KnownModules[i] && !mir_strcmp(module,KnownModules[i]))
- return 1;
- }
-
- return 0;
-}
-
-void FreeKnownModuleList()
-{
- int i;
- for(i=0;i<KnownModulesCount;i++)
- {
- mir_free(KnownModules[i]);
- }
-}
-
-void doOldKnownModulesList()
-{
- ModuleSettingLL msll;
- struct ModSetLinkLinkItem *setting;
- DBVARIANT dbv;
- char *var, *temp;
-
- if (!EnumSettings(NULL,"KnownModules", &msll)) return;
-
- setting = msll.first;
- while(setting)
- {
- if (!db_get(NULL,"KnownModules",setting->name,&dbv) && dbv.type == DBVT_ASCIIZ)
- {
- temp = (char*)mir_alloc((strlen(dbv.pszVal)+5)*sizeof(char));
- if (!temp) break;
- strcpy(temp,dbv.pszVal);
- strcat(temp,",\0");
- var = strtok(temp,", ");
- while (var)
- {
- if (KnownModulesCount<MAXMODS)
- KnownModules[KnownModulesCount++] = mir_tstrdup(var);
- var = strtok(NULL,", ");
- }
- mir_free(temp);
- }
- db_free(&dbv);
- setting = (struct ModSetLinkLinkItem *)setting->next;
- }
- FreeModuleSettingLL(&msll);
-
- UseKnownModList = db_get_b(NULL,modname,"UseKnownModList",0);
-}
diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp index b45cc87f3d..7461e12bdd 100644 --- a/plugins/DbEditorPP/src/main.cpp +++ b/plugins/DbEditorPP/src/main.cpp @@ -11,7 +11,7 @@ BYTE nameOrder[NAMEORDERCOUNT]; HGENMENU hUserMenu;
WatchListArrayStruct WatchListArray;
HANDLE hRestore;
-HANDLE sMenuCommand, sRegisterModule, sRegisterSingleModule, sImport, sServicemodeLaunch;
+HANDLE sMenuCommand, sImport, sServicemodeLaunch;
HANDLE hModulesLoadedHook = NULL, hSettingsChangedHook=NULL, hOptInitHook=NULL, hPreShutdownHook=NULL;
//========================
@@ -181,52 +181,20 @@ int ModulesLoaded(WPARAM wParam,LPARAM lParam) hkd.DefHotKey = HOTKEYCODE(HOTKEYF_SHIFT|HOTKEYF_EXT, 'D');
Hotkey_Register(&hkd);
- DBVARIANT dbv;
- char *coreMods = "";
- char *mods;
- char mod[64] = "";
- TCHAR szModuleFileName[MAX_PATH];
- int i=0, len;
- if (!db_get(NULL,modname,"CoreModules",&dbv) && dbv.type == DBVT_ASCIIZ)
- mods = dbv.pszVal;
- else {
- db_set_s(NULL,modname,"CoreModules",coreMods);
- mods = coreMods;
- }
-
- len = (int)strlen(mods);
- while (i < len) {
- if (mods[i] == '\\' && mods[i+1] == ' ') {
- strcat(mod," ");
- i++;
- }
- else if (mods[i] == ' ' || mods[i] == ',' || mods[i] == '\r' || mods[i] == '\n'|| mods[i] == '\0') {
- if (mod[0])
- CallService("DBEditorpp/RegisterSingleModule",(WPARAM)mod,0);
- mod[0] = '\0';
- }
- else strncat(mod,&mods[i],1);
- i++;
- }
-
- if (mod[0])
- CallService("DBEditorpp/RegisterSingleModule",(WPARAM)mod,0);
-
- doOldKnownModulesList(); // add the old plugins which havnt been changed over yet..
-
// icons
+ TCHAR szModuleFileName[MAX_PATH];
if (GetModuleFileName(hInst, szModuleFileName, MAX_PATH))
addIcons(szModuleFileName);
- db_free(&dbv);
UnhookEvent(hModulesLoadedHook);
usePopups = db_get_b(NULL,modname,"UsePopUps",0);
// Load the name order
- for(i=0; i < NAMEORDERCOUNT; i++)
+ for(int i=0; i < NAMEORDERCOUNT; i++)
nameOrder[i] = i;
+ DBVARIANT dbv;
if (!db_get(NULL,"Contact","NameOrder",&dbv)) {
CopyMemory(nameOrder,dbv.pbVal,dbv.cpbVal);
db_free(&dbv);
@@ -252,8 +220,6 @@ int PreShutdown(WPARAM wParam,LPARAM lParam) DestroyServiceFunction(sServicemodeLaunch);
DestroyServiceFunction(sMenuCommand);
- DestroyServiceFunction(sRegisterModule);
- DestroyServiceFunction(sRegisterSingleModule);
DestroyServiceFunction(sImport);
return 0;
}
@@ -283,14 +249,10 @@ extern "C" __declspec(dllexport) int Load(void) hPreShutdownHook = HookEvent(ME_SYSTEM_PRESHUTDOWN, PreShutdown);
hModulesLoadedHook = HookEvent(ME_SYSTEM_MODULESLOADED,ModulesLoaded);
sMenuCommand = CreateServiceFunction("DBEditorpp/MenuCommand", DBEditorppMenuCommand);
- sRegisterModule = CreateServiceFunction("DBEditorpp/RegisterModule", RegisterModule);
- sRegisterSingleModule = CreateServiceFunction("DBEditorpp/RegisterSingleModule", RegisterSingleModule);
sImport = CreateServiceFunction("DBEditorpp/Import", ImportFromFile);
sServicemodeLaunch = CreateServiceFunction(MS_SERVICEMODE_LAUNCH, ServiceMode);
- CallService("DBEditorpp/RegisterSingleModule",(WPARAM)modname,0);
-
// Ensure that the common control DLL is loaded.
INITCOMMONCONTROLSEX icex;
icex.dwSize = sizeof(INITCOMMONCONTROLSEX);
@@ -303,7 +265,6 @@ extern "C" __declspec(dllexport) int Load(void) extern "C" __declspec(dllexport) int Unload(void)
{
- FreeKnownModuleList();
freeAllWatches();
return 0;
}
diff --git a/plugins/DbEditorPP/src/main_window.cpp b/plugins/DbEditorPP/src/main_window.cpp index 9a8facfbd8..d068c854fa 100644 --- a/plugins/DbEditorPP/src/main_window.cpp +++ b/plugins/DbEditorPP/src/main_window.cpp @@ -133,7 +133,7 @@ LRESULT CALLBACK ModuleTreeSubclassProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM TreeView_DeleteItem(hwnd,tvi.hItem);
}
}
- else if (wParam == VK_F2 && (mtis->type == MODULE || mtis->type == UNKNOWN_MODULE))
+ else if (wParam == VK_F2 && mtis->type == MODULE)
TreeView_EditLabel(hwnd,tvi.hItem);
else if (wParam == VK_F5) {
refreshTree(1);
@@ -253,10 +253,6 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) numberOfIcons++;
if (AddIconToList(himl, LoadSkinnedDBEIcon(ICO_OFFLINE)))
numberOfIcons++;
- if (AddIconToList(himl, LoadSkinnedDBEIcon(ICO_UNKNOWN)))
- numberOfIcons++;
- if (AddIconToList(himl, LoadSkinnedDBEIcon(ICO_UNKNOWNOPEN)))
- numberOfIcons++;
if (AddIconToList(himl, LoadSkinnedDBEIcon(ICO_ONLINE)))
numberOfIcons++;
@@ -457,7 +453,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) if (tvi.lParam)
{
mtis = (ModuleTreeInfoStruct *)tvi.lParam;
- if (mtis->type == MODULE || mtis->type == UNKNOWN_MODULE)
+ if (mtis->type == MODULE)
PopulateSettings(GetDlgItem(hwnd, IDC_SETTINGS), mtis->hContact, module);
else ClearListview(GetDlgItem(hwnd, IDC_SETTINGS));
}
diff --git a/plugins/DbEditorPP/src/modsettingenum.h b/plugins/DbEditorPP/src/modsettingenum.h index 0ef32f8cc5..9d1e0eff47 100644 --- a/plugins/DbEditorPP/src/modsettingenum.h +++ b/plugins/DbEditorPP/src/modsettingenum.h @@ -1,7 +1,6 @@ struct ModSetLinkLinkItem {
char *name;
BYTE *next; //struct ModSetLinkLinkItem
- int known;
};
typedef struct {
diff --git a/plugins/DbEditorPP/src/moduletree.cpp b/plugins/DbEditorPP/src/moduletree.cpp index 6e3f8f35fd..992bf1733d 100644 --- a/plugins/DbEditorPP/src/moduletree.cpp +++ b/plugins/DbEditorPP/src/moduletree.cpp @@ -98,16 +98,9 @@ int doContacts(HWND hwnd2Tree,HTREEITEM contactsRoot,ModuleSettingLL *modlist, H lParam = (ModuleTreeInfoStruct *)mir_calloc(sizeof(ModuleTreeInfoStruct));
lParam->hContact = hContact;
- if (!module->known) {
- tvi.item.iImage = 5;
- tvi.item.iSelectedImage = 6;
- lParam->type = UNKNOWN_MODULE;
- }
- else {
- tvi.item.iImage = 1;
- tvi.item.iSelectedImage = 2;
- lParam->type = KNOWN_MODULE;
- }
+ tvi.item.iImage = 1;
+ tvi.item.iSelectedImage = 2;
+ lParam->type = KNOWN_MODULE;
tvi.item.lParam = (LPARAM)lParam;
TreeView_InsertItem(hwnd2Tree, &tvi);
@@ -177,16 +170,9 @@ void doItems(HWND hwnd2Tree,ModuleSettingLL *modlist, int count) lParam = (ModuleTreeInfoStruct *)mir_calloc(sizeof(ModuleTreeInfoStruct));
lParam->hContact = hContact;
- if (!module->known) {
- tvi.item.iImage = 5;
- tvi.item.iSelectedImage = 6;
- lParam->type = UNKNOWN_MODULE;
- }
- else {
- tvi.item.iImage = 1;
- tvi.item.iSelectedImage = 2;
- lParam->type = KNOWN_MODULE;
- }
+ tvi.item.iImage = 1;
+ tvi.item.iSelectedImage = 2;
+ lParam->type = KNOWN_MODULE;
tvi.item.lParam = (LPARAM)lParam;
TreeView_InsertItem(hwnd2Tree, &tvi);
@@ -352,17 +338,9 @@ void replaceTreeItem(HWND hwnd, HANDLE hContact, const char *module, const char lParam = (ModuleTreeInfoStruct *)mir_calloc(sizeof(ModuleTreeInfoStruct));
lParam->hContact = hContact;
- lParam->type = IsModuleKnown((char*)newModule)?KNOWN_MODULE:UNKNOWN_MODULE;
- if (lParam->type == UNKNOWN_MODULE)
- {
- tvi.item.iImage = 5;
- tvi.item.iSelectedImage = 6;
- }
- else
- {
- tvi.item.iImage = 1;
- tvi.item.iSelectedImage = 2;
- }
+ lParam->type = KNOWN_MODULE;
+ tvi.item.iImage = 1;
+ tvi.item.iSelectedImage = 2;
tvi.item.lParam = (LPARAM)lParam;
@@ -372,7 +350,6 @@ void replaceTreeItem(HWND hwnd, HANDLE hContact, const char *module, const char void refreshTree(int restore)
{
- UseKnownModList = db_get_b(NULL,modname,"UseKnownModList",0);
if (populating) return;
populating = 1;
forkthread(PopulateModuleTreeThreadFunc,0,(HWND)restore);
@@ -488,9 +465,6 @@ void __cdecl PopulateModuleTreeThreadFunc(LPVOID di) module = modlist.first;
while (module)
{
- // set the module status type for the icon
- module->known = IsModuleKnown(module->name);
-
if (!IsModuleEmpty(hContact,module->name))
{
tvi.hParent = contact;
@@ -500,18 +474,9 @@ void __cdecl PopulateModuleTreeThreadFunc(LPVOID di) lParam = (ModuleTreeInfoStruct *)mir_calloc(sizeof(ModuleTreeInfoStruct));
lParam->hContact = hContact;
- if (!module->known)
- {
- tvi.item.iImage = 5;
- tvi.item.iSelectedImage = 6;
- lParam->type = UNKNOWN_MODULE;
- }
- else
- {
- tvi.item.iImage = 1;
- tvi.item.iSelectedImage = 2;
- lParam->type = KNOWN_MODULE;
- }
+ tvi.item.iImage = 1;
+ tvi.item.iSelectedImage = 2;
+ lParam->type = KNOWN_MODULE;
tvi.item.lParam = (LPARAM)lParam;
@@ -612,18 +577,9 @@ void moduleListWM_NOTIFY(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)// hwnd _lParam = (ModuleTreeInfoStruct *)mir_calloc(sizeof(ModuleTreeInfoStruct));
_lParam->hContact = hContact;
- if (IsModuleKnown(module->name))
- {
- tvi.item.iImage = 5;
- tvi.item.iSelectedImage = 6;
- _lParam->type = KNOWN_MODULE;
- }
- else
- {
- tvi.item.iImage = 1;
- tvi.item.iSelectedImage = 2;
- _lParam->type = UNKNOWN_MODULE;
- }
+ tvi.item.iImage = 5;
+ tvi.item.iSelectedImage = 6;
+ _lParam->type = KNOWN_MODULE;
tvi.item.lParam = (LPARAM)_lParam;
TreeView_InsertItem(hwnd2Tree, &tvi);
@@ -659,7 +615,7 @@ void moduleListWM_NOTIFY(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)// hwnd if (populating) Select = 0;
- if (mtis->type == MODULE || mtis->type == UNKNOWN_MODULE) {
+ if (mtis->type == MODULE) {
SettingListInfo *info = (SettingListInfo*)GetWindowLongPtr(hwnd2Settings,GWLP_USERDATA);
BOOL refresh = 1;
@@ -776,14 +732,8 @@ void moduleListWM_NOTIFY(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)// hwnd if (TreeView_GetItem(((LPNMHDR)lParam)->hwndFrom, &tvi)) {
tvi.mask = TVIF_IMAGE|TVIF_SELECTEDIMAGE;
- if (!IsModuleKnown(newtext)) {
- tvi.iImage = 5;
- tvi.iSelectedImage = 6;
- }
- else {
- tvi.iImage = 1;
- tvi.iSelectedImage = 2;
- }
+ tvi.iImage = 1;
+ tvi.iSelectedImage = 2;
TreeView_SetItem(((LPNMHDR)lParam)->hwndFrom, &tvi);
PopulateSettings(GetDlgItem(hwnd, IDC_SETTINGS), mtis->hContact, newtext);
@@ -823,10 +773,10 @@ void moduleListRightClick(HWND hwnd, WPARAM wParam,LPARAM lParam) // hwnd here i hMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_CONTEXTMENU));
TranslateMenu(hMenu);
if (mtis->type == CONTACT && hContact) menuNumber = 2;
- else if ((mtis->type == MODULE || mtis->type == UNKNOWN_MODULE) && !hContact) menuNumber = 1;
+ else if ((mtis->type == MODULE) && !hContact) menuNumber = 1;
else if (mtis->type == CONTACT && !hContact) menuNumber = 3;
else if (mtis->type == CONTACT_ROOT_ITEM && !hContact) menuNumber = 4;
- else if ((mtis->type == MODULE || mtis->type == UNKNOWN_MODULE) && hContact) menuNumber = 5;
+ else if ((mtis->type == MODULE) && hContact) menuNumber = 5;
else return;
hSubMenu = GetSubMenu(hMenu, menuNumber);
@@ -882,30 +832,6 @@ void moduleListRightClick(HWND hwnd, WPARAM wParam,LPARAM lParam) // hwnd here i case MENU_EXPORTDB:
exportDB(INVALID_HANDLE_VALUE, module);
break;
-
- case MENU_ADDKNOWN:
- {
- DBVARIANT dbv;
- char *moduletemp = (char*)_alloca(strlen(module)*3);
- unsigned int i;
- moduletemp[0] = '\0';
- for(i=0; i < strlen(module); i++) {
- if (module[i]==' ')
- strcat(moduletemp,"\\ ");
- else strncat(moduletemp,&module[i],1);
- }
-
- if ( !db_get(NULL,modname,"CoreModules",&dbv) && dbv.type == DBVT_ASCIIZ) {
- int len = (int)strlen(dbv.pszVal) + 10 + (int)strlen(moduletemp);
- char* temp = (char*)_alloca(len);
- mir_snprintf(temp, len, "%s, %s", dbv.pszVal, moduletemp);
- db_set_s(NULL,modname,"CoreModules",temp);
- db_free(&dbv);
- }
- else db_set_s(NULL,modname,"CoreModules",moduletemp);
- RegisterSingleModule((WPARAM)module,0);
- }
- break;
}
}
break;
diff --git a/plugins/DbEditorPP/src/options.cpp b/plugins/DbEditorPP/src/options.cpp index 70319c0c31..d30e3b7e97 100644 --- a/plugins/DbEditorPP/src/options.cpp +++ b/plugins/DbEditorPP/src/options.cpp @@ -8,16 +8,11 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) case WM_INITDIALOG:
{
bInitDone = false;
- DBVARIANT dbv;
CheckDlgButton(hwnd,IDC_EXPANDSETTINGS,db_get_b(NULL,modname,"ExpandSettingsOnOpen",0));
CheckDlgButton(hwnd,IDC_RESTORESETTINGS,db_get_b(NULL,modname,"RestoreOnOpen",1));
- CheckDlgButton(hwnd,IDC_USEKNOWNMODS,db_get_b(NULL,modname,"UseKnownModList",0));
CheckDlgButton(hwnd,IDC_WARNONDEL,db_get_b(NULL,modname,"WarnOnDelete",1));
CheckDlgButton(hwnd,IDC_MENU,db_get_b(NULL,modname,"UserMenuItem",0));
CheckDlgButton(hwnd,IDC_POPUPS,usePopups);
- if (!db_get(NULL,modname,"CoreModules",&dbv) && dbv.type == DBVT_ASCIIZ)
- SetDlgItemText(hwnd,IDC_MODULES,dbv.pszVal);
- db_free(&dbv);
SetDlgItemInt(hwnd,IDC_POPUPTIMEOUT,db_get_w(NULL,modname,"PopupDelay",4),0);
SendDlgItemMessage(hwnd, IDC_COLOUR, CPM_SETCOLOUR, 0, (LPARAM)db_get_dw(NULL,modname,"PopupColour",RGB(255,0,0)));
TranslateDialogDefault(hwnd);
@@ -29,7 +24,6 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
case IDC_RESTORESETTINGS:
case IDC_EXPANDSETTINGS:
- case IDC_USEKNOWNMODS:
case IDC_MENU:
case IDC_POPUPS:
case IDC_WARNONDEL:
@@ -37,7 +31,6 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
break;
case IDC_POPUPTIMEOUT:
- case IDC_MODULES:
if(bInitDone && (HIWORD(wParam) == EN_CHANGE))
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
break;
@@ -51,16 +44,12 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
case PSN_APPLY:
{
- char mods[4096];
db_set_b(NULL,modname,"ExpandSettingsOnOpen",(BYTE)IsDlgButtonChecked(hwnd,IDC_EXPANDSETTINGS));
db_set_b(NULL,modname,"RestoreOnOpen",(BYTE)IsDlgButtonChecked(hwnd,IDC_RESTORESETTINGS));
db_set_b(NULL,modname,"WarnOnDelete",(BYTE)IsDlgButtonChecked(hwnd,IDC_WARNONDEL));
db_set_b(NULL,modname,"UserMenuItem",(BYTE)IsDlgButtonChecked(hwnd,IDC_MENU));
- db_set_b(NULL,modname,"UseKnownModList",(BYTE)IsDlgButtonChecked(hwnd,IDC_USEKNOWNMODS));
usePopups = IsDlgButtonChecked(hwnd,IDC_POPUPS);
db_set_b(NULL,modname,"UsePopUps",(BYTE)usePopups);
- if (GetDlgItemText(hwnd,IDC_MODULES,mods,4096))
- db_set_s(NULL,modname,"CoreModules",mods);
db_set_w(NULL,modname,"PopupDelay",(WORD)GetDlgItemInt(hwnd,IDC_POPUPTIMEOUT,NULL,0));
db_set_dw(NULL,modname,"PopupColour",(DWORD)SendDlgItemMessage(hwnd, IDC_COLOUR, CPM_GETCOLOUR, 0, 0));
diff --git a/plugins/DbEditorPP/src/resource.h b/plugins/DbEditorPP/src/resource.h index c32d146126..708b4195a1 100644 --- a/plugins/DbEditorPP/src/resource.h +++ b/plugins/DbEditorPP/src/resource.h @@ -29,8 +29,6 @@ #define IDD_OPTIONS 122
#define ICO_KNOWN 124
#define ICO_KNOWNOPEN 125
-#define ICO_UNKNOWNOPEN 126
-#define ICO_UNKNOWN 127
#define ICO_SETTINGS 128
#define ICO_ONLINE 129
#define IDC_MODULES 1000
@@ -72,7 +70,6 @@ #define IDC_SEARCH 1042
#define IDC_EXACT 1043
#define IDC_EXPANDSETTINGS 1044
-#define IDC_USEKNOWNMODS 1045
#define IDC_WARNONDEL 1047
#define IDC_POPUPS 1048
#define IDC_POPUPTIMEOUT 1049
@@ -138,7 +135,6 @@ #define MENU_OPTIONS 40056
#define MENU_DELETE 40057
#define MENU_REFRESH 40058
-#define MENU_ADDKNOWN 40059
#define MENU_FILTER_ALL 40060
#define MENU_FILTER_LOADED 40061
#define MENU_FILTER_UNLOADED 40062
diff --git a/plugins/ExternalAPI/delphi/m_dbeditor.inc b/plugins/ExternalAPI/delphi/m_dbeditor.inc index 60530a1e61..e6e9a0c5c8 100644 --- a/plugins/ExternalAPI/delphi/m_dbeditor.inc +++ b/plugins/ExternalAPI/delphi/m_dbeditor.inc @@ -3,27 +3,6 @@ const
{
- wParam: Module name
- lParam: 0
- Affect: Register single module as 'known'
- Note: must be used after or in ME_SYSTEM_MODULESLOADED
-}
- MS_DBEDIT_REGISTERSINGLEMODULE:PAnsiChar = 'DBEditorpp/RegisterSingleModule';
-
-{
- wParam: array with module names
- lParam: count of module names
- Affect: Register modules as 'known'
- Note: must be used after or in ME_SYSTEM_MODULESLOADED
- Example:
- var mods:array [0..2] = ('Module1','Module2','Module3');
- ...
- CallService(MS_DBEDIT_REGISTERMODULE,WPARAM(@mods),3);
-
-}
- MS_DBEDIT_REGISTERMODULE:PAnsiChar = 'DBEditorpp/RegisterModule';
-
-{
wParam: hContact
lParam: 0
Affect: Open user tree in DBE++
diff --git a/plugins/ExternalAPI/delphi/m_rssnews.inc b/plugins/ExternalAPI/delphi/m_rssnews.inc deleted file mode 100644 index cfe4fef5b3..0000000000 --- a/plugins/ExternalAPI/delphi/m_rssnews.inc +++ /dev/null @@ -1,51 +0,0 @@ -{
- RSSNews plugin
- by Angelo Luiz Tartari
-}
-
-{$IFNDEF M_RSSNEWS}
-{$DEFINE M_RSSNEWS}
-
-const
-
-(*
- Retrieve news.
- wParam = (WPARAM)(HANDLE)hContact
- lParam = 0
- Returns: 0 on success, -1 on error.
-*)
- MS_RSSNEWS_GETNEWS = 'RSSNews/GetNews';
-
-(*
- Retrieve news (all feeds).
- wParam = 0
- lParam = 0
- Returns: 0 on success, -1 on error.
-*)
- MS_RSSNEWS_GETALLNEWS = 'RSSNews/GetAllNews';
-
-(*
- Brings up the add new feed dialog.
- wParam = 0
- lParam = 0
- Returns: 0 on success, -1 on error.
-*)
- MS_RSSNEWS_ADDNEWFEED = 'RSSNews/AddNewFeed';
-
-(*
- Brings up the import dialog.
- wParam = 0
- lParam = 0
- Returns: 0 on success, -1 on error.
-*)
- MS_RSSNEWS_IMPORT = 'RSSNews/Import';
-
-(*
- Brings up the export dialog.
- wParam = 0
- lParam = 0
- Returns: 0 on success, -1 on error.
-*)
- MS_RSSNEWS_EXPORT = 'RSSNews/Export';
-
-{$ENDIF}
diff --git a/plugins/ExternalAPI/m_svc_dbepp.h b/plugins/ExternalAPI/m_svc_dbepp.h index d4afd1c7d0..a165fd5e71 100644 --- a/plugins/ExternalAPI/m_svc_dbepp.h +++ b/plugins/ExternalAPI/m_svc_dbepp.h @@ -23,27 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define M_DBEDITOR
/*
-Register single module as 'known'
-wParam=(char*)Module name
-lParam=0
-always returns 0
-Note: must be used after or in ME_SYSTEM_MODULESLOADED
-*/
-#define MS_DBEDIT_REGISTERSINGLEMODULE "DBEditorpp/RegisterSingleModule"
-
-/*
-Register modules as 'known'
-wParam=(char**)array with module names
-lParam=(int)count of module names
-always returns 0
-Note: must be used after or in ME_SYSTEM_MODULESLOADED
-Example:
- char * mods[3] = {"Module1", "Module2", "Module3"};
- CallService(MS_DBEDIT_REGISTERMODULE, (WPARAM)mods, (LPARAM)3);
-*/
-#define MS_DBEDIT_REGISTERMODULE "DBEditorpp/RegisterModule"
-
-/*
Open user tree in DBE++
wParam=(HANDLE)hContact
lParam=0
diff --git a/plugins/HTTPServer/src/main.cpp b/plugins/HTTPServer/src/main.cpp index 3e476d40b8..51c26eb421 100644 --- a/plugins/HTTPServer/src/main.cpp +++ b/plugins/HTTPServer/src/main.cpp @@ -920,9 +920,6 @@ int nSystemShutdown(WPARAM /*wparam*/, LPARAM /*lparam*/) { MessageBox(NULL, "Failed to read configuration file : " szMimeTypeConfigFile, MSG_BOX_TITEL, MB_OK);
}
- // Plugin sweeper support
- db_set_s(NULL, "Uninstall", "HTTPServer", MODULE);
-
nMaxUploadSpeed = db_get_dw(NULL, MODULE, "MaxUploadSpeed", nMaxUploadSpeed);
nMaxConnectionsTotal = db_get_dw(NULL, MODULE, "MaxConnectionsTotal", nMaxConnectionsTotal);
nMaxConnectionsPerUser = db_get_dw(NULL, MODULE, "MaxConnectionsPerUser", nMaxConnectionsPerUser);
diff --git a/plugins/HistoryPlusPlus/historypp.dpr b/plugins/HistoryPlusPlus/historypp.dpr index 1cd1c7908a..cc08f42e79 100644 --- a/plugins/HistoryPlusPlus/historypp.dpr +++ b/plugins/HistoryPlusPlus/historypp.dpr @@ -314,9 +314,6 @@ begin HookFSChanged := HookEvent(ME_FONT_RELOAD,OnFSChanged);
if MetaContactsEnabled then HookMetaDefaultChanged := HookEvent(ME_MC_DEFAULTTCHANGED,OnMetaDefaultChanged);
- // Register in dbeditor
- CallService(MS_DBEDIT_REGISTERSINGLEMODULE, WPARAM(PAnsiChar(hppDBName)), 0);
-
// return successfully
Result:=0;
end;
diff --git a/plugins/KeyboardNotify/src/main.cpp b/plugins/KeyboardNotify/src/main.cpp index ad3507975a..4e47de9f8c 100644 --- a/plugins/KeyboardNotify/src/main.cpp +++ b/plugins/KeyboardNotify/src/main.cpp @@ -782,9 +782,6 @@ static int ModulesLoaded(WPARAM wParam, LPARAM lParam) hFlashingEventService = CreateServiceFunction(MS_KBDNOTIFY_FLASHINGACTIVE, IsFlashingActiveService);
hNormalizeSequenceService = CreateServiceFunction(MS_KBDNOTIFY_NORMALSEQUENCE, NormalizeSequenceService);
- if (ServiceExists("DBEditorpp/RegisterSingleModule"))
- CallService("DBEditorpp/RegisterSingleModule", (WPARAM)KEYBDMODULE, 0);
-
return 0;
}
diff --git a/plugins/LangMan/src/main.cpp b/plugins/LangMan/src/main.cpp index 595d68d14f..e25e2cabc7 100644 --- a/plugins/LangMan/src/main.cpp +++ b/plugins/LangMan/src/main.cpp @@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. HINSTANCE hInst;
-static HANDLE hHookModulesLoaded;
int hLangpack;
static PLUGININFOEX pluginInfo = {
@@ -88,13 +87,6 @@ extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD) ///////////////////////////////////////////////////////////////////////////////
-static int LangManModulesLoaded(WPARAM, LPARAM)
-{
- if ( ServiceExists("DBEditorpp/RegisterSingleModule"))
- CallService("DBEditorpp/RegisterSingleModule", (WPARAM)"LangMan", 0);
- return 0;
-}
-
extern "C" __declspec(dllexport) int Load(void)
{
@@ -124,7 +116,6 @@ extern "C" __declspec(dllexport) int Load(void) InstallFile(_T("LangMan-Readme.txt"), _T("Docs\\"));
InstallFile(_T("LangMan-License.txt"), _T("Docs\\"));
InstallFile(_T("LangMan-SDK.zip"), _T("Docs\\"));
- hHookModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED, LangManModulesLoaded);
return 0;
}
@@ -133,6 +124,5 @@ extern "C" __declspec(dllexport) int Load(void) extern "C" __declspec(dllexport) int Unload(void)
{
UninitOptions();
- UnhookEvent(hHookModulesLoaded);
return 0;
}
\ No newline at end of file diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp index a58067409b..7a3e844450 100644 --- a/plugins/ListeningTo/src/listeningto.cpp +++ b/plugins/ListeningTo/src/listeningto.cpp @@ -282,9 +282,6 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) if (ServiceExists(MS_MC_GETPROTOCOLNAME))
metacontacts_proto = (char *) CallService(MS_MC_GETPROTOCOLNAME, 0, 0);
- // add our modules to the KnownModules list
- CallService("DBEditorpp/RegisterSingleModule", (WPARAM) MODULE_NAME, 0);
-
// icons
Icon_Register(hInst, LPGEN("ListeningTo"), iconList, SIZEOF(iconList));
diff --git a/plugins/MetaContacts/src/meta_services.cpp b/plugins/MetaContacts/src/meta_services.cpp index 66579ce31f..2f5aad2654 100755 --- a/plugins/MetaContacts/src/meta_services.cpp +++ b/plugins/MetaContacts/src/meta_services.cpp @@ -978,10 +978,6 @@ int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam) meta_group_hack_disabled = TRUE;
}
- // for database editor++ ver 3+
- if (ServiceExists("DBEditorpp/RegisterSingleModule"))
- CallService("DBEditorpp/RegisterSingleModule",(WPARAM)META_PROTO, 0);
-
HookEvent(ME_CLIST_PREBUILDCONTACTMENU, Meta_ModifyMenu);
HookEvent(ME_CLIST_DOUBLECLICKED, Meta_ClistDoubleClicked );
diff --git a/plugins/MirandaNGHistoryToDB/MirandaNGHistoryToDB.dpr b/plugins/MirandaNGHistoryToDB/MirandaNGHistoryToDB.dpr index 82768f86cd..660f2e754d 100644 --- a/plugins/MirandaNGHistoryToDB/MirandaNGHistoryToDB.dpr +++ b/plugins/MirandaNGHistoryToDB/MirandaNGHistoryToDB.dpr @@ -676,8 +676,6 @@ begin IMUPD.szBetaChangelogURL := htdChangelogURL;
CallService(MS_UPDATE_REGISTER, 0, LPARAM(@IMUPD));
end;}
- // Регистрируемся в dbeditor
- CallService(MS_DBEDIT_REGISTERSINGLEMODULE, WPARAM(PAnsiChar(htdDBName)), 0);
{ Запускаем контроль файла конфигурации
FILE_NOTIFY_CHANGE_FILE_NAME = $00000001;//Изменение имени файла
FILE_NOTIFY_CHANGE_DIR_NAME = $00000002;//Изменение имени папки
diff --git a/plugins/Msg_Export/src/main.cpp b/plugins/Msg_Export/src/main.cpp index bcb4c39430..1ecde886e5 100755 --- a/plugins/Msg_Export/src/main.cpp +++ b/plugins/Msg_Export/src/main.cpp @@ -213,9 +213,6 @@ extern "C" __declspec(dllexport) int Load() enRenameAction = (ENDialogAction)db_get_b(NULL, MODULE, "RenameAction", enRenameAction);
enDeleteAction = (ENDialogAction)db_get_b(NULL, MODULE, "DeleteAction", enDeleteAction);
- // Plugin sweeper support
- db_set_ts(NULL, "Uninstall", "Message Export", _T(MODULE));
-
HANDLE hServiceFunс = 0;
if (bReplaceHistory)
hServiceFunс = CreateServiceFunction(MS_HISTORY_SHOWCONTACTHISTORY, ShowExportHistory); //this need new code
diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp index 32cde9fd00..ab1eb4ad89 100644 --- a/plugins/Nudge/src/main.cpp +++ b/plugins/Nudge/src/main.cpp @@ -225,13 +225,6 @@ void LoadProtocols(void) shake.Load();
}
-void RegisterToDbeditorpp(void)
-{
- // known modules list
- if (ServiceExists("DBEditorpp/RegisterSingleModule"))
- CallService("DBEditorpp/RegisterSingleModule", (WPARAM)"Nudge", 0);
-}
-
static IconItem iconList[] =
{
{ LPGEN("Nudge as Default"), "Nudge_Default", IDI_NUDGE }
@@ -292,7 +285,6 @@ static int ContactWindowOpen(WPARAM wparam,LPARAM lParam) int ModulesLoaded(WPARAM,LPARAM)
{
- RegisterToDbeditorpp();
LoadProtocols();
LoadIcons();
LoadPopupClass();
diff --git a/plugins/QuickContacts/src/quickcontacts.cpp b/plugins/QuickContacts/src/quickcontacts.cpp index e6ec71a71e..98683402c5 100644 --- a/plugins/QuickContacts/src/quickcontacts.cpp +++ b/plugins/QuickContacts/src/quickcontacts.cpp @@ -114,9 +114,6 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) {
InitOptions();
- // add our modules to the KnownModules list
- CallService("DBEditorpp/RegisterSingleModule", (WPARAM) MODULE_NAME, 0);
-
// Get number of protocols
int pcount = 0;
PROTOACCOUNT** pdesc;
diff --git a/plugins/QuickSearch/quicksearch.dpr b/plugins/QuickSearch/quicksearch.dpr index cd200ff6b5..5f368c9563 100644 --- a/plugins/QuickSearch/quicksearch.dpr +++ b/plugins/QuickSearch/quicksearch.dpr @@ -185,8 +185,6 @@ function OnModulesLoaded(wParam:WPARAM;lParam:LPARAM):int;cdecl; begin
UnhookEvent(onloadhook);
- CallService(MS_DBEDIT_REGISTERSINGLEMODULE,twparam(qs_module),0);
-
RegisterIcons;
RegisterColors;
diff --git a/plugins/SeenPlugin/src/main.cpp b/plugins/SeenPlugin/src/main.cpp index 8468421e53..01a031333a 100644 --- a/plugins/SeenPlugin/src/main.cpp +++ b/plugins/SeenPlugin/src/main.cpp @@ -76,11 +76,6 @@ int MainInit(WPARAM,LPARAM) SkinAddNewSoundExT("LastSeenTrackedStatusOffline", LPGENT("LastSeen"), LPGENT("User Logged Off"));
SkinAddNewSoundExT("LastSeenTrackedStatusFromOffline", LPGENT("LastSeen"), LPGENT("User Logged In"));
- // known modules list
- if (ServiceExists("DBEditorpp/RegisterSingleModule"))
- CallService("DBEditorpp/RegisterSingleModule", (WPARAM)S_MOD, 0);
- db_set_s(NULL,"Uninstall",Translate("Last seen"),S_MOD);
-
if ( ServiceExists(MS_TIPPER_ADDTRANSLATION))
for (int i=0; i < TRANSNUMBER; i++)
CallService(MS_TIPPER_ADDTRANSLATION, 0, (LPARAM)&idleTr[i]);
diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp index ef0abee184..c0d89db564 100644 --- a/plugins/SimpleStatusMsg/src/main.cpp +++ b/plugins/SimpleStatusMsg/src/main.cpp @@ -1839,10 +1839,6 @@ static int OnModulesLoaded(WPARAM wParam, LPARAM lParam) #ifdef _DEBUG
log2file("### Session started ###");
#endif
- // known modules list
- if (ServiceExists("DBEditorpp/RegisterSingleModule"))
- CallService("DBEditorpp/RegisterSingleModule", (WPARAM)"SimpleStatusMsg", 0);
-
IconsInit();
OnAccListChanged(0, 0);
diff --git a/plugins/SpellChecker/src/spellchecker.cpp b/plugins/SpellChecker/src/spellchecker.cpp index ba8daf44ae..31f5e40057 100644 --- a/plugins/SpellChecker/src/spellchecker.cpp +++ b/plugins/SpellChecker/src/spellchecker.cpp @@ -107,9 +107,6 @@ static int ModulesLoaded(WPARAM wParam, LPARAM lParam) { variables_enabled = ServiceExists(MS_VARS_FORMATSTRING); - // add our modules to the KnownModules list - CallService("DBEditorpp/RegisterSingleModule", (WPARAM) MODULE_NAME, 0); - // Folders plugin support if (hDictionariesFolder = FoldersRegisterCustomPathT(LPGEN("Spell Checker"), LPGEN("Dictionaries"), DICTIONARIES_FOLDER)) { dictionariesFolder = (TCHAR *) mir_alloc(sizeof(TCHAR) * MAX_PATH); diff --git a/plugins/Watrack/watrack.dpr b/plugins/Watrack/watrack.dpr index 2a0929c2d1..363dd8dd12 100644 --- a/plugins/Watrack/watrack.dpr +++ b/plugins/Watrack/watrack.dpr @@ -535,8 +535,6 @@ function OnModulesLoaded(wParam:WPARAM;lParam:LPARAM):int;cdecl; var
p:PAnsiChar;
begin
- CallService(MS_DBEDIT_REGISTERSINGLEMODULE,twparam(PluginShort),0);
-
hTimer:=0;
OleInitialize(nil);
diff --git a/plugins/ZeroNotification/src/main.cpp b/plugins/ZeroNotification/src/main.cpp index 83935d2e4e..4703795c22 100644 --- a/plugins/ZeroNotification/src/main.cpp +++ b/plugins/ZeroNotification/src/main.cpp @@ -254,9 +254,6 @@ extern "C" __declspec(dllexport) int Load(void) hEventSoundSettingChange = HookEvent(ME_DB_CONTACT_SETTINGCHANGED, SoundSettingChanged);
hEventOptionsInitialize = HookEvent(ME_OPT_INITIALISE, OptionsInitialize);
- //Uninstall info
- db_set_s(NULL, "Uninstall", MODNAME, MODNAME);
-
return 0;
}
diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp index 39e92289f3..4c7250951f 100644 --- a/protocols/IRCG/src/ircproto.cpp +++ b/protocols/IRCG/src/ircproto.cpp @@ -190,7 +190,6 @@ static int sttCheckPerform( const char *szSetting, LPARAM lParam ) int CIrcProto::OnModulesLoaded( WPARAM, LPARAM )
{
- char szTemp3[256];
NETLIBUSER nlu = {0};
TCHAR name[128];
@@ -211,11 +210,6 @@ int CIrcProto::OnModulesLoaded( WPARAM, LPARAM ) nlu.ptszDescriptiveName = name;
hNetlibDCC = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);
- //add as a known module in DB Editor ++
- CallService("DBEditorpp/RegisterSingleModule", (WPARAM)m_szModuleName, 0);
- mir_snprintf(szTemp3, sizeof(szTemp3), "%s DCC", m_szModuleName);
- CallService("DBEditorpp/RegisterSingleModule", (WPARAM)szTemp3, 0);
-
if ( ServiceExists("MBot/GetFcnTable")) {
CallService(MS_MBOT_REGISTERIRC, 0, (LPARAM)m_szModuleName);
m_bMbotInstalled = TRUE;
|