summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2012-06-13 22:16:46 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2012-06-13 22:16:46 +0000
commita04043571f2d04ff9d117f921115f97f7bf42870 (patch)
tree38592b1a7324b6d3d50fe75976db1f73e20f2364 /protocols
parent950917d869583a8e09135c5d7b5b81d98ed1a213 (diff)
Unicode description is no longer needed in PluginInfo
git-svn-id: http://svn.miranda-ng.org/main/trunk@401 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
-rw-r--r--protocols/FacebookRM/main.cpp6
-rw-r--r--protocols/NewsAggregator/Version.h10
-rw-r--r--protocols/Omegle/main.cpp6
-rw-r--r--protocols/Quotes/version.h4
-rw-r--r--protocols/Weather/weather.cpp4
-rw-r--r--protocols/YAMN/main.h18
-rw-r--r--protocols/Yahoo/main.cpp4
7 files changed, 7 insertions, 45 deletions
diff --git a/protocols/FacebookRM/main.cpp b/protocols/FacebookRM/main.cpp
index 736393e247..b6f4c3af1b 100644
--- a/protocols/FacebookRM/main.cpp
+++ b/protocols/FacebookRM/main.cpp
@@ -37,11 +37,7 @@ DWORD g_mirandaVersion;
PLUGININFOEX pluginInfo = {
sizeof(PLUGININFOEX),
- #ifdef _WIN64
- "Facebook Protocol RM x64",
- #else
- "Facebook Protocol RM",
- #endif
+ "Facebook Protocol RM",
__VERSION_DWORD,
"Provides basic support for Facebook Chat protocol. [Built: "__DATE__" "__TIME__"]",
"Michal Zelinka, Robert Posel",
diff --git a/protocols/NewsAggregator/Version.h b/protocols/NewsAggregator/Version.h
index fe5d837fe3..91a2c495ae 100644
--- a/protocols/NewsAggregator/Version.h
+++ b/protocols/NewsAggregator/Version.h
@@ -10,15 +10,7 @@
#define __STRINGIFY(x) __STRINGIFY_IMPL(x)
#define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS)
-#ifdef _UNICODE
-#if defined(WIN64) || defined(_WIN64)
- #define __PLUGIN_NAME "NewsAggregator (Unicode x64)"
-#else
- #define __PLUGIN_NAME "NewsAggregator (Unicode)"
-#endif
-#else
- #define __PLUGIN_NAME "NewsAggregator"
-#endif
+#define __PLUGIN_NAME "NewsAggregator"
#define __INTERNAL_NAME "NewsAggregator"
#define __FILENAME "NewsAggregator.dll"
#define __DESCRIPTION "RSS/Atom news aggregator."
diff --git a/protocols/Omegle/main.cpp b/protocols/Omegle/main.cpp
index ec78eb5efe..aa34e0eeaf 100644
--- a/protocols/Omegle/main.cpp
+++ b/protocols/Omegle/main.cpp
@@ -36,11 +36,7 @@ DWORD g_mirandaVersion;
PLUGININFOEX pluginInfo = {
sizeof(PLUGININFOEX),
- #ifdef _WIN64
- "Omegle Protocol x64",
- #else
- "Omegle Protocol",
- #endif
+ "Omegle Protocol",
__VERSION_DWORD,
"Provides basic support for Omegle Chat protocol. [Built: "__DATE__" "__TIME__"]",
"Robert Posel",
diff --git a/protocols/Quotes/version.h b/protocols/Quotes/version.h
index 956486d4d5..63aab03338 100644
--- a/protocols/Quotes/version.h
+++ b/protocols/Quotes/version.h
@@ -10,11 +10,7 @@
#define __STRINGIFY(x) __STRINGIFY_IMPL(x)
#define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS)
-#if defined (_UNICODE)
-#define __PLUGIN_NAME "Quotes (Unicode)"
-#else
#define __PLUGIN_NAME "Quotes"
-#endif
#define __INTERNAL_NAME "Quotes"
#define __FILENAME "Quotes.dll"
#define __DESCRIPTION "Show currency rates and economic quotes."
diff --git a/protocols/Weather/weather.cpp b/protocols/Weather/weather.cpp
index e5458336c5..e7ab6f3863 100644
--- a/protocols/Weather/weather.cpp
+++ b/protocols/Weather/weather.cpp
@@ -67,11 +67,7 @@ PLUGINLINK *pluginLink;
static const PLUGININFOEX pluginInfoEx =
{
sizeof(PLUGININFOEX),
-#ifdef _WIN64
- "Weather Protocol x64",
-#else
"Weather Protocol",
-#endif
__VERSION_DWORD,
"Retrieve weather information and display them in your contact list. Mod for Mataes Pack.",
AUTH,
diff --git a/protocols/YAMN/main.h b/protocols/YAMN/main.h
index 1ec690873d..08d9f91fed 100644
--- a/protocols/YAMN/main.h
+++ b/protocols/YAMN/main.h
@@ -9,20 +9,10 @@
#define _except __except
#define _finally __finally
#endif
-//For updater
-//#define YAMN_9x
-#ifndef WIN2IN1
-#ifdef YAMN_9x
- #define YAMN_SHORTNAME "YAMN tweety win9x"
- #define YAMN_FILENAME "yamn_9x"
-#else
- #define YAMN_SHORTNAME "YAMN tweety"
- #define YAMN_FILENAME "yamn"
-#endif
-#else
- #define YAMN_SHORTNAME "YAMN tweety 2in1"
- #define YAMN_FILENAME "yamn"
-#endif //WIN2IN1
+
+#define YAMN_SHORTNAME "YAMN tweety"
+#define YAMN_FILENAME "yamn"
+
#include "version.h"
#define YAMN_NEWMAILSNDDESC "YAMN: new mail message"
diff --git a/protocols/Yahoo/main.cpp b/protocols/Yahoo/main.cpp
index 6205ea92e6..6f37098361 100644
--- a/protocols/Yahoo/main.cpp
+++ b/protocols/Yahoo/main.cpp
@@ -33,11 +33,7 @@ int hLangpack;
PLUGININFOEX pluginInfo={
sizeof(PLUGININFOEX),
-#ifdef YAHOO_CVSBUILD
- "Yahoo Protocol Beta/Nightly",
-#else
"Yahoo Protocol",
-#endif
__VERSION_DWORD,
"Yahoo Protocol support via libyahoo2 library. [Built: "__DATE__" "__TIME__"]",
"Gennady Feldman",