diff options
| author | George Hazan <george.hazan@gmail.com> | 2023-06-01 19:17:51 +0300 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2023-06-01 19:17:51 +0300 |
| commit | dce9f354b8a42a1646772272639d1821f9763bb5 (patch) | |
| tree | 78cab61be0e72e4861e3bcb1dc91ba58b114b40d /src/core | |
| parent | 117dc56ff0d9a32feb0531c066bcff58a2ec4229 (diff) | |
fixes #3533 (OMEMO: перенести код, рисующий статус OMEMO в другие плагины)
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/stdmsg/src/globals.cpp | 16 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msglog.cpp | 19 |
2 files changed, 19 insertions, 16 deletions
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)
{
|