From e5d58fc3bbbce2773b7c6c3f8b7da6faa66b672e Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 17 Sep 2016 16:37:24 +0000
Subject: chats: more functions, less structures

git-svn-id: http://svn.miranda-ng.org/main/trunk@17309 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/JabberG/src/jabber_groupchat.cpp | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'protocols/JabberG/src/jabber_groupchat.cpp')

diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp
index 6e6306ab66..a690f4f8ff 100644
--- a/protocols/JabberG/src/jabber_groupchat.cpp
+++ b/protocols/JabberG/src/jabber_groupchat.cpp
@@ -795,20 +795,17 @@ void CJabberProto::RenameParticipantNick(JABBER_LIST_ITEM *item, const wchar_t *
 			setWString(hContact, "MyNick", newNick);
 	}
 
-	GCDEST gcd = { m_szModuleName, item->jid, GC_EVENT_CHUID };
-	GCEVENT gce = { sizeof(gce), &gcd };
-	gce.ptszNick = oldNick;
-	gce.ptszText = newNick;
+	Chat_ChangeUserId(m_szModuleName, item->jid, oldNick, newNick);
+
+	GCDEST gcd = { m_szModuleName, item->jid, GC_EVENT_NICK };
+	GCEVENT gce = { &gcd };
 	if (jid != NULL)
 		gce.ptszUserInfo = jid;
 	gce.time = time(0);
-	Chat_Event(0, &gce);
-
-	gcd.iType = GC_EVENT_NICK;
 	gce.ptszNick = oldNick;
 	gce.ptszUID = newNick;
 	gce.ptszText = newNick;
-	Chat_Event(0, &gce);
+	Chat_Event(&gce);
 }
 
 void CJabberProto::GroupchatProcessPresence(HXML node)
@@ -1110,7 +1107,7 @@ void CJabberProto::GroupchatProcessMessage(HXML node)
 	tszText.Replace(L"%", L"%%");
 	tszText += imgLink;
 
-	GCEVENT gce = { sizeof(gce), &gcd };
+	GCEVENT gce = { &gcd };
 	gce.ptszUID = resource;
 	gce.ptszNick = nick;
 	gce.time = msgTime;
@@ -1123,15 +1120,12 @@ void CJabberProto::GroupchatProcessMessage(HXML node)
 	if (m_options.GcLogChatHistory && isHistory)
 		gce.dwFlags |= GCEF_NOTNOTIFY;
 
-	Chat_Event(0, &gce);
+	Chat_Event(&gce);
 
 	item->bChatActive = 2;
 
-	if (gcd.iType == GC_EVENT_TOPIC) {
-		gce.dwFlags &= ~GCEF_ADDTOLOG;
-		gcd.iType = GC_EVENT_SETSBTEXT;
-		Chat_Event(0, &gce);
-	}
+	if (gcd.iType == GC_EVENT_TOPIC)
+		Chat_SetStatusbarText(m_szModuleName, item->jid, tszText);
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3