2 files changed, 15 insertions, 22 deletions
diff --git a/plugins/AutoShutdown/res/resource.rc b/plugins/AutoShutdown/res/resource.rc
index a3955797ec..7cc2deca6f 100644
--- a/plugins/AutoShutdown/res/resource.rc
+++ b/plugins/AutoShutdown/res/resource.rc
@@ -40,7 +40,7 @@ END
 
 3 TEXTINCLUDE MOVEABLE PURE 
 BEGIN
-    "#include ""version.rc""\r\n"
+    "\r\n"
     "\0"
 END
 
@@ -231,9 +231,9 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ACTIVE              ICON    DISCARDABLE     "active.ico"
-IDI_HEADER              ICON    DISCARDABLE     "header.ico"
-IDI_INACTIVE            ICON    DISCARDABLE     "inactive.ico"
+IDI_ACTIVE              ICON         "active.ico"
+IDI_HEADER              ICON         "header.ico"
+IDI_INACTIVE            ICON         "inactive.ico"
 #endif    // Englisch (GB) resources
 /////////////////////////////////////////////////////////////////////////////
 
@@ -244,7 +244,6 @@ IDI_INACTIVE            ICON    DISCARDABLE     "inactive.ico"
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-#include "version.rc"
 
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
diff --git a/plugins/AutoShutdown/res/version.rc b/plugins/AutoShutdown/res/version.rc
index 5ea96be0f0..a141cc3aa7 100644
--- a/plugins/AutoShutdown/res/version.rc
+++ b/plugins/AutoShutdown/res/version.rc
@@ -2,6 +2,7 @@
 #error this file is not editable by Microsoft Visual C++
 #endif //APSTUDIO_INVOKED
 
+#include "afxres.h"
 #include "..\src\version.h"
 
 ///////////////////////////////////////////////////////////////////////////// 
@@ -10,30 +11,27 @@
 //                                                                            
                                                                               
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION FILE_VERSION
- PRODUCTVERSION FILE_VERSION
- FILEFLAGSMASK 0x0L
+ FILEVERSION __FILEVERSION_STRING
+ PRODUCTVERSION __FILEVERSION_STRING
+ FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
 #else
  FILEFLAGS 0x0L
 #endif
- FILEOS 0x40004L
- FILETYPE 0x2L
+ FILEOS 0x4L
+ FILETYPE 0x0L
  FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         BLOCK "000004b0"
         BEGIN
-            VALUE "Comments", "Licensed under the terms of the GNU General Public License"
-            VALUE "FileDescription", "AutoShutdown Plugin for Miranda NG"
-            VALUE "FileVersion", FILE_VERSION_STR
-            VALUE "InternalName", "AutoShutdown"
-            VALUE "LegalCopyright", "Copyright © 2004-2007 H. Herkenrath"
-            VALUE "OriginalFilename", "shutdown.dll"
-            VALUE "ProductName", "Automatic Shutdown"
-            VALUE "ProductVersion", FILE_VERSION_STR
+            VALUE "FileDescription", __DESCRIPTION
+            VALUE "InternalName", __PLUGIN_NAME
+            VALUE "LegalCopyright", __COPYRIGHT
+            VALUE "OriginalFilename", __FILENAME
+            VALUE "ProductName", __PLUGIN_NAME
         END
     END
     BLOCK "VarFileInfo"
@@ -41,7 +39,3 @@ BEGIN
         VALUE "Translation", 0x0, 1200
     END
 END
-                                   
-                                                                        
-                               
-