diff options
Diffstat (limited to 'plugins/PluginUpdater')
| -rw-r--r-- | plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj | 1 | ||||
| -rw-r--r-- | plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj.filters | 3 | ||||
| -rw-r--r-- | plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj | 1 | ||||
| -rw-r--r-- | plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj.filters | 3 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/Options.cpp | 2 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/PluginUpdater.cpp | 6 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/Utils.cpp | 16 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/Version.h | 2 |
8 files changed, 15 insertions, 19 deletions
diff --git a/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj b/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj index 8aaad5e783..71fa37158e 100644 --- a/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj +++ b/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj @@ -213,7 +213,6 @@ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\Notifications.cpp" />
- <ClCompile Include="src\Options.cpp" />
<ClCompile Include="src\PluginUpdater.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
diff --git a/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj.filters b/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj.filters index 9a8781ff63..eca3d5543c 100644 --- a/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj.filters +++ b/plugins/PluginUpdater/PluginUpdaterIM_10.vcxproj.filters @@ -67,9 +67,6 @@ <ClCompile Include="src\Notifications.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\Options.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="src\PluginUpdater.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj b/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj index 2506d85204..348c13bc30 100644 --- a/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj +++ b/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj @@ -205,7 +205,6 @@ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\Notifications.cpp" />
- <ClCompile Include="src\Options.cpp" />
<ClCompile Include="src\PluginUpdater.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
diff --git a/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj.filters b/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj.filters index 9a8781ff63..eca3d5543c 100644 --- a/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj.filters +++ b/plugins/PluginUpdater/PluginUpdaterIM_12.vcxproj.filters @@ -67,9 +67,6 @@ <ClCompile Include="src\Notifications.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="src\Options.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="src\PluginUpdater.cpp">
<Filter>Source Files</Filter>
</ClCompile>
diff --git a/plugins/PluginUpdater/src/Options.cpp b/plugins/PluginUpdater/src/Options.cpp index aae9592534..a0375bef2d 100644 --- a/plugins/PluginUpdater/src/Options.cpp +++ b/plugins/PluginUpdater/src/Options.cpp @@ -19,8 +19,6 @@ Boston, MA 02111-1307, USA. #include "common.h"
-PlugOptions opts;
-
INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch (msg) {
diff --git a/plugins/PluginUpdater/src/PluginUpdater.cpp b/plugins/PluginUpdater/src/PluginUpdater.cpp index f8d46d36cc..ef4d048d93 100644 --- a/plugins/PluginUpdater/src/PluginUpdater.cpp +++ b/plugins/PluginUpdater/src/PluginUpdater.cpp @@ -19,6 +19,8 @@ Boston, MA 02111-1307, USA. #include "common.h"
+PlugOptions opts;
+
#if MIRANDA_VER < 0x0A00
#define MIID_UPDATER {0x4a47b19b, 0xde5a, 0x4436, { 0xab, 0x4b, 0xe1, 0xf3, 0xa0, 0x22, 0x5d, 0xe7}}
@@ -124,6 +126,8 @@ extern "C" __declspec(dllexport) int Load(void) mi.pszName = LPGEN("Available components list");
mi.pszService = MODNAME"/ShowList";
Menu_AddMainMenuItem(&mi);
+
+ HookEvent(ME_OPT_INITIALISE, OptInit);
#endif
// Add hotkey
@@ -136,8 +140,6 @@ extern "C" __declspec(dllexport) int Load(void) hkd.lParam = FALSE;
Hotkey_Register(&hkd);
- // Add options hook
- HookEvent(ME_OPT_INITIALISE, OptInit);
HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded);
HookEvent(ME_SYSTEM_PRESHUTDOWN, OnPreShutdown);
diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp index 1c1f4c2ca5..5c6452f4b0 100644 --- a/plugins/PluginUpdater/src/Utils.cpp +++ b/plugins/PluginUpdater/src/Utils.cpp @@ -180,12 +180,16 @@ int Get_CRC(unsigned char* buffer, ULONG bufsize) TCHAR* GetDefaultUrl()
{
- TCHAR *result = db_get_tsa(NULL, MODNAME, "UpdateURL");
- if (result == NULL) { // URL is not set
- db_set_ts(NULL, MODNAME, "UpdateURL", _T(DEFAULT_UPDATE_URL));
- result = mir_tstrdup( _T(DEFAULT_UPDATE_URL));
- }
- return result;
+ #if MIRANDA_VER < 0x0A00
+ return mir_tstrdup(_T("http://miranda-ng.org/distr/deprecated/0.94.9"));
+ #else
+ TCHAR *result = db_get_tsa(NULL, MODNAME, "UpdateURL");
+ if (result == NULL) { // URL is not set
+ db_set_ts(NULL, MODNAME, "UpdateURL", _T(DEFAULT_UPDATE_URL));
+ result = mir_tstrdup( _T(DEFAULT_UPDATE_URL));
+ }
+ return result;
+ #endif
}
int CompareHashes(const ServListEntry *p1, const ServListEntry *p2)
diff --git a/plugins/PluginUpdater/src/Version.h b/plugins/PluginUpdater/src/Version.h index bdadc348c3..f12beeebe3 100644 --- a/plugins/PluginUpdater/src/Version.h +++ b/plugins/PluginUpdater/src/Version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0
#define __MINOR_VERSION 1
#define __RELEASE_NUM 2
-#define __BUILD_NUM 0
+#define __BUILD_NUM 1
#include <stdver.h>
|