diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-16 17:42:08 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-16 17:42:08 +0000 |
| commit | 5975b2d0903bd5df128d55e20cd27d7c13b4e46c (patch) | |
| tree | 6696492511c591fa8bf3b65a64864245caa3e7c2 /plugins/Updater/scan.cpp | |
| parent | 8617d7e00546f892c9084f7c382648b23d8bbb63 (diff) | |
another portion of "#ifdef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@448 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Updater/scan.cpp')
| -rw-r--r-- | plugins/Updater/scan.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/plugins/Updater/scan.cpp b/plugins/Updater/scan.cpp index ad8fa165e2..ddae89dc43 100644 --- a/plugins/Updater/scan.cpp +++ b/plugins/Updater/scan.cpp @@ -15,11 +15,9 @@ static const AlternateShortName alternate_shortname_map[] = { "Version Informations", "Version Information" },
{ "Jabber Protocol", "JabberG Protocol" },
{ "Jabber Protocol (Unicode)", "JabberG Protocol (Unicode)" },
-#ifdef _UNICODE
+
{ "PopUp Interoperability", "PopUp Plus (Unicode)" },
-#else
- { "PopUp Interoperability", "PopUp Plus" },
-#endif
+
//{ "Messaging Style Conversation", "nConvers++" }, // will this conflict with other nConvers'?
{ "MimQQ-libeva", "MirandaQQ (libeva Version)" },
@@ -35,14 +33,14 @@ char* findAlternateShortName(const char* name) if (strcmp(name, alternate_shortname_map[i].from) == 0)
return mir_strdup(alternate_shortname_map[i].to);
}
-#ifdef _UNICODE
+
if (!strstr(name, "Unicode"))
{
char *buf = (char*)mir_alloc(256);
mir_snprintf(buf, 256, "%s (Unicode)", name);
return buf;
}
-#endif
+
return NULL;
}
|