diff options
author | George Hazan <ghazan@miranda.im> | 2017-03-07 19:30:17 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2017-03-07 19:30:17 +0300 |
commit | f95e7a84fc77ec0c535970a68b2600f15dc1e12d (patch) | |
tree | 443fcc2b403d0b36bac14a4ead20f3661980b712 /plugins/TabSRMM | |
parent | db9ffeb3a32a652da31c0233987001bc56447dfd (diff) |
returned back the binary compatibility of tabsrmm container settings
Diffstat (limited to 'plugins/TabSRMM')
-rw-r--r-- | plugins/TabSRMM/src/globals.cpp | 1 | ||||
-rw-r--r-- | plugins/TabSRMM/src/msgs.h | 1 | ||||
-rw-r--r-- | plugins/TabSRMM/src/utils.cpp | 3 |
3 files changed, 2 insertions, 3 deletions
diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index 378f3e481c..4b022093c7 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -196,6 +196,7 @@ void CGlobals::reloadSettings(bool fReloadSkins) m_cRichBorders = M.GetDword(FONTMODULE, "cRichBorders", 0);
::memcpy(&globalContainerSettings, &_cnt_default, sizeof(TContainerSettings));
+ globalContainerSettings.iSplitterX = db_get_dw(0, CHAT_MODULE, "SplitterX", 150);
Utils::ReadContainerSettingsFromDB(0, &globalContainerSettings);
globalContainerSettings.fPrivate = false;
if (fReloadSkins)
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h index 98d4722382..ddcd017fa4 100644 --- a/plugins/TabSRMM/src/msgs.h +++ b/plugins/TabSRMM/src/msgs.h @@ -167,6 +167,7 @@ struct TContainerSettings WORD ownAvatarMode;
WORD autoCloseSeconds;
int iSplitterX;
+ BYTE reserved[10];
};
struct ButtonItem;
diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp index 20fef2d1ed..d7027d59e4 100644 --- a/plugins/TabSRMM/src/utils.cpp +++ b/plugins/TabSRMM/src/utils.cpp @@ -498,9 +498,6 @@ int Utils::ReadContainerSettingsFromDB(const MCONTACT hContact, TContainerSettin {
memcpy(cs, &PluginConfig.globalContainerSettings, sizeof(TContainerSettings));
- if (hContact == 0 && szKey == 0)
- cs->iSplitterX = M.GetDword("splitsplitx", db_get_dw(0, CHAT_MODULE, "SplitterX", 150));
-
DBVARIANT dbv = { 0 };
if (0 == db_get(hContact, SRMSGMOD_T, szKey ? szKey : CNT_KEYNAME, &dbv)) {
if (dbv.type == DBVT_BLOB && dbv.cpbVal > 0 && dbv.cpbVal <= sizeof(TContainerSettings)) {
|