From 48527fe64b22516f1e4b2a609b50f7166e9059ee Mon Sep 17 00:00:00 2001
From: Tobias Weimer <wishmaster51@googlemail.com>
Date: Sun, 11 Nov 2012 22:09:56 +0000
Subject: - removed extra icon settings - ability to set unicode status message

git-svn-id: http://svn.miranda-ng.org/main/trunk@2292 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/ListeningTo/res/resource.rc     | 12 +++++-------
 plugins/ListeningTo/src/listeningto.cpp | 15 +++++----------
 plugins/ListeningTo/src/resource.h      |  4 ++--
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/plugins/ListeningTo/res/resource.rc b/plugins/ListeningTo/res/resource.rc
index 72205b3f8c..7c3b904bec 100644
--- a/plugins/ListeningTo/res/resource.rc
+++ b/plugins/ListeningTo/res/resource.rc
@@ -24,7 +24,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // Dialog
 //
 
-IDD_OPTIONS DIALOGEX 0, 0, 288, 220
+IDD_OPTIONS DIALOGEX 0, 0, 288, 205
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -46,14 +46,12 @@ BEGIN
     CONTROL         "If XStatus is Music, show listening info",IDC_CHECK_XSTATUS_MUSIC,
                     "Button",BS_AUTORADIOBUTTON,19,129,257,12
     CONTROL         "Do nothing",IDC_IGNORE_XSTATUS,"Button",BS_AUTORADIOBUTTON,19,143,257,12
-    GROUPBOX        "Contacts",IDC_CONTACTS_G,3,166,282,49
+    GROUPBOX        "Contacts",IDC_CONTACTS_G,3,166,282,32
     CONTROL         "Apply template for info from contacts (overrides contacts template)",IDC_OVERRIDE_CONTACTS_TEMPLATE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,180,262,11
-    CONTROL         "Show advanced icon in slot",IDC_SHOW_ADV_ICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,193,104,13
-    COMBOBOX        IDC_ADV_ICON,122,193,46,15,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_PLAYERS DIALOGEX 0, 0, 288, 224
+IDD_PLAYERS DIALOGEX 0, 0, 288, 178
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -120,7 +118,7 @@ BEGIN
         LEFTMARGIN, 3
         RIGHTMARGIN, 285
         TOPMARGIN, 12
-        BOTTOMMARGIN, 217
+        BOTTOMMARGIN, 202
     END
 
     IDD_PLAYERS, DIALOG
@@ -128,7 +126,7 @@ BEGIN
         LEFTMARGIN, 3
         RIGHTMARGIN, 285
         TOPMARGIN, 12
-        BOTTOMMARGIN, 221
+        BOTTOMMARGIN, 175
     END
 
     IDD_FORMAT, DIALOG
diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp
index 1e96c23450..538dc8ba89 100644
--- a/plugins/ListeningTo/src/listeningto.cpp
+++ b/plugins/ListeningTo/src/listeningto.cpp
@@ -114,7 +114,6 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvRe
 
 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
 {
-	pluginInfo.cbSize = sizeof(PLUGININFOEX);
 	return &pluginInfo;
 }
 
@@ -723,22 +722,18 @@ void SetListeningInfo(char *proto, LISTENINGTOINFO *lti)
 			mir_free(fr[1]);
 		}
 	}
-	else if (ProtoServiceExists(proto, PS_SETAWAYMSG))
+	else if (ProtoServiceExists(proto, PS_SETAWAYMSGT))
 	{
+		int status = CallProtoService(proto, PS_GETSTATUS, 0, 0);
 		if (lti == NULL)
 		{
-			int status = CallProtoService(proto, PS_GETSTATUS, 0, 0);
-			CallProtoService(proto, PS_SETAWAYMSG, (WPARAM) status, 0);
+			CallProtoService(proto, PS_SETAWAYMSGT, (WPARAM) status, 0);
 		}
 		else
 		{
 			TCHAR *fr = (TCHAR *)GetParsedFormat(0, (WPARAM) lti);
-			char *info = mir_t2a(fr);
-			int status = CallProtoService(proto, PS_GETSTATUS, 0, 0);
-			CallProtoService(proto, PS_SETAWAYMSG, (WPARAM)status, (LPARAM)info);
-
+			CallProtoService(proto, PS_SETAWAYMSGT, (WPARAM)status, (LPARAM)fr);
 			mir_free(fr);
-			mir_free(info);
 		}
 	}
 }
@@ -762,7 +757,7 @@ INT_PTR EnableListeningTo(WPARAM wParam,LPARAM lParam)
 	{
 		if (!ProtoServiceExists(proto, PS_SET_LISTENINGTO) &&
 			!ProtoServiceExists(proto, PS_ICQ_SETCUSTOMSTATUSEX) &&
-			!ProtoServiceExists(proto, PS_SETAWAYMSG)) // by yaho
+			!ProtoServiceExists(proto, PS_SETAWAYMSGT)) // by yaho
 			return 0;
 
 		char setting[256];
diff --git a/plugins/ListeningTo/src/resource.h b/plugins/ListeningTo/src/resource.h
index d4084c98b4..95f9a32dd7 100644
--- a/plugins/ListeningTo/src/resource.h
+++ b/plugins/ListeningTo/src/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by resource.rc
+// Used by C:\Users\xx\Documents\Visual Studio 2010\Projects\myranda\plugins\ListeningTo\res\resource.rc
 //
 #define IDD_OPTIONS                     119
 #define IDD_PLAYERS                     120
@@ -80,7 +80,7 @@
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
-//
+// 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
-- 
cgit v1.2.3