From 258d7bfb5327f30de316ecd893d0c5f0f93e0fd3 Mon Sep 17 00:00:00 2001
From: Tobias Weimer <wishmaster51@googlemail.com>
Date: Sat, 14 Jun 2014 17:17:56 +0000
Subject: XSoundNotify: Use status descriptions from core

git-svn-id: http://svn.miranda-ng.org/main/trunk@9478 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/XSoundNotify/src/options.cpp  |  2 +-
 plugins/XSoundNotify/src/xsn_main.cpp | 37 +++++++++++++++++------------------
 2 files changed, 19 insertions(+), 20 deletions(-)

(limited to 'plugins/XSoundNotify/src')

diff --git a/plugins/XSoundNotify/src/options.cpp b/plugins/XSoundNotify/src/options.cpp
index c862d9a6a8..f7df767ace 100644
--- a/plugins/XSoundNotify/src/options.cpp
+++ b/plugins/XSoundNotify/src/options.cpp
@@ -228,7 +228,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 	return FALSE;
 }
 
-INT OptInit(WPARAM wParam, LPARAM lParam)
+INT OptInit(WPARAM wParam, LPARAM)
 {
 	OPTIONSDIALOGPAGE odp = { sizeof(odp) };
 	odp.position = 100000000;
diff --git a/plugins/XSoundNotify/src/xsn_main.cpp b/plugins/XSoundNotify/src/xsn_main.cpp
index 7ad5f5c9bb..59d2ed60fd 100644
--- a/plugins/XSoundNotify/src/xsn_main.cpp
+++ b/plugins/XSoundNotify/src/xsn_main.cpp
@@ -36,7 +36,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 	return TRUE;
 }
 
-extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 {
 	return &pluginInfo;
 }
@@ -46,20 +46,19 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 struct {
 	int iStatus;
 	const char *szName;
-	const TCHAR *szInfo;
 }
 static selfSounds[] =
 {
-	{ ID_STATUS_OFFLINE,	"SelfOffline",		 LPGENT("Offline")			},
-	{ ID_STATUS_ONLINE,		"SelfOnline",		 LPGENT("Online")			},
-	{ ID_STATUS_AWAY,		"SelfAway",			 LPGENT("Away")				},
-	{ ID_STATUS_DND,		"SelfDND",			 LPGENT("Do Not Disturb")	},
-	{ ID_STATUS_NA,			"SelfNA",			 LPGENT("Not Available")	},
-	{ ID_STATUS_OCCUPIED,  	"SelfOccupied",		 LPGENT("Occupied")			},
-	{ ID_STATUS_FREECHAT,	"SelfFreeForChat",	 LPGENT("Free For Chat")	},
-	{ ID_STATUS_INVISIBLE,	"SelfInvisible",	 LPGENT("Invisible")		},
-	{ ID_STATUS_ONTHEPHONE,	"SelfOnThePhone",	 LPGENT("On The Phone")		},
-	{ ID_STATUS_OUTTOLUNCH,	"SelfOutToLunch",	 LPGENT("Out To Lunch")		}
+	{ ID_STATUS_OFFLINE,	"SelfOffline"},
+	{ ID_STATUS_ONLINE,		"SelfOnline"},
+	{ ID_STATUS_AWAY,		"SelfAway"},
+	{ ID_STATUS_DND,		"SelfDND"},
+	{ ID_STATUS_NA,			"SelfNA"},
+	{ ID_STATUS_OCCUPIED,  	"SelfOccupied"},
+	{ ID_STATUS_FREECHAT,	"SelfFreeForChat"},
+	{ ID_STATUS_INVISIBLE,	"SelfInvisible"},
+	{ ID_STATUS_ONTHEPHONE,	"SelfOnThePhone"},
+	{ ID_STATUS_OUTTOLUNCH,	"SelfOutToLunch"}
 };
 
 void InitSelfSounds()
@@ -68,15 +67,15 @@ void InitSelfSounds()
 	int protoCount=0;
 	PROTOACCOUNT** protos = 0;
 
-	CallService(MS_PROTO_ENUMACCOUNTS, (WPARAM)&protoCount, (LPARAM)&protos);
+	ProtoEnumAccounts(&protoCount,&protos);
 	for (int i = 0; i < protoCount; i++) {
 		for(int j = 0; j < SIZEOF(selfSounds); j++) {
-			char  namebuf[128];
+			char namebuf[128];
 			mir_snprintf(namebuf, sizeof(namebuf), "%s%s", protos[i]->szModuleName, selfSounds[j].szName);
 	
 			TCHAR infobuf[256];
 			mir_sntprintf(infobuf, SIZEOF(infobuf), _T("%s [%s]"), TranslateT("Self status"), protos[i]->tszAccountName);
-			SkinAddNewSoundExT(namebuf, infobuf, selfSounds[j].szInfo);
+			SkinAddNewSoundExT(namebuf, infobuf, (TCHAR*) CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION,selfSounds[j].iStatus,GSMDF_TCHAR));
 		}
 	}
 }
@@ -88,7 +87,7 @@ static int ProtoAck(WPARAM wParam, LPARAM lParam)
 		for(int i = 0; i < SIZEOF(selfSounds); i++) {
 			if(selfSounds[i].iStatus == ack->lParam) {
 				char buf[128];
-				_snprintf(buf, sizeof(buf), "%s%s", ack->szModule, selfSounds[i].szName);
+				mir_snprintf(buf, sizeof(buf), "%s%s", ack->szModule, selfSounds[i].szName);
 				SkinPlaySound(buf);
 				break;
 			}
@@ -126,7 +125,7 @@ static int ProcessEvent(WPARAM hContact, LPARAM lParam)
 	return 0;
 }
 
-static int OnPlaySound(WPARAM wParam, LPARAM lParam)
+static int OnPlaySound(WPARAM, LPARAM)
 {
 	if (isIgnoreSound)
 		return 1;
@@ -156,14 +155,14 @@ static int PrebuildContactMenu(WPARAM wParam, LPARAM lParam)
 {
 	MCONTACT hContact = wParam;
 	if (hContact) {
-		char* szProto = GetContactProto(hContact);
+		char *szProto = GetContactProto(hContact);
 		PROTOACCOUNT *pa = ProtoGetAccount(szProto);
 		Menu_ShowItem(hChangeSound, IsSuitableProto(pa));
 	}
 	return 0;
 }
 
-static int OnPreShutdown(WPARAM wParam, LPARAM lParam)
+static int OnPreShutdown(WPARAM, LPARAM)
 {
 	WindowList_Broadcast(hChangeSoundDlgList, WM_CLOSE, 0, 0);
 	return 0;
-- 
cgit v1.2.3