diff options
| author | Sergey Bolhovskoy <elzorfox@ya.ru> | 2015-06-27 14:59:05 +0000 |
|---|---|---|
| committer | Sergey Bolhovskoy <elzorfox@ya.ru> | 2015-06-27 14:59:05 +0000 |
| commit | ed6dc419f633cdb5713fb6cf2dd180478114e7d2 (patch) | |
| tree | 8ce729fe4b28bac4ab30d81ae36358909b823f21 /plugins/SmileyAdd/src/smileys.h | |
| parent | bc595f022d9288a033a2acbbe51e5369e11ea03d (diff) | |
SmileyAdd:
fix load unneeded smiley pack
fix double error message on apply options when smiley pack filed
git-svn-id: http://svn.miranda-ng.org/main/trunk@14415 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/SmileyAdd/src/smileys.h')
| -rw-r--r-- | plugins/SmileyAdd/src/smileys.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/SmileyAdd/src/smileys.h b/plugins/SmileyAdd/src/smileys.h index f3836a3e67..921860fd5a 100644 --- a/plugins/SmileyAdd/src/smileys.h +++ b/plugins/SmileyAdd/src/smileys.h @@ -197,7 +197,7 @@ public: const TCHAR* GetButtonSmiley(void) const { return m_ButtonSmiley.c_str(); }
- bool LoadSmileyFile(const CMString& filename, bool onlyInfo, bool noerr = false);
+ bool LoadSmileyFile(const CMString& filename, const CMString& packname, bool onlyInfo, bool noerr = false);
void Clear(void);
};
@@ -214,7 +214,7 @@ private: public:
int NumberOfSmileyPacks(void) { return m_SmileyPacks.getCount(); }
- bool AddSmileyPack(CMString& filename);
+ bool AddSmileyPack(CMString& filename, CMString& packname );
void ClearAndFreeAll(void);
SmileyPackType* GetSmileyPack(CMString& filename);
};
|