From 66fb78f152218f868613215d14f7b9a2822a234c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 5 Apr 2020 14:25:28 +0300 Subject: Clist::OfflineModes made public --- include/m_clistint.h | 4 ++++ libs/win32/mir_app.lib | Bin 204038 -> 204354 bytes libs/win64/mir_app.lib | Bin 199664 -> 199980 bytes plugins/FloatingContacts/src/main.cpp | 2 +- src/mir_app/src/clc.h | 1 - src/mir_app/src/mir_app.def | 1 + src/mir_app/src/mir_app64.def | 1 + 7 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/m_clistint.h b/include/m_clistint.h index a22cde34c4..1f11f2f292 100644 --- a/include/m_clistint.h +++ b/include/m_clistint.h @@ -449,6 +449,10 @@ namespace Clist UseGroups, HideEmptyGroups, ConfirmDelete; + + extern MIR_APP_EXPORT CMOption + OfflineModes; + }; #endif // M_CLISTINT_H__ diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib index 925d0d406b..fde19bca4d 100644 Binary files a/libs/win32/mir_app.lib and b/libs/win32/mir_app.lib differ diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib index f38bdbfa33..51e4fac219 100644 Binary files a/libs/win64/mir_app.lib and b/libs/win64/mir_app.lib differ diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp index c59c5ef17a..b8bb8e05f1 100644 --- a/plugins/FloatingContacts/src/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp @@ -285,7 +285,7 @@ static void LoadDBSettings() fcOpt.bMoveTogether = (BOOL)g_plugin.getByte("MoveTogether", 0); fcOpt.bFixedWidth = (BOOL)g_plugin.getByte("FixedWidth", 0); fcOpt.nThumbWidth = (DWORD)g_plugin.getDword("Width", 0); - dwOfflineModes = db_get_dw(0, "CLC", "OfflineModes", CLCDEFAULT_OFFLINEMODES); + dwOfflineModes = Clist::OfflineModes; fcOpt.bShowTip = (BOOL)g_plugin.getByte("ShowTip", 1); fcOpt.TimeIn = g_plugin.getWord("TimeIn", 0); fcOpt.bToTop = (BOOL)g_plugin.getByte("ToTop", 0); diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h index 424d705f53..7e5bbbb19a 100644 --- a/src/mir_app/src/clc.h +++ b/src/mir_app/src/clc.h @@ -96,7 +96,6 @@ int ClcOptInit(WPARAM, LPARAM); namespace Clist { extern CMOption RemoveTempContacts, DisableIconBlink; - extern CMOption OfflineModes; }; /* clistmenus.c */ diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 8c084e9810..ac47bef30c 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -729,3 +729,4 @@ ProtoBroadcastAsync @814 NONAME ?HideEmptyGroups@Clist@@3V?$CMOption@_N@@A @817 NONAME ?HideOffline@Clist@@3V?$CMOption@_N@@A @818 NONAME ?UseGroups@Clist@@3V?$CMOption@_N@@A @819 NONAME +?OfflineModes@Clist@@3V?$CMOption@K@@A @820 NONAME diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index f05d983ed1..b31b5675f9 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -729,3 +729,4 @@ ProtoBroadcastAsync @814 NONAME ?HideEmptyGroups@Clist@@3V?$CMOption@_N@@A @817 NONAME ?HideOffline@Clist@@3V?$CMOption@_N@@A @818 NONAME ?UseGroups@Clist@@3V?$CMOption@_N@@A @819 NONAME +?OfflineModes@Clist@@3V?$CMOption@K@@A @820 NONAME -- cgit v1.2.3