From 45adfac09535637462889f1e6d6735a213c1bf7f Mon Sep 17 00:00:00 2001
From: Tobias Weimer <wishmaster51@googlemail.com>
Date: Tue, 7 Aug 2012 22:17:31 +0000
Subject: support for unicode Fingerprint

git-svn-id: http://svn.miranda-ng.org/main/trunk@1397 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/JabberG/jabber.h            |  1 +
 protocols/JabberG/jabber_chat.cpp     |  4 ++--
 protocols/JabberG/jabber_menu.cpp     |  6 ++----
 protocols/JabberG/jabber_search.cpp   |  5 +----
 protocols/JabberG/jabber_userinfo.cpp | 11 +++++------
 5 files changed, 11 insertions(+), 16 deletions(-)

(limited to 'protocols/JabberG')

diff --git a/protocols/JabberG/jabber.h b/protocols/JabberG/jabber.h
index bd21b30dc8..5620c17696 100644
--- a/protocols/JabberG/jabber.h
+++ b/protocols/JabberG/jabber.h
@@ -76,6 +76,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_idle.h>
 #include <m_timezones.h>
 #include <m_jabber.h>
+#include <m_fingerprint.h>
 #include <win2k.h>
 
 #include "../../plugins/zlib/zlib.h"
diff --git a/protocols/JabberG/jabber_chat.cpp b/protocols/JabberG/jabber_chat.cpp
index 8f9fce33ad..f73d2c1559 100644
--- a/protocols/JabberG/jabber_chat.cpp
+++ b/protocols/JabberG/jabber_chat.cpp
@@ -883,7 +883,7 @@ struct TUserInfoData
 	JABBER_RESOURCE_STATUS *me, *him;
 };
 
-static LRESULT CALLBACK sttUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK sttUserInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	TUserInfoData *dat = (TUserInfoData *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);
 
@@ -1135,7 +1135,7 @@ static void sttNickListHook( CJabberProto* ppro, JABBER_LIST_ITEM* item, GCHOOK*
 		dat->him = him;
 		dat->item = item;
 		dat->ppro = ppro;
-		HWND hwndInfo = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_GROUPCHAT_INFO), NULL, (DLGPROC)sttUserInfoDlgProc, (LPARAM)dat);
+		HWND hwndInfo = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_GROUPCHAT_INFO), NULL, sttUserInfoDlgProc, (LPARAM)dat);
 		ShowWindow(hwndInfo, SW_SHOW);
 		break;
 	}
diff --git a/protocols/JabberG/jabber_menu.cpp b/protocols/JabberG/jabber_menu.cpp
index 985db5e17e..81bfb8d4c9 100644
--- a/protocols/JabberG/jabber_menu.cpp
+++ b/protocols/JabberG/jabber_menu.cpp
@@ -487,12 +487,10 @@ int CJabberProto::OnPrebuildContactMenu( WPARAM wParam, LPARAM )
 						clmi.flags = CMIM_NAME|CMIM_FLAGS | CMIF_CHILDPOPUP|CMIF_TCHAR;
 						if ((item->resourceMode == RSMODE_MANUAL) && (item->manualResource == i))
 							clmi.flags |= CMIF_CHECKED;
-						if (ServiceExists( "Fingerprint/GetClientIcon" )) {
+						if (ServiceExists(MS_FP_GETCLIENTICONT)) {
 							clmi.flags |= CMIM_ICON;
 							FormatMirVer(&item->resource[i], szTmp, SIZEOF(szTmp));
-							char *szMirver = mir_t2a(szTmp);
-							clmi.hIcon = (HICON)CallService( "Fingerprint/GetClientIcon", (WPARAM)szMirver, 0 );
-							mir_free( szMirver );
+							clmi.hIcon = (HICON)CallService( MS_FP_GETCLIENTICONT, (WPARAM)szTmp, 0 );
 						}
 						mir_sntprintf(szTmp, SIZEOF(szTmp), _T("%s [%s, %d]"),
 							item->resource[i].resourceName,
diff --git a/protocols/JabberG/jabber_search.cpp b/protocols/JabberG/jabber_search.cpp
index 083b0bdb88..e242294a16 100644
--- a/protocols/JabberG/jabber_search.cpp
+++ b/protocols/JabberG/jabber_search.cpp
@@ -453,10 +453,7 @@ int CJabberProto::SearchRenewFields(HWND hwndDlg, JabberSearchData * dat)
 	JabberSearchFreeData( hwndDlg, dat );
 	JabberSearchRefreshFrameScroll( hwndDlg, dat );
 
-	if ( m_bJabberOnline )
-		SetDlgItemText(hwndDlg,IDC_INSTRUCTIONS,TranslateT("Please wait...\r\nConnecting search server..."));
-	else
-		SetDlgItemText(hwndDlg,IDC_INSTRUCTIONS,TranslateT("You have to be connected to server"));
+	SetDlgItemText(hwndDlg,IDC_INSTRUCTIONS,m_bJabberOnline ? TranslateT("Please wait...\r\nConnecting search server...") : TranslateT("You have to be connected to server"));
 
 	if ( !m_bJabberOnline )
 		return 0;
diff --git a/protocols/JabberG/jabber_userinfo.cpp b/protocols/JabberG/jabber_userinfo.cpp
index 279f02c7e5..40d5190a5d 100644
--- a/protocols/JabberG/jabber_userinfo.cpp
+++ b/protocols/JabberG/jabber_userinfo.cpp
@@ -225,19 +225,18 @@ static void sttFillResourceInfo( CJabberProto* ppro, HWND hwndTree, HTREEITEM ht
 
 	// Software
 	HICON hIcon = NULL;
-	if (ServiceExists( "Fingerprint/GetClientIcon" )) {
-		char *szMirver = NULL;
+	if (ServiceExists(MS_FP_GETCLIENTICONT)) {
 		if (res->software != NULL) {
 			mir_sntprintf(buf, SIZEOF(buf), _T("%s %s"), res->software, res->version);
-			szMirver = mir_t2a(buf);
-			hIcon = (HICON)CallService( "Fingerprint/GetClientIcon", (WPARAM)szMirver, 0 );
-			mir_free( szMirver );
+			hIcon = (HICON)CallService( MS_FP_GETCLIENTICONT, (WPARAM)buf, 0 );
 	}	}
 
 	sttFillInfoLine( hwndTree, htiResource, hIcon, TranslateT( "Software" ),
 		res->software ? res->software : TranslateT( "<not specified>" ),
 		sttInfoLineId(resource, INFOLINE_SOFTWARE));
-	DestroyIcon(hIcon);
+
+	if(hIcon)
+		DestroyIcon(hIcon);
 
 	// Version
 	sttFillInfoLine( hwndTree, htiResource, NULL, TranslateT( "Version" ),
-- 
cgit v1.2.3