From ba430f779e1f3692d563c48b3517915429bd393d Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 11 Apr 2013 08:04:17 +0000
Subject: status icons almost recovered

git-svn-id: http://svn.miranda-ng.org/main/trunk@4420 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/JabberG/src/jabber_menu.cpp   | 16 +++-------------
 protocols/JabberG/src/jabber_proto.h    |  2 --
 protocols/JabberG/src/jabber_thread.cpp |  4 +---
 3 files changed, 4 insertions(+), 18 deletions(-)

(limited to 'protocols/JabberG/src')

diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index 2d7bbe11e9..7a47f5ef20 100644
--- a/protocols/JabberG/src/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
@@ -1015,28 +1015,18 @@ void CJabberProto::CheckMenuItems()
 
 static HANDLE hDialogsList = NULL;
 
-void CJabberProto::MenuHideSrmmIcon(HANDLE hContact)
-{
-	StatusIconData sid = {0};
-	sid.cbSize = sizeof(sid);
-	sid.szModule = m_szModuleName;
-	sid.flags = MBF_HIDDEN;
-	CallService(MS_MSG_MODIFYICON, (WPARAM)hContact, (LPARAM)&sid);
-}
-
 void CJabberProto::MenuUpdateSrmmIcon(JABBER_LIST_ITEM *item)
 {
-	if (item->list != LIST_ROSTER || !ServiceExists(MS_MSG_MODIFYICON))
+	if (item->list != LIST_ROSTER)
 		return;
 
 	HANDLE hContact = HContactFromJID(item->jid);
 	if ( !hContact)
 		return;
 
-	StatusIconData sid = {0};
-	sid.cbSize = sizeof(sid);
+	StatusIconData sid = { sizeof(sid) };
 	sid.szModule = m_szModuleName;
-	sid.flags = item->resourceCount ? 0 : MBF_HIDDEN;
+	sid.flags = item->resourceCount ? 0 : MBF_DISABLED;
 	CallService(MS_MSG_MODIFYICON, (WPARAM)hContact, (LPARAM)&sid);
 }
 
diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h
index ea534109d1..6810416685 100644
--- a/protocols/JabberG/src/jabber_proto.h
+++ b/protocols/JabberG/src/jabber_proto.h
@@ -695,8 +695,6 @@ struct CJabberProto : public PROTO_INTERFACE
 	void   GlobalMenuUninit(void);
 
 	void   MenuInit(void);
-
-	void   MenuHideSrmmIcon(HANDLE hContact);
 	void   MenuUpdateSrmmIcon(JABBER_LIST_ITEM *item);
 
 	void   AuthWorker(HANDLE hContact, char* authReqType);
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index f1331af187..376dc3b7fc 100644
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -595,10 +595,8 @@ recvRest:
 			JSendBroadcast(NULL, ACKTYPE_STATUS, ACKRESULT_SUCCESS, (HANDLE)oldStatus, m_iStatus);
 
 			// Set all contacts to offline
-			for (HANDLE hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {
+			for (HANDLE hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName))
 				SetContactOfflineStatus(hContact);
-				MenuHideSrmmIcon(hContact);
-			}
 
 			mir_free(m_szJabberJID);
 			m_szJabberJID = NULL;
-- 
cgit v1.2.3