summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2015-08-08 22:10:29 +0000
committerKirill Volinsky <mataes2007@gmail.com>2015-08-08 22:10:29 +0000
commit37293d2f4ab8a9ed5cb90ae606ff96f01bd72f78 (patch)
treef3665f2999069630841dcbb07279ac2d88c8ff3f
parente91de102218d28834e9ef02505b197eb1dbe927a (diff)
finally removing of stdurl
git-svn-id: http://svn.miranda-ng.org/main/trunk@14879 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--include/newpluginapi.h1
-rw-r--r--src/mir_app/src/newplugins.cpp6
2 files changed, 3 insertions, 4 deletions
diff --git a/include/newpluginapi.h b/include/newpluginapi.h
index afbc90e742..0c61b50960 100644
--- a/include/newpluginapi.h
+++ b/include/newpluginapi.h
@@ -61,7 +61,6 @@ MIR_APP_DLL(int) GetPluginLangId(const MUUID &uuid, int hLangpack);
#define MIID_HISTORY {0x5ca0cbc1, 0x999a, 0x4ea2, {0x8b, 0x44, 0xf8, 0xf6, 0x7d, 0x7f, 0x8e, 0xbe}}
#define MIID_UIUSERINFO {0x570b931c, 0x9af8, 0x48f1, {0xad, 0x9f, 0xc4, 0x49, 0x8c, 0x61, 0x8a, 0x77}}
-#define MIID_SRURL {0x5192445c, 0xf5e8, 0x46c0, {0x8f, 0x9e, 0x2b, 0x6d, 0x43, 0xe5, 0xc7, 0x53}}
#define MIID_SRAUTH {0x377780b9, 0x2b3b, 0x405b, {0x9f, 0x36, 0xb3, 0xc4, 0x87, 0x8e, 0x6f, 0x33}}
#define MIID_SRAWAY {0x5ab54c76, 0x1b4c, 0x4a00, {0xb4, 0x04, 0x48, 0xcb, 0xea, 0x5f, 0xef, 0xe7}}
#define MIID_SREMAIL {0xd005b5a6, 0x1b66, 0x445a, {0xb6, 0x03, 0x74, 0xd4, 0xd4, 0x55, 0x2d, 0xe2}}
diff --git a/src/mir_app/src/newplugins.cpp b/src/mir_app/src/newplugins.cpp
index c0d524f4f0..ffbc7f3be0 100644
--- a/src/mir_app/src/newplugins.cpp
+++ b/src/mir_app/src/newplugins.cpp
@@ -165,7 +165,7 @@ int LoadStdPlugins()
return 1;
}
- if (pluginDefault[13].pImpl == NULL)
+ if (pluginDefault[12].pImpl == NULL)
MessageBox(NULL, TranslateT("No messaging plugins loaded. Please install/enable one of the messaging plugins, for instance, \"StdMsg.dll\""), _T("Miranda NG"), MB_OK | MB_ICONWARNING);
return 0;
@@ -594,7 +594,7 @@ static bool loadClistModule(TCHAR* exe, pluginEntry *p)
if (bpi.clistlink() == 0) {
p->bpi = bpi;
p->pclass |= PCLASS_LOADED;
- pluginDefault[11].pImpl = p;
+ pluginDefault[10].pImpl = p;
LoadExtraIconsModule();
return true;
@@ -618,7 +618,7 @@ static pluginEntry* getCListModule(TCHAR *exe)
return p;
}
- MuuidReplacement& stdClist = pluginDefault[11];
+ MuuidReplacement& stdClist = pluginDefault[10];
if (LoadCorePlugin(stdClist)) {
mir_sntprintf(tszFullPath, _countof(tszFullPath), _T("%s\\Core\\%s.dll"), exe, stdClist.stdplugname);
if (loadClistModule(tszFullPath, stdClist.pImpl))