From e25808a8aa9a01fc2fee66b8a1893e2d037b0ba5 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 29 May 2018 16:45:08 +0300
Subject: ConnectionNotify: fixes a problem with version resource

---
 plugins/ConnectionNotify/res/ConnectionNotify.rc | 45 -------------------
 plugins/ConnectionNotify/res/version.rc          | 55 ++++++++++++++++++++++++
 plugins/ConnectionNotify/src/version.h           |  3 +-
 3 files changed, 57 insertions(+), 46 deletions(-)
 create mode 100644 plugins/ConnectionNotify/res/version.rc

diff --git a/plugins/ConnectionNotify/res/ConnectionNotify.rc b/plugins/ConnectionNotify/res/ConnectionNotify.rc
index 0dfd5603da..b8a16d2ca0 100644
--- a/plugins/ConnectionNotify/res/ConnectionNotify.rc
+++ b/plugins/ConnectionNotify/res/ConnectionNotify.rc
@@ -8,9 +8,6 @@
 #include "..\src\resource.h"
 #include "..\src\version.h"
 
-
-
-
 //
 // Dialog resources
 //
@@ -72,10 +69,6 @@ FONT 8, "Ms Shell Dlg"
     LTEXT           "Remote IP:Port", -1, 4, 42, 65, 8, SS_LEFT
 }
 
-
-
-
-
 //
 // Icon resources
 //
@@ -101,41 +94,3 @@ IDI_ICON5          ICON           ".\\arrowup.ico"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDI_ICON6          ICON           ".\\add.ico"
-
-
-
-//
-// Version Information resources
-//
-LANGUAGE LANG_NEUTRAL, SUBLANG_SYS_DEFAULT
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION __FILEVERSION_STRING
- PRODUCTVERSION __FILEVERSION_STRING
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "000004b0"
-        BEGIN
-            VALUE "CompanyName", __AUTHOR
-            VALUE "FileDescription", __DESCRIPTION
-            VALUE "InternalName", __PLUGIN_DISPLAY_NAME
-            VALUE "LegalCopyright", __COPYRIGHT
-            VALUE "LegalTrademarks", __COPYRIGHT
-            VALUE "FileVersion", __VERSION_STRING
-            VALUE "ProductVersion", __VERSION_STRING
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x0, 1200
-    END
-END
diff --git a/plugins/ConnectionNotify/res/version.rc b/plugins/ConnectionNotify/res/version.rc
new file mode 100644
index 0000000000..832ac546a5
--- /dev/null
+++ b/plugins/ConnectionNotify/res/version.rc
@@ -0,0 +1,55 @@
+// Microsoft Visual C++ generated resource script.
+//
+#ifdef APSTUDIO_INVOKED
+#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+#include "..\src\version.h"
+#include <m_version.h>
+
#define APSTUDIO_READONLY_SYMBOLS
+#include "afxres.h"
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION __FILEVERSION_STRING
+ PRODUCTVERSION MIRANDA_VERSION_COREVERSION
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "Author", __AUTHOR
+            VALUE "FileDescription", __DESCRIPTION
+            VALUE "FileVersion", __VERSION_STRING
+            VALUE "InternalName", __PLUGIN_NAME
+            VALUE "LegalCopyright", __COPYRIGHT
+            VALUE "OriginalFilename", __FILENAME
+            VALUE "ProductName", __PLUGIN_NAME
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/ConnectionNotify/src/version.h b/plugins/ConnectionNotify/src/version.h
index ea64ee107c..e7d5598da2 100644
--- a/plugins/ConnectionNotify/src/version.h
+++ b/plugins/ConnectionNotify/src/version.h
@@ -28,10 +28,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <stdver.h>
 
+#define __PLUGIN_NAME           "Connection Notify"
+#define __FILENAME              "ConnectionNotify.dll"
 #define __DESCRIPTION           "Notify with popup if some connection established"
 #define __AUTHOR                "MaKaR"
 #define __COPYRIGHT             "© 2011-13 MaKaRSoFT"
 #define __AUTHORWEB             "https://miranda-ng.org/p/ConnectionNotify/"
-#define __PLUGIN_DISPLAY_NAME   "ConnectionNotify"
 
 #endif //M_EXCHANGE_VERSION_H
-- 
cgit v1.2.3