From dce9f354b8a42a1646772272639d1821f9763bb5 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 1 Jun 2023 19:17:51 +0300
Subject: =?UTF-8?q?fixes=20#3533=20(OMEMO:=20=D0=BF=D0=B5=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B5=D1=81=D1=82=D0=B8=20=D0=BA=D0=BE=D0=B4,=20=D1=80?=
 =?UTF-8?q?=D0=B8=D1=81=D1=83=D1=8E=D1=89=D0=B8=D0=B9=20=D1=81=D1=82=D0=B0?=
 =?UTF-8?q?=D1=82=D1=83=D1=81=20OMEMO=20=D0=B2=20=D0=B4=D1=80=D1=83=D0=B3?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D0=BB=D0=B0=D0=B3=D0=B8=D0=BD=D1=8B)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/stdmsg/src/globals.cpp | 16 ++--------------
 src/core/stdmsg/src/msglog.cpp  | 19 +++++++++++++++++--
 2 files changed, 19 insertions(+), 16 deletions(-)

(limited to 'src/core/stdmsg')

diff --git a/src/core/stdmsg/src/globals.cpp b/src/core/stdmsg/src/globals.cpp
index 73972a2312..76c1cf5a2b 100644
--- a/src/core/stdmsg/src/globals.cpp
+++ b/src/core/stdmsg/src/globals.cpp
@@ -21,20 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "stdafx.h"
 
-IconItem iconList[] =
-{
-	{ LPGEN("Incoming message (10x10)"),   "INCOMING",   IDI_INCOMING,      10 },
-	{ LPGEN("Outgoing message (10x10)"),   "OUTGOING",   IDI_OUTGOING,      10 },
-	{ LPGEN("Notice (10x10)"),             "NOTICE",     IDI_NOTICE,        10 },
-	{ LPGEN("Encrypted (10x10)"),          "UNVERIFIED", IDI_SECURE,        10 },
-	{ LPGEN("Encrypted verified (10x10)"), "PRIVATE",    IDI_SECURE_STRONG, 10 },
-};
-
-static void InitIcons(void)
-{
-	g_plugin.registerIcon(LPGEN("Messaging"), iconList, "SRMM");
-}
-
 static int IconsChanged(WPARAM, LPARAM)
 {
 	FreeMsgLogIcons();
@@ -84,6 +70,8 @@ static int AvatarChanged(WPARAM hContact, LPARAM lParam)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
+void InitIcons();
+
 void InitGlobals()
 {
 	int iOldValue = g_plugin.getByte("HideNames", -1);
diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp
index 4e69be9a09..7c9cfab101 100644
--- a/src/core/stdmsg/src/msglog.cpp
+++ b/src/core/stdmsg/src/msglog.cpp
@@ -21,8 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "stdafx.h"
 
-extern IconItem iconList[];
-
 #define LOGICON_MSG_IN      0
 #define LOGICON_MSG_OUT     1
 #define LOGICON_MSG_NOTICE  2
@@ -149,6 +147,23 @@ bool DbEventIsShown(const DB::EventInfo &dbei)
 	return dbei.eventType == EVENTTYPE_MESSAGE || dbei.eventType == EVENTTYPE_FILE || dbei.isSrmm();
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////
+// Log icons
+
+static IconItem iconList[] =
+{
+	{LPGEN("Incoming message (10x10)"), "INCOMING", IDI_INCOMING, 10},
+	{LPGEN("Outgoing message (10x10)"), "OUTGOING", IDI_OUTGOING, 10},
+	{LPGEN("Notice (10x10)"), "NOTICE", IDI_NOTICE, 10},
+	{LPGEN("Encrypted (10x10)"), "UNVERIFIED", IDI_SECURE, 10},
+	{LPGEN("Encrypted verified (10x10)"), "PRIVATE", IDI_SECURE_STRONG, 10},
+};
+
+void InitIcons(void)
+{
+	g_plugin.registerIcon(LPGEN("Messaging"), iconList, "SRMM");
+}
+
 #define RTFPICTHEADERMAXSIZE   78
 void LoadMsgLogIcons(void)
 {
-- 
cgit v1.2.3