From 57abc51aad272a656282a52a460a47abe24e07d6 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 20 Jun 2012 23:51:53 +0000
Subject: - MS_SKIN2_ADDICON replaced with Skin_AddIcon; - SKINICONDESC_SIZE*
 constants removed and replaced with sizeof(sid); - added SIDF_PATH_UNICODE
 for all plugins; - dynamic translation fixed in the icolib options dialog

git-svn-id: http://svn.miranda-ng.org/main/trunk@507 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Popup/src/icons.cpp         |  2 +-
 plugins/Popup/src/main.cpp          | 16 ----------------
 plugins/Popup/src/notifications.cpp |  2 +-
 3 files changed, 2 insertions(+), 18 deletions(-)

(limited to 'plugins/Popup')

diff --git a/plugins/Popup/src/icons.cpp b/plugins/Popup/src/icons.cpp
index 5bfd22f49c..e33d39ec83 100644
--- a/plugins/Popup/src/icons.cpp
+++ b/plugins/Popup/src/icons.cpp
@@ -140,6 +140,6 @@ void InitIcons()
 				break;
 			}
 		}
-		CallService(MS_SKIN2_ADDICON, 0, (LPARAM)&sid);
+		Skin_AddIcon(&sid);
 	}
 }
\ No newline at end of file
diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index 0a9beb7382..84b1921aa2 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -380,22 +380,6 @@ void LoadHotkey() {
 //Function which makes the initializations
 static int ModulesLoaded(WPARAM wParam,LPARAM lParam)
 {
-	//check if 'Icon Library Manager' and 'FontService' exist (load icon and font later)
-	if (!ServiceExists(MS_FONT_REGISTER) || !ServiceExists(MS_SKIN2_ADDICON)) {
-		LPTSTR msg = TranslateTS(
-			_T("This version of Popup Plus requires\r\n")
-			_T("'Icon Library Manager' and 'FontService'\r\n")
-			_T("modules.\r\n")
-			_T("\r\n")
-			_T("You always can download them at\r\n")
-			_T("http://addons.miranda-im.org/\r\n")
-			_T("\r\n")
-			_T("Do you want to visit Miranda IM homepage now?\r\n"));
-		if (MessageBox(NULL, msg, _T("Popup Plus Error"), MB_YESNO|MB_ICONSTOP) == IDYES)
-			ShellExecute(NULL, _T("open"), _T("http://addons.miranda-im.org/"), NULL, NULL, SW_SHOWNORMAL);
-		return 0;
-	}
-
 	//check if History++ is installed
 	gbHppInstalled = ServiceExists(MS_HPP_GETVERSION) && ServiceExists(MS_HPP_EG_WINDOW) &&
 		(CallService(MS_HPP_GETVERSION, 0, 0) >= PLUGIN_MAKE_VERSION(1,5,0,112));
diff --git a/plugins/Popup/src/notifications.cpp b/plugins/Popup/src/notifications.cpp
index 97be02af44..3a8beb8f15 100644
--- a/plugins/Popup/src/notifications.cpp
+++ b/plugins/Popup/src/notifications.cpp
@@ -235,7 +235,7 @@ HANDLE RegisterNotification(POPUPNOTIFICATION *notification)
 	sid.pszName = setting;
 	sid.pszDescription = notification->lpzName;
 	sid.hDefaultIcon = notification->lchIcon;
-	CallService(MS_SKIN2_ADDICON, 0, (LPARAM)&sid);
+	Skin_AddIcon(&sid);
 
 	gTreeData.insert(ptd);
 	return (HANDLE)ptd;
-- 
cgit v1.2.3