diff options
| -rw-r--r-- | plugins/AVS/avs_10.vcxproj | 3 | ||||
| -rw-r--r-- | plugins/AVS/avs_10.vcxproj.filters | 7 | ||||
| -rw-r--r-- | plugins/AVS/res/version.rc | 5 | ||||
| -rw-r--r-- | plugins/AVS/src/commonheaders.h | 9 | ||||
| -rw-r--r-- | plugins/AVS/src/main.cpp | 5 |
5 files changed, 8 insertions, 21 deletions
diff --git a/plugins/AVS/avs_10.vcxproj b/plugins/AVS/avs_10.vcxproj index c20b693f7e..c3578c6198 100644 --- a/plugins/AVS/avs_10.vcxproj +++ b/plugins/AVS/avs_10.vcxproj @@ -222,9 +222,6 @@ <ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
- <None Include="res\avatar.ico" />
- </ItemGroup>
- <ItemGroup>
<ResourceCompile Include="res\avs.rc" />
</ItemGroup>
<ItemGroup>
diff --git a/plugins/AVS/avs_10.vcxproj.filters b/plugins/AVS/avs_10.vcxproj.filters index e348356ccc..1c30d7fc83 100644 --- a/plugins/AVS/avs_10.vcxproj.filters +++ b/plugins/AVS/avs_10.vcxproj.filters @@ -55,16 +55,11 @@ </ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="res\avatar.ico">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
<ResourceCompile Include="res\avs.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
<ResourceCompile Include="res\version.rc">
- <Filter>Source Files</Filter>
+ <Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
\ No newline at end of file diff --git a/plugins/AVS/res/version.rc b/plugins/AVS/res/version.rc index d741488c4f..cee33c8390 100644 --- a/plugins/AVS/res/version.rc +++ b/plugins/AVS/res/version.rc @@ -4,13 +4,8 @@ #error this file is not editable by Microsoft Visual C++
#endif //APSTUDIO_INVOKED
-#include "afxres.h"
#include "..\src\version.h"
-#ifdef _WIN32
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-#endif //_WIN32
-
VS_VERSION_INFO VERSIONINFO
FILEVERSION __FILEVERSION_STRING
PRODUCTVERSION __FILEVERSION_STRING
diff --git a/plugins/AVS/src/commonheaders.h b/plugins/AVS/src/commonheaders.h index c4b459d8dc..b1136e7e0f 100644 --- a/plugins/AVS/src/commonheaders.h +++ b/plugins/AVS/src/commonheaders.h @@ -57,20 +57,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <m_addcontact.h>
#include <m_png.h>
#include <m_userinfo.h>
-#include "m_folders.h"
-
+#include <m_acc.h>
#include <m_avatars.h>
#include <m_popup.h>
#include <m_imgsrvc.h>
+
+#include "m_folders.h"
#include "m_metacontacts.h"
#include "m_avatarhistory.h"
+#include "m_flash.h"
#include "resource.h"
-#include "m_flash.h"
+#include "version.h"
#include "image_utils.h"
#include "mir_thread.h"
#include "poll.h"
-#include "m_acc.h"
#include "acc.h"
diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp index 0965be9877..6ee1db0a79 100644 --- a/plugins/AVS/src/main.cpp +++ b/plugins/AVS/src/main.cpp @@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "commonheaders.h"
-#include "version.h"
HINSTANCE g_hInst = 0;
int hLangpack;
@@ -104,8 +103,8 @@ PLUGININFOEX pluginInfoEx = { __COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
-// {E00F1643-263C-4599-B84B-053E5C511D29}
- { 0xe00f1643, 0x263c, 0x4599, { 0xb8, 0x4b, 0x5, 0x3e, 0x5c, 0x51, 0x1d, 0x29 } }
+ // {E00F1643-263C-4599-B84B-053E5C511D29}
+ {0xe00f1643, 0x263c, 0x4599, {0xb8, 0x4b, 0x5, 0x3e, 0x5c, 0x51, 0x1d, 0x29}}
};
extern INT_PTR CALLBACK DlgProcOptionsAvatars(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
|