summaryrefslogtreecommitdiff
path: root/plugins/SpellChecker/src/utils.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-02-27 21:51:46 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-02-27 21:51:46 +0000
commit1fb0cd07fba1e8d6f9ac2ebe3b4f2e1c60acb81b (patch)
tree904c95b33e03e806aea734552281257768273a14 /plugins/SpellChecker/src/utils.cpp
parenta8e8aebfd4f53977873c72c2d828c2c1f505f10d (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/SpellChecker/src/utils.cpp')
-rw-r--r--plugins/SpellChecker/src/utils.cpp18
1 files changed, 6 insertions, 12 deletions
diff --git a/plugins/SpellChecker/src/utils.cpp b/plugins/SpellChecker/src/utils.cpp
index 66013573a2..d9a73daeec 100644
--- a/plugins/SpellChecker/src/utils.cpp
+++ b/plugins/SpellChecker/src/utils.cpp
@@ -770,19 +770,13 @@ void GetUserLanguageSetting(Dialog *dlg, char *setting)
return;
// If not found and is inside meta, try to get from the meta
- INT_PTR mc = CallService(MS_MC_GETPROTOCOLNAME, 0, 0);
- if (mc != CALLSERVICE_NOTFOUND) {
- char* metacontacts_proto = (char *) mc;
- if (metacontacts_proto != NULL) {
- MCONTACT hMetaContact = db_mc_getMeta(dlg->hContact);
- if (hMetaContact != NULL) {
- GetUserProtoLanguageSetting(dlg, hMetaContact, metacontacts_proto, setting);
- if (dlg->lang_name[0] != _T('\0'))
- return;
+ MCONTACT hMetaContact = db_mc_getMeta(dlg->hContact);
+ if (hMetaContact != NULL) {
+ GetUserProtoLanguageSetting(dlg, hMetaContact, META_PROTO, setting);
+ if (dlg->lang_name[0] != _T('\0'))
+ return;
- GetUserProtoLanguageSetting(dlg, hMetaContact, "UserInfo", setting, FALSE);
- }
- }
+ GetUserProtoLanguageSetting(dlg, hMetaContact, "UserInfo", setting, FALSE);
}
}