diff options
author | George Hazan <george.hazan@gmail.com> | 2013-04-05 22:27:16 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2013-04-05 22:27:16 +0000 |
commit | 007b4c7301f0d26a72f89f74e9929f42e24eb3e6 (patch) | |
tree | b1ee30b70c6e36d1a06aed6885cb80dc560a68ca /plugins/Clist_modern/src/modern_clisttray.cpp | |
parent | f4a1bbc6ba4b8137cb868639ac146aa97e97e9df (diff) |
- rest of menus cleared;
- old database macroses wiped out from all plugins (left in m_database.h for compatibility)
git-svn-id: http://svn.miranda-ng.org/main/trunk@4324 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_modern/src/modern_clisttray.cpp')
-rw-r--r-- | plugins/Clist_modern/src/modern_clisttray.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp index 9a4525ad1f..b4339c7720 100644 --- a/plugins/Clist_modern/src/modern_clisttray.cpp +++ b/plugins/Clist_modern/src/modern_clisttray.cpp @@ -196,7 +196,7 @@ void cliTrayIconUpdateBase(const char *szChangedProto) if ( db_get_b(NULL,"CList","TrayIcon",SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_SINGLE &&
db_get_b(NULL,"CList","AlwaysPrimary",SETTING_ALWAYSPRIMARY_DEFAULT))
{
- if ( !DBGetContactSettingString(NULL,"CList","PrimaryStatus",&dbv)) {
+ if ( !db_get_s(NULL,"CList","PrimaryStatus",&dbv)) {
szProto = NEWSTR_ALLOCA(dbv.pszVal);
db_free(&dbv);
}
@@ -209,7 +209,7 @@ void cliTrayIconUpdateBase(const char *szChangedProto) switch( db_get_b(NULL,"CList","TrayIcon",SETTING_TRAYICON_DEFAULT)) {
case SETTING_TRAYICON_SINGLE:
{
- if ( !DBGetContactSettingString(NULL,"CList","PrimaryStatus",&dbv)) {
+ if ( !db_get_s(NULL,"CList","PrimaryStatus",&dbv)) {
szProto = NEWSTR_ALLOCA(dbv.pszVal);
db_free(&dbv);
}
@@ -330,7 +330,7 @@ void cliTrayIconUpdateBase(const char *szChangedProto) }
else if (status >= ID_STATUS_OFFLINE && status <= ID_STATUS_IDLE)
{
- if (DBGetContactSettingString(NULL,"CList","PrimaryStatus",&dbv))
+ if (db_get_s(NULL,"CList","PrimaryStatus",&dbv))
szProto = NULL;
else
szProto = dbv.pszVal;
|