diff options
| author | George Hazan <ghazan@miranda.im> | 2018-05-11 21:22:17 +0200 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-05-11 21:22:17 +0200 |
| commit | 3f1628f127d35aa14da97e50c2a94cfd61ad52dd (patch) | |
| tree | e9f1d8a1282e3c5ee0139003f4aac0e932a99213 /plugins/SmileyAdd/src/smileys.h | |
| parent | 6a6f2b9e3b2749f16b513dfc98d5d5038b5628fb (diff) | |
merge from master to
fixes #1349 (Miranda crashes on coming back from auto away)
Diffstat (limited to 'plugins/SmileyAdd/src/smileys.h')
| -rw-r--r-- | plugins/SmileyAdd/src/smileys.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/SmileyAdd/src/smileys.h b/plugins/SmileyAdd/src/smileys.h index d75d40c418..d0d7a0ef3c 100644 --- a/plugins/SmileyAdd/src/smileys.h +++ b/plugins/SmileyAdd/src/smileys.h @@ -203,6 +203,9 @@ public: bool LoadSmileyFile(const CMStringW &filename, const CMStringW &packname, bool onlyInfo, bool noerr = false);
+ bool LoadSmileyFileMSL(CMStringW &body, bool bOnlyInfo, CMStringW &modPath);
+ bool LoadSmileyFileXEP(CMStringW &body, bool bOnlyInfo);
+
void Clear(void);
};
|