summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-07-16 13:31:25 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-07-16 13:31:25 +0300
commitb1c5a5361b700745faf23bea8ecd94a45d74961d (patch)
treea521d25e7abc5144d5f3ce33e94cf7db7711d3ff
parente0f87f7d9ac30737eb5e04ec4ce3a47eb8e1cc3d (diff)
fixes #1505 (AssocMgr: cannot disable MSN integration)
-rw-r--r--protocols/MSN/src/msn.cpp2
-rw-r--r--protocols/MSN/src/msn_links.cpp5
-rw-r--r--protocols/MSN/src/version.h6
3 files changed, 3 insertions, 10 deletions
diff --git a/protocols/MSN/src/msn.cpp b/protocols/MSN/src/msn.cpp
index 89c38531ae..4f1ebb038d 100644
--- a/protocols/MSN/src/msn.cpp
+++ b/protocols/MSN/src/msn.cpp
@@ -30,7 +30,6 @@ CMPlugin g_plugin;
// Initialization routines
void MsnLinks_Init(void);
-void MsnLinks_Destroy(void);
/////////////////////////////////////////////////////////////////////////////////////////
// Global variables
@@ -95,6 +94,5 @@ int CMPlugin::Load()
int CMPlugin::Unload()
{
MSN_RemoveContactMenus();
- MsnLinks_Destroy();
return 0;
}
diff --git a/protocols/MSN/src/msn_links.cpp b/protocols/MSN/src/msn_links.cpp
index 0235544138..05fd20136a 100644
--- a/protocols/MSN/src/msn_links.cpp
+++ b/protocols/MSN/src/msn_links.cpp
@@ -137,8 +137,3 @@ void MsnLinks_Init(void)
CreateServiceFunction(szService, ServiceParseMsnimLink);
AssocMgr_AddNewUrlTypeW("msnim:", TranslateT("MSN Link Protocol"), g_plugin.getInst(), IDI_MSN, szService, 0);
}
-
-void MsnLinks_Destroy(void)
-{
- CallService(MS_ASSOCMGR_REMOVEURLTYPE, 0, (LPARAM)"msnim:");
-}
diff --git a/protocols/MSN/src/version.h b/protocols/MSN/src/version.h
index 852ea892b6..b9fbd7b8d9 100644
--- a/protocols/MSN/src/version.h
+++ b/protocols/MSN/src/version.h
@@ -19,9 +19,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define __MAJOR_VERSION 0
-#define __MINOR_VERSION 14
-#define __RELEASE_NUM 0
-#define __BUILD_NUM 2
+#define __MINOR_VERSION 95
+#define __RELEASE_NUM 9
+#define __BUILD_NUM 1
#include <stdver.h>