diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-27 21:51:46 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-27 21:51:46 +0000 |
| commit | 1fb0cd07fba1e8d6f9ac2ebe3b4f2e1c60acb81b (patch) | |
| tree | 904c95b33e03e806aea734552281257768273a14 /plugins/Clist_modern/src/modern_clcutils.cpp | |
| parent | a8e8aebfd4f53977873c72c2d828c2c1f505f10d (diff) | |
- metacontacts are always present;
- added META_PROTO constant for mc module name;
- MS_MC_GETPROTOCOLNAME removed, because it always returns META_PROTO
git-svn-id: http://svn.miranda-ng.org/main/trunk@8319 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_modern/src/modern_clcutils.cpp')
| -rw-r--r-- | plugins/Clist_modern/src/modern_clcutils.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp index cca9ba9184..031f051d92 100644 --- a/plugins/Clist_modern/src/modern_clcutils.cpp +++ b/plugins/Clist_modern/src/modern_clcutils.cpp @@ -453,8 +453,10 @@ int GetDropTargetInformation(HWND hwnd,ClcData *dat,POINT pt) }
dat->selection = hit;
- if (g_szMetaModuleName && !mir_strcmp(contact->proto,g_szMetaModuleName) && ( ServiceExists(MS_MC_ADDTOMETA))) return DROPTARGET_ONMETACONTACT;
- if (contact->isSubcontact && ( ServiceExists(MS_MC_ADDTOMETA))) return DROPTARGET_ONSUBCONTACT;
+ if (!mir_strcmp(contact->proto, META_PROTO) && ServiceExists(MS_MC_ADDTOMETA))
+ return DROPTARGET_ONMETACONTACT;
+ if (contact->isSubcontact && ServiceExists(MS_MC_ADDTOMETA))
+ return DROPTARGET_ONSUBCONTACT;
return DROPTARGET_ONCONTACT;
}
COLORREF sttGetColor(char * module, char * color, COLORREF defColor)
@@ -746,9 +748,8 @@ void LoadCLCOptions(HWND hwnd, ClcData *dat ) dat->selTextColour = db_get_dw(NULL,"CLC","SelTextColour",CLCDEFAULT_MODERN_SELTEXTCOLOUR);
dat->hotTextColour = db_get_dw(NULL,"CLC","HotTextColour",CLCDEFAULT_MODERN_HOTTEXTCOLOUR);
dat->quickSearchColour = db_get_dw(NULL,"CLC","QuickSearchColour",CLCDEFAULT_MODERN_QUICKSEARCHCOLOUR);
- if (!g_szMetaModuleName && ServiceExists(MS_MC_GETPROTOCOLNAME)) g_szMetaModuleName = (char *)CallService(MS_MC_GETPROTOCOLNAME, 0, 0);
dat->IsMetaContactsEnabled = (!(GetWindowLongPtr(hwnd,GWL_STYLE)&CLS_MANUALUPDATE)) &&
- g_szMetaModuleName && db_get_b(NULL,g_szMetaModuleName,"Enabled",1) && ServiceExists(MS_MC_GETDEFAULTCONTACT);
+ db_get_b(NULL, META_PROTO, "Enabled", 1) && ServiceExists(MS_MC_GETDEFAULTCONTACT);
if (pcli->hwndContactTree == NULL || dat->hWnd == pcli->hwndContactTree)
dat->MetaIgnoreEmptyExtra = db_get_b(NULL,"CLC","MetaIgnoreEmptyExtra",SETTING_METAIGNOREEMPTYEXTRA_DEFAULT);
|