diff options
author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-10-12 14:18:20 +0000 |
---|---|---|
committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-10-12 14:18:20 +0000 |
commit | 0ecadfc45326fce5fc4ba28b27a0a7ad484e5b84 (patch) | |
tree | fef68e6433f39bd8d51e0718f0de8ea425e52be3 | |
parent | ef1f6f8fac28594a151c4cd811d1590cfc7ff81d (diff) |
Gadu-Gadu: folders restructurization
git-svn-id: http://svn.miranda-ng.org/main/trunk@1888 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r-- | protocols/Gadu-Gadu/Gadu-Gadu_10.vcxproj | 122 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/Gadu-Gadu_10.vcxproj.filters | 148 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/docs/gadu-gadu-translation.txt (renamed from protocols/Gadu-Gadu/gadu-gadu-translation.txt) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/proto_gg/Proto_GG.vcxproj | 4 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/proto_gg/Proto_GG.vcxproj.filters | 4 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/proto_gg/res/Away.ico (renamed from protocols/Gadu-Gadu/proto_gg/icos/Away.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/proto_gg/res/DND.ico (renamed from protocols/Gadu-Gadu/proto_gg/icos/DND.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/proto_gg/res/FFC.ico (renamed from protocols/Gadu-Gadu/proto_gg/icos/FFC.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/proto_gg/res/Invisible.ico (renamed from protocols/Gadu-Gadu/proto_gg/icos/Invisible.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/proto_gg/res/NA.ico (renamed from protocols/Gadu-Gadu/proto_gg/icos/NA.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/proto_gg/res/Offline.ico (renamed from protocols/Gadu-Gadu/proto_gg/icos/Offline.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/proto_gg/res/Online.ico (renamed from protocols/Gadu-Gadu/proto_gg/icos/Online.ico) | bin | 5430 -> 5430 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/proto_gg/res/Proto_GG.rc (renamed from protocols/Gadu-Gadu/proto_gg/Proto_GG.rc) | bin | 4042 -> 3990 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/proto_gg/src/resource.h (renamed from protocols/Gadu-Gadu/proto_gg/resource.h) | bin | 1444 -> 1444 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/res/block.ico (renamed from protocols/Gadu-Gadu/icons/block.ico) | bin | 2550 -> 2550 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/res/clear_ignored_conference.ico (renamed from protocols/Gadu-Gadu/icons/clear_ignored_conference.ico) | bin | 2038 -> 2038 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/res/conference.ico (renamed from protocols/Gadu-Gadu/icons/conference.ico) | bin | 9062 -> 9062 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/res/delete.ico (renamed from protocols/Gadu-Gadu/icons/delete.ico) | bin | 2550 -> 2550 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/res/export_list_to_server.ico (renamed from protocols/Gadu-Gadu/icons/export_list_to_server.ico) | bin | 2038 -> 2038 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/res/export_list_to_txt_file.ico (renamed from protocols/Gadu-Gadu/icons/export_list_to_txt_file.ico) | bin | 2038 -> 2038 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/res/gg.ico (renamed from protocols/Gadu-Gadu/icons/gg.ico) | bin | 6830 -> 6830 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/res/image.ico (renamed from protocols/Gadu-Gadu/icons/image.ico) | bin | 2038 -> 2038 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/res/import_list_from_server.ico (renamed from protocols/Gadu-Gadu/icons/import_list_from_server.ico) | bin | 2038 -> 2038 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/res/import_list_from_txt_file.ico (renamed from protocols/Gadu-Gadu/icons/import_list_from_txt_file.ico) | bin | 2038 -> 2038 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/res/list.ico (renamed from protocols/Gadu-Gadu/icons/list.ico) | bin | 2550 -> 2550 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/res/next.ico (renamed from protocols/Gadu-Gadu/icons/next.ico) | bin | 2038 -> 2038 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/res/previous.ico (renamed from protocols/Gadu-Gadu/icons/previous.ico) | bin | 2038 -> 2038 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/res/remove_list_from_server.ico (renamed from protocols/Gadu-Gadu/icons/remove_list_from_server.ico) | bin | 2038 -> 2038 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/res/resource.rc (renamed from protocols/Gadu-Gadu/resource.rc) | 39 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/res/save.ico (renamed from protocols/Gadu-Gadu/icons/save.ico) | bin | 2038 -> 2038 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/res/sessions.ico (renamed from protocols/Gadu-Gadu/icons/sessions.ico) | bin | 6830 -> 6830 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/res/settings.ico (renamed from protocols/Gadu-Gadu/icons/settings.ico) | bin | 6830 -> 6830 bytes | |||
-rw-r--r-- | protocols/Gadu-Gadu/res/version.rc (renamed from protocols/Gadu-Gadu/version.rc) | 2 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/avatar.cpp (renamed from protocols/Gadu-Gadu/avatar.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/core.cpp (renamed from protocols/Gadu-Gadu/core.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/dialogs.cpp (renamed from protocols/Gadu-Gadu/dialogs.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/dynstuff.cpp (renamed from protocols/Gadu-Gadu/dynstuff.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/dynstuff.h (renamed from protocols/Gadu-Gadu/dynstuff.h) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/filetransfer.cpp (renamed from protocols/Gadu-Gadu/filetransfer.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/gg.cpp (renamed from protocols/Gadu-Gadu/gg.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/gg.h (renamed from protocols/Gadu-Gadu/gg.h) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/gg_proto.cpp (renamed from protocols/Gadu-Gadu/gg_proto.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/gg_proto.h (renamed from protocols/Gadu-Gadu/gg_proto.h) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/groupchat.cpp (renamed from protocols/Gadu-Gadu/groupchat.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/icolib.cpp (renamed from protocols/Gadu-Gadu/icolib.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/image.cpp (renamed from protocols/Gadu-Gadu/image.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/import.cpp (renamed from protocols/Gadu-Gadu/import.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/keepalive.cpp (renamed from protocols/Gadu-Gadu/keepalive.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/COPYING (renamed from protocols/Gadu-Gadu/libgadu/COPYING) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/common.c (renamed from protocols/Gadu-Gadu/libgadu/common.c) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/compat.h (renamed from protocols/Gadu-Gadu/libgadu/compat.h) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/dcc.c (renamed from protocols/Gadu-Gadu/libgadu/dcc.c) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/dcc7.c (renamed from protocols/Gadu-Gadu/libgadu/dcc7.c) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/events.c (renamed from protocols/Gadu-Gadu/libgadu/events.c) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/http.c (renamed from protocols/Gadu-Gadu/libgadu/http.c) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/internal.h (renamed from protocols/Gadu-Gadu/libgadu/internal.h) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/libgadu.c (renamed from protocols/Gadu-Gadu/libgadu/libgadu.c) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/libgadu.h (renamed from protocols/Gadu-Gadu/libgadu/libgadu.h) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/obsolete.c (renamed from protocols/Gadu-Gadu/libgadu/obsolete.c) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/protocol.h (renamed from protocols/Gadu-Gadu/libgadu/protocol.h) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/pthread.c (renamed from protocols/Gadu-Gadu/libgadu/pthread.c) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/pthread.h (renamed from protocols/Gadu-Gadu/libgadu/pthread.h) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/pubdir.c (renamed from protocols/Gadu-Gadu/libgadu/pubdir.c) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/pubdir50.c (renamed from protocols/Gadu-Gadu/libgadu/pubdir50.c) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/resolver.c (renamed from protocols/Gadu-Gadu/libgadu/resolver.c) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/resolver.h (renamed from protocols/Gadu-Gadu/libgadu/resolver.h) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/sha1.c (renamed from protocols/Gadu-Gadu/libgadu/sha1.c) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/win32.c (renamed from protocols/Gadu-Gadu/libgadu/win32.c) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/libgadu/win32.h (renamed from protocols/Gadu-Gadu/libgadu/win32.h) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/links.cpp (renamed from protocols/Gadu-Gadu/links.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/oauth.cpp (renamed from protocols/Gadu-Gadu/oauth.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/ownerinfo.cpp (renamed from protocols/Gadu-Gadu/ownerinfo.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/popups.cpp (renamed from protocols/Gadu-Gadu/popups.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/resource.h (renamed from protocols/Gadu-Gadu/resource.h) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/services.cpp (renamed from protocols/Gadu-Gadu/services.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/sessions.cpp (renamed from protocols/Gadu-Gadu/sessions.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/token.cpp (renamed from protocols/Gadu-Gadu/token.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/userutils.cpp (renamed from protocols/Gadu-Gadu/userutils.cpp) | 0 | ||||
-rw-r--r-- | protocols/Gadu-Gadu/src/version.h (renamed from protocols/Gadu-Gadu/version.h) | 0 |
79 files changed, 121 insertions, 198 deletions
diff --git a/protocols/Gadu-Gadu/Gadu-Gadu_10.vcxproj b/protocols/Gadu-Gadu/Gadu-Gadu_10.vcxproj index 227f421cf2..129352f88d 100644 --- a/protocols/Gadu-Gadu/Gadu-Gadu_10.vcxproj +++ b/protocols/Gadu-Gadu/Gadu-Gadu_10.vcxproj @@ -72,7 +72,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;libgadu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;src\libgadu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -101,7 +101,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;libgadu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;src\libgadu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;GG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -131,7 +131,7 @@ <Optimization>Full</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;libgadu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;src\libgadu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -164,7 +164,7 @@ <Optimization>Full</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
- <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;libgadu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\..\include;..\..\plugins\ExternalAPI;src\libgadu;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;GG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BufferSecurityCheck>false</BufferSecurityCheck>
@@ -193,104 +193,82 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="avatar.cpp" />
- <ClCompile Include="core.cpp" />
- <ClCompile Include="dialogs.cpp" />
- <ClCompile Include="dynstuff.cpp" />
- <ClCompile Include="filetransfer.cpp" />
- <ClCompile Include="gg.cpp">
+ <ClCompile Include="src\avatar.cpp" />
+ <ClCompile Include="src\core.cpp" />
+ <ClCompile Include="src\dialogs.cpp" />
+ <ClCompile Include="src\dynstuff.cpp" />
+ <ClCompile Include="src\filetransfer.cpp" />
+ <ClCompile Include="src\gg.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="gg_proto.cpp" />
- <ClCompile Include="groupchat.cpp" />
- <ClCompile Include="icolib.cpp" />
- <ClCompile Include="image.cpp" />
- <ClCompile Include="import.cpp" />
- <ClCompile Include="keepalive.cpp" />
- <ClCompile Include="links.cpp" />
- <ClCompile Include="oauth.cpp" />
- <ClCompile Include="ownerinfo.cpp" />
- <ClCompile Include="popups.cpp" />
- <ClCompile Include="services.cpp" />
- <ClCompile Include="sessions.cpp" />
- <ClCompile Include="token.cpp" />
- <ClCompile Include="userutils.cpp" />
- <ClCompile Include="libgadu\common.c">
+ <ClCompile Include="src\gg_proto.cpp" />
+ <ClCompile Include="src\groupchat.cpp" />
+ <ClCompile Include="src\icolib.cpp" />
+ <ClCompile Include="src\image.cpp" />
+ <ClCompile Include="src\import.cpp" />
+ <ClCompile Include="src\keepalive.cpp" />
+ <ClCompile Include="src\links.cpp" />
+ <ClCompile Include="src\oauth.cpp" />
+ <ClCompile Include="src\ownerinfo.cpp" />
+ <ClCompile Include="src\popups.cpp" />
+ <ClCompile Include="src\services.cpp" />
+ <ClCompile Include="src\sessions.cpp" />
+ <ClCompile Include="src\token.cpp" />
+ <ClCompile Include="src\userutils.cpp" />
+ <ClCompile Include="src\libgadu\common.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="libgadu\dcc.c">
+ <ClCompile Include="src\libgadu\dcc.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="libgadu\dcc7.c">
+ <ClCompile Include="src\libgadu\dcc7.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="libgadu\events.c">
+ <ClCompile Include="src\libgadu\events.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="libgadu\http.c">
+ <ClCompile Include="src\libgadu\http.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="libgadu\libgadu.c">
+ <ClCompile Include="src\libgadu\libgadu.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="libgadu\pthread.c">
+ <ClCompile Include="src\libgadu\pthread.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="libgadu\pubdir.c">
+ <ClCompile Include="src\libgadu\pubdir.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="libgadu\pubdir50.c">
+ <ClCompile Include="src\libgadu\pubdir50.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="libgadu\resolver.c">
+ <ClCompile Include="src\libgadu\resolver.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="libgadu\sha1.c">
+ <ClCompile Include="src\libgadu\sha1.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="libgadu\win32.c">
+ <ClCompile Include="src\libgadu\win32.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="gg_proto.h" />
- <ClInclude Include="libgadu\compat.h" />
- <ClInclude Include="libgadu\internal.h" />
- <ClInclude Include="libgadu\libgadu.h" />
- <ClInclude Include="libgadu\protocol.h" />
- <ClInclude Include="libgadu\pthread.h" />
- <ClInclude Include="libgadu\resolver.h" />
- <ClInclude Include="libgadu\win32.h" />
- <ClInclude Include="dynstuff.h" />
- <ClInclude Include="gg.h" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="version.h" />
+ <ClInclude Include="src\gg_proto.h" />
+ <ClInclude Include="src\libgadu\compat.h" />
+ <ClInclude Include="src\libgadu\internal.h" />
+ <ClInclude Include="src\libgadu\libgadu.h" />
+ <ClInclude Include="src\libgadu\protocol.h" />
+ <ClInclude Include="src\libgadu\pthread.h" />
+ <ClInclude Include="src\libgadu\resolver.h" />
+ <ClInclude Include="src\libgadu\win32.h" />
+ <ClInclude Include="src\dynstuff.h" />
+ <ClInclude Include="src\gg.h" />
+ <ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
- <None Include="icons\block.ico" />
- <None Include="icons\clear_ignored_conference.ico" />
- <None Include="icons\conference.ico" />
- <None Include="icons\delete.ico" />
- <None Include="icons\export_list_to_server.ico" />
- <None Include="icons\export_list_to_txt_file.ico" />
- <None Include="icons\gg.ico" />
- <None Include="icons\image.ico" />
- <None Include="icons\import_list_from_server.ico" />
- <None Include="icons\import_list_from_txt_file.ico" />
- <None Include="icons\list.ico" />
- <None Include="icons\next.ico" />
- <None Include="icons\previous.ico" />
- <None Include="icons\remove_list_from_server.ico" />
- <None Include="icons\save.ico" />
- <None Include="icons\sessions.ico" />
- <None Include="icons\settings.ico" />
- <None Include="docs\build-howto.txt" />
- <None Include="docs\gg-license.txt" />
- <None Include="docs\gg-readme.txt" />
- <None Include="docs\gg-translation-sample.txt" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc" />
+ <ResourceCompile Include="res\resource.rc" />
+ <ResourceCompile Include="res\Version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/protocols/Gadu-Gadu/Gadu-Gadu_10.vcxproj.filters b/protocols/Gadu-Gadu/Gadu-Gadu_10.vcxproj.filters index 0057590422..227066cb83 100644 --- a/protocols/Gadu-Gadu/Gadu-Gadu_10.vcxproj.filters +++ b/protocols/Gadu-Gadu/Gadu-Gadu_10.vcxproj.filters @@ -18,200 +18,146 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="libgadu\common.c">
+ <ClCompile Include="src\libgadu\common.c">
<Filter>Source Files\libgadu</Filter>
</ClCompile>
- <ClCompile Include="libgadu\dcc.c">
+ <ClCompile Include="src\libgadu\dcc.c">
<Filter>Source Files\libgadu</Filter>
</ClCompile>
- <ClCompile Include="libgadu\dcc7.c">
+ <ClCompile Include="src\libgadu\dcc7.c">
<Filter>Source Files\libgadu</Filter>
</ClCompile>
- <ClCompile Include="libgadu\events.c">
+ <ClCompile Include="src\libgadu\events.c">
<Filter>Source Files\libgadu</Filter>
</ClCompile>
- <ClCompile Include="libgadu\http.c">
+ <ClCompile Include="src\libgadu\http.c">
<Filter>Source Files\libgadu</Filter>
</ClCompile>
- <ClCompile Include="libgadu\libgadu.c">
+ <ClCompile Include="src\libgadu\libgadu.c">
<Filter>Source Files\libgadu</Filter>
</ClCompile>
- <ClCompile Include="libgadu\pthread.c">
+ <ClCompile Include="src\libgadu\pthread.c">
<Filter>Source Files\libgadu</Filter>
</ClCompile>
- <ClCompile Include="libgadu\pubdir.c">
+ <ClCompile Include="src\libgadu\pubdir.c">
<Filter>Source Files\libgadu</Filter>
</ClCompile>
- <ClCompile Include="libgadu\pubdir50.c">
+ <ClCompile Include="src\libgadu\pubdir50.c">
<Filter>Source Files\libgadu</Filter>
</ClCompile>
- <ClCompile Include="libgadu\resolver.c">
+ <ClCompile Include="src\libgadu\resolver.c">
<Filter>Source Files\libgadu</Filter>
</ClCompile>
- <ClCompile Include="libgadu\sha1.c">
+ <ClCompile Include="src\libgadu\sha1.c">
<Filter>Source Files\libgadu</Filter>
</ClCompile>
- <ClCompile Include="libgadu\win32.c">
+ <ClCompile Include="src\libgadu\win32.c">
<Filter>Source Files\libgadu</Filter>
</ClCompile>
- <ClCompile Include="avatar.cpp">
+ <ClCompile Include="src\avatar.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="core.cpp">
+ <ClCompile Include="src\core.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="dialogs.cpp">
+ <ClCompile Include="src\dialogs.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="dynstuff.cpp">
+ <ClCompile Include="src\dynstuff.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="filetransfer.cpp">
+ <ClCompile Include="src\filetransfer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="gg.cpp">
+ <ClCompile Include="src\gg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="groupchat.cpp">
+ <ClCompile Include="src\groupchat.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="icolib.cpp">
+ <ClCompile Include="src\icolib.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="image.cpp">
+ <ClCompile Include="src\image.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="import.cpp">
+ <ClCompile Include="src\import.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="keepalive.cpp">
+ <ClCompile Include="src\keepalive.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="links.cpp">
+ <ClCompile Include="src\links.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="oauth.cpp">
+ <ClCompile Include="src\oauth.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="ownerinfo.cpp">
+ <ClCompile Include="src\ownerinfo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="popups.cpp">
+ <ClCompile Include="src\popups.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="services.cpp">
+ <ClCompile Include="src\services.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="sessions.cpp">
+ <ClCompile Include="src\sessions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="token.cpp">
+ <ClCompile Include="src\token.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="userutils.cpp">
+ <ClCompile Include="src\userutils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="gg_proto.cpp">
+ <ClCompile Include="src\gg_proto.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="libgadu\compat.h">
+ <ClInclude Include="src\libgadu\compat.h">
<Filter>Source Files\libgadu</Filter>
</ClInclude>
- <ClInclude Include="libgadu\internal.h">
+ <ClInclude Include="src\libgadu\internal.h">
<Filter>Source Files\libgadu</Filter>
</ClInclude>
- <ClInclude Include="libgadu\libgadu.h">
+ <ClInclude Include="src\libgadu\libgadu.h">
<Filter>Source Files\libgadu</Filter>
</ClInclude>
- <ClInclude Include="libgadu\protocol.h">
+ <ClInclude Include="src\libgadu\protocol.h">
<Filter>Source Files\libgadu</Filter>
</ClInclude>
- <ClInclude Include="libgadu\pthread.h">
+ <ClInclude Include="src\libgadu\pthread.h">
<Filter>Source Files\libgadu</Filter>
</ClInclude>
- <ClInclude Include="libgadu\resolver.h">
+ <ClInclude Include="src\libgadu\resolver.h">
<Filter>Source Files\libgadu</Filter>
</ClInclude>
- <ClInclude Include="libgadu\win32.h">
+ <ClInclude Include="src\libgadu\win32.h">
<Filter>Source Files\libgadu</Filter>
</ClInclude>
- <ClInclude Include="dynstuff.h">
+ <ClInclude Include="src\dynstuff.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="gg.h">
+ <ClInclude Include="src\gg.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="version.h">
+ <ClInclude Include="src\version.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="gg_proto.h">
+ <ClInclude Include="src\gg_proto.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="icons\block.ico">
+ <ResourceCompile Include="res\resource.rc">
<Filter>Resource Files</Filter>
- </None>
- <None Include="icons\clear_ignored_conference.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\conference.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\delete.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\export_list_to_server.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\export_list_to_txt_file.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\gg.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\image.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\import_list_from_server.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\import_list_from_txt_file.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\list.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\next.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\previous.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\remove_list_from_server.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\save.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\sessions.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icons\settings.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="docs\build-howto.txt" />
- <None Include="docs\gg-license.txt" />
- <None Include="docs\gg-readme.txt" />
- <None Include="docs\gg-translation-sample.txt" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="resource.rc">
+ </ResourceCompile>
+ <ResourceCompile Include="res\Version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/protocols/Gadu-Gadu/gadu-gadu-translation.txt b/protocols/Gadu-Gadu/docs/gadu-gadu-translation.txt index 168fe833e4..168fe833e4 100644 --- a/protocols/Gadu-Gadu/gadu-gadu-translation.txt +++ b/protocols/Gadu-Gadu/docs/gadu-gadu-translation.txt diff --git a/protocols/Gadu-Gadu/proto_gg/Proto_GG.vcxproj b/protocols/Gadu-Gadu/proto_gg/Proto_GG.vcxproj index 250beed3aa..7ff48e0a01 100644 --- a/protocols/Gadu-Gadu/proto_gg/Proto_GG.vcxproj +++ b/protocols/Gadu-Gadu/proto_gg/Proto_GG.vcxproj @@ -119,10 +119,10 @@ </ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="resource.h" />
+ <ClInclude Include="src\resource.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="Proto_GG.rc" />
+ <ResourceCompile Include="res\Proto_GG.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/protocols/Gadu-Gadu/proto_gg/Proto_GG.vcxproj.filters b/protocols/Gadu-Gadu/proto_gg/Proto_GG.vcxproj.filters index 5e666a0fc0..c5b7b23e4b 100644 --- a/protocols/Gadu-Gadu/proto_gg/Proto_GG.vcxproj.filters +++ b/protocols/Gadu-Gadu/proto_gg/Proto_GG.vcxproj.filters @@ -11,12 +11,12 @@ </Filter>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="Proto_GG.rc">
+ <ResourceCompile Include="res\Proto_GG.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/protocols/Gadu-Gadu/proto_gg/icos/Away.ico b/protocols/Gadu-Gadu/proto_gg/res/Away.ico Binary files differindex 33cdbf482e..33cdbf482e 100644 --- a/protocols/Gadu-Gadu/proto_gg/icos/Away.ico +++ b/protocols/Gadu-Gadu/proto_gg/res/Away.ico diff --git a/protocols/Gadu-Gadu/proto_gg/icos/DND.ico b/protocols/Gadu-Gadu/proto_gg/res/DND.ico Binary files differindex f4aee0d05b..f4aee0d05b 100644 --- a/protocols/Gadu-Gadu/proto_gg/icos/DND.ico +++ b/protocols/Gadu-Gadu/proto_gg/res/DND.ico diff --git a/protocols/Gadu-Gadu/proto_gg/icos/FFC.ico b/protocols/Gadu-Gadu/proto_gg/res/FFC.ico Binary files differindex 13821f419d..13821f419d 100644 --- a/protocols/Gadu-Gadu/proto_gg/icos/FFC.ico +++ b/protocols/Gadu-Gadu/proto_gg/res/FFC.ico diff --git a/protocols/Gadu-Gadu/proto_gg/icos/Invisible.ico b/protocols/Gadu-Gadu/proto_gg/res/Invisible.ico Binary files differindex d9e9d2913a..d9e9d2913a 100644 --- a/protocols/Gadu-Gadu/proto_gg/icos/Invisible.ico +++ b/protocols/Gadu-Gadu/proto_gg/res/Invisible.ico diff --git a/protocols/Gadu-Gadu/proto_gg/icos/NA.ico b/protocols/Gadu-Gadu/proto_gg/res/NA.ico Binary files differindex bc1b4b4c10..bc1b4b4c10 100644 --- a/protocols/Gadu-Gadu/proto_gg/icos/NA.ico +++ b/protocols/Gadu-Gadu/proto_gg/res/NA.ico diff --git a/protocols/Gadu-Gadu/proto_gg/icos/Offline.ico b/protocols/Gadu-Gadu/proto_gg/res/Offline.ico Binary files differindex 60f3d1d330..60f3d1d330 100644 --- a/protocols/Gadu-Gadu/proto_gg/icos/Offline.ico +++ b/protocols/Gadu-Gadu/proto_gg/res/Offline.ico diff --git a/protocols/Gadu-Gadu/proto_gg/icos/Online.ico b/protocols/Gadu-Gadu/proto_gg/res/Online.ico Binary files differindex 98794a4123..98794a4123 100644 --- a/protocols/Gadu-Gadu/proto_gg/icos/Online.ico +++ b/protocols/Gadu-Gadu/proto_gg/res/Online.ico diff --git a/protocols/Gadu-Gadu/proto_gg/Proto_GG.rc b/protocols/Gadu-Gadu/proto_gg/res/Proto_GG.rc Binary files differindex b3188f3d4a..03cfefcd8b 100644 --- a/protocols/Gadu-Gadu/proto_gg/Proto_GG.rc +++ b/protocols/Gadu-Gadu/proto_gg/res/Proto_GG.rc diff --git a/protocols/Gadu-Gadu/proto_gg/resource.h b/protocols/Gadu-Gadu/proto_gg/src/resource.h Binary files differindex cc58929a32..cc58929a32 100644 --- a/protocols/Gadu-Gadu/proto_gg/resource.h +++ b/protocols/Gadu-Gadu/proto_gg/src/resource.h diff --git a/protocols/Gadu-Gadu/icons/block.ico b/protocols/Gadu-Gadu/res/block.ico Binary files differindex 6f59309853..6f59309853 100644 --- a/protocols/Gadu-Gadu/icons/block.ico +++ b/protocols/Gadu-Gadu/res/block.ico diff --git a/protocols/Gadu-Gadu/icons/clear_ignored_conference.ico b/protocols/Gadu-Gadu/res/clear_ignored_conference.ico Binary files differindex f883585899..f883585899 100644 --- a/protocols/Gadu-Gadu/icons/clear_ignored_conference.ico +++ b/protocols/Gadu-Gadu/res/clear_ignored_conference.ico diff --git a/protocols/Gadu-Gadu/icons/conference.ico b/protocols/Gadu-Gadu/res/conference.ico Binary files differindex 3e4cfcc606..3e4cfcc606 100644 --- a/protocols/Gadu-Gadu/icons/conference.ico +++ b/protocols/Gadu-Gadu/res/conference.ico diff --git a/protocols/Gadu-Gadu/icons/delete.ico b/protocols/Gadu-Gadu/res/delete.ico Binary files differindex 9108e38cfd..9108e38cfd 100644 --- a/protocols/Gadu-Gadu/icons/delete.ico +++ b/protocols/Gadu-Gadu/res/delete.ico diff --git a/protocols/Gadu-Gadu/icons/export_list_to_server.ico b/protocols/Gadu-Gadu/res/export_list_to_server.ico Binary files differindex 8c0f660788..8c0f660788 100644 --- a/protocols/Gadu-Gadu/icons/export_list_to_server.ico +++ b/protocols/Gadu-Gadu/res/export_list_to_server.ico diff --git a/protocols/Gadu-Gadu/icons/export_list_to_txt_file.ico b/protocols/Gadu-Gadu/res/export_list_to_txt_file.ico Binary files differindex fc239f9a02..fc239f9a02 100644 --- a/protocols/Gadu-Gadu/icons/export_list_to_txt_file.ico +++ b/protocols/Gadu-Gadu/res/export_list_to_txt_file.ico diff --git a/protocols/Gadu-Gadu/icons/gg.ico b/protocols/Gadu-Gadu/res/gg.ico Binary files differindex a49986a12d..a49986a12d 100644 --- a/protocols/Gadu-Gadu/icons/gg.ico +++ b/protocols/Gadu-Gadu/res/gg.ico diff --git a/protocols/Gadu-Gadu/icons/image.ico b/protocols/Gadu-Gadu/res/image.ico Binary files differindex 785cd8ba9e..785cd8ba9e 100644 --- a/protocols/Gadu-Gadu/icons/image.ico +++ b/protocols/Gadu-Gadu/res/image.ico diff --git a/protocols/Gadu-Gadu/icons/import_list_from_server.ico b/protocols/Gadu-Gadu/res/import_list_from_server.ico Binary files differindex 21ecf6159d..21ecf6159d 100644 --- a/protocols/Gadu-Gadu/icons/import_list_from_server.ico +++ b/protocols/Gadu-Gadu/res/import_list_from_server.ico diff --git a/protocols/Gadu-Gadu/icons/import_list_from_txt_file.ico b/protocols/Gadu-Gadu/res/import_list_from_txt_file.ico Binary files differindex 2acc738fc7..2acc738fc7 100644 --- a/protocols/Gadu-Gadu/icons/import_list_from_txt_file.ico +++ b/protocols/Gadu-Gadu/res/import_list_from_txt_file.ico diff --git a/protocols/Gadu-Gadu/icons/list.ico b/protocols/Gadu-Gadu/res/list.ico Binary files differindex 86139d5e23..86139d5e23 100644 --- a/protocols/Gadu-Gadu/icons/list.ico +++ b/protocols/Gadu-Gadu/res/list.ico diff --git a/protocols/Gadu-Gadu/icons/next.ico b/protocols/Gadu-Gadu/res/next.ico Binary files differindex 8ddc389b85..8ddc389b85 100644 --- a/protocols/Gadu-Gadu/icons/next.ico +++ b/protocols/Gadu-Gadu/res/next.ico diff --git a/protocols/Gadu-Gadu/icons/previous.ico b/protocols/Gadu-Gadu/res/previous.ico Binary files differindex 8e6dc1ef08..8e6dc1ef08 100644 --- a/protocols/Gadu-Gadu/icons/previous.ico +++ b/protocols/Gadu-Gadu/res/previous.ico diff --git a/protocols/Gadu-Gadu/icons/remove_list_from_server.ico b/protocols/Gadu-Gadu/res/remove_list_from_server.ico Binary files differindex 44fe7a833a..44fe7a833a 100644 --- a/protocols/Gadu-Gadu/icons/remove_list_from_server.ico +++ b/protocols/Gadu-Gadu/res/remove_list_from_server.ico diff --git a/protocols/Gadu-Gadu/resource.rc b/protocols/Gadu-Gadu/res/resource.rc index 22633e1804..b336bf71fb 100644 --- a/protocols/Gadu-Gadu/resource.rc +++ b/protocols/Gadu-Gadu/res/resource.rc @@ -19,26 +19,25 @@ ////////////////////////////////////////////////////////////////////////////////
#include <windows.h>
-#include "resource.h"
-#include "version.rc"
-
-IDI_GG ICON DISCARDABLE "icons/gg.ico"
-IDI_IMPORT_SERVER ICON DISCARDABLE "icons/import_list_from_server.ico"
-IDI_IMPORT_TEXT ICON DISCARDABLE "icons/import_list_from_txt_file.ico"
-IDI_REMOVE_SERVER ICON DISCARDABLE "icons/remove_list_from_server.ico"
-IDI_EXPORT_SERVER ICON DISCARDABLE "icons/export_list_to_server.ico"
-IDI_EXPORT_TEXT ICON DISCARDABLE "icons/export_list_to_txt_file.ico"
-IDI_SETTINGS ICON DISCARDABLE "icons/settings.ico"
-IDI_LIST ICON DISCARDABLE "icons/list.ico"
-IDI_BLOCK ICON DISCARDABLE "icons/block.ico"
-IDI_PREV ICON DISCARDABLE "icons/previous.ico"
-IDI_NEXT ICON DISCARDABLE "icons/next.ico"
-IDI_IMAGE ICON DISCARDABLE "icons/image.ico"
-IDI_SAVE ICON DISCARDABLE "icons/save.ico"
-IDI_DELETE ICON DISCARDABLE "icons/delete.ico"
-IDI_CONFERENCE ICON DISCARDABLE "icons/conference.ico"
-IDI_CLEAR_CONFERENCE ICON DISCARDABLE "icons/clear_ignored_conference.ico"
-IDI_SESSIONS ICON DISCARDABLE "icons/sessions.ico"
+#include "..\src\resource.h"
+
+IDI_GG ICON "gg.ico"
+IDI_IMPORT_SERVER ICON "import_list_from_server.ico"
+IDI_IMPORT_TEXT ICON "import_list_from_txt_file.ico"
+IDI_REMOVE_SERVER ICON "remove_list_from_server.ico"
+IDI_EXPORT_SERVER ICON "export_list_to_server.ico"
+IDI_EXPORT_TEXT ICON "export_list_to_txt_file.ico"
+IDI_SETTINGS ICON "settings.ico"
+IDI_LIST ICON "list.ico"
+IDI_BLOCK ICON "block.ico"
+IDI_PREV ICON "previous.ico"
+IDI_NEXT ICON "next.ico"
+IDI_IMAGE ICON "image.ico"
+IDI_SAVE ICON "save.ico"
+IDI_DELETE ICON "delete.ico"
+IDI_CONFERENCE ICON "conference.ico"
+IDI_CLEAR_CONFERENCE ICON "clear_ignored_conference.ico"
+IDI_SESSIONS ICON "sessions.ico"
IDD_OPT_GG_GENERAL DIALOGEX 0,0,304,207
STYLE DS_FIXEDSYS|WS_CHILD
diff --git a/protocols/Gadu-Gadu/icons/save.ico b/protocols/Gadu-Gadu/res/save.ico Binary files differindex a8251f70e4..a8251f70e4 100644 --- a/protocols/Gadu-Gadu/icons/save.ico +++ b/protocols/Gadu-Gadu/res/save.ico diff --git a/protocols/Gadu-Gadu/icons/sessions.ico b/protocols/Gadu-Gadu/res/sessions.ico Binary files differindex 9f9383e22f..9f9383e22f 100644 --- a/protocols/Gadu-Gadu/icons/sessions.ico +++ b/protocols/Gadu-Gadu/res/sessions.ico diff --git a/protocols/Gadu-Gadu/icons/settings.ico b/protocols/Gadu-Gadu/res/settings.ico Binary files differindex 6706ec2f6c..6706ec2f6c 100644 --- a/protocols/Gadu-Gadu/icons/settings.ico +++ b/protocols/Gadu-Gadu/res/settings.ico diff --git a/protocols/Gadu-Gadu/version.rc b/protocols/Gadu-Gadu/res/version.rc index f594ffa6b4..9c1f0fcb02 100644 --- a/protocols/Gadu-Gadu/version.rc +++ b/protocols/Gadu-Gadu/res/version.rc @@ -23,7 +23,7 @@ #endif //APSTUDIO_INVOKED
#include <windows.h>
-#include "version.h"
+#include "..\src\version.h"
VS_VERSION_INFO VERSIONINFO
FILEVERSION __FILEVERSION_STRING
diff --git a/protocols/Gadu-Gadu/avatar.cpp b/protocols/Gadu-Gadu/src/avatar.cpp index ace7871b6a..ace7871b6a 100644 --- a/protocols/Gadu-Gadu/avatar.cpp +++ b/protocols/Gadu-Gadu/src/avatar.cpp diff --git a/protocols/Gadu-Gadu/core.cpp b/protocols/Gadu-Gadu/src/core.cpp index 63d5d37b24..63d5d37b24 100644 --- a/protocols/Gadu-Gadu/core.cpp +++ b/protocols/Gadu-Gadu/src/core.cpp diff --git a/protocols/Gadu-Gadu/dialogs.cpp b/protocols/Gadu-Gadu/src/dialogs.cpp index 345624715b..345624715b 100644 --- a/protocols/Gadu-Gadu/dialogs.cpp +++ b/protocols/Gadu-Gadu/src/dialogs.cpp diff --git a/protocols/Gadu-Gadu/dynstuff.cpp b/protocols/Gadu-Gadu/src/dynstuff.cpp index 9ae41daf59..9ae41daf59 100644 --- a/protocols/Gadu-Gadu/dynstuff.cpp +++ b/protocols/Gadu-Gadu/src/dynstuff.cpp diff --git a/protocols/Gadu-Gadu/dynstuff.h b/protocols/Gadu-Gadu/src/dynstuff.h index 8e36c67ede..8e36c67ede 100644 --- a/protocols/Gadu-Gadu/dynstuff.h +++ b/protocols/Gadu-Gadu/src/dynstuff.h diff --git a/protocols/Gadu-Gadu/filetransfer.cpp b/protocols/Gadu-Gadu/src/filetransfer.cpp index e7560e16a2..e7560e16a2 100644 --- a/protocols/Gadu-Gadu/filetransfer.cpp +++ b/protocols/Gadu-Gadu/src/filetransfer.cpp diff --git a/protocols/Gadu-Gadu/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp index 5bd9f6ceb5..5bd9f6ceb5 100644 --- a/protocols/Gadu-Gadu/gg.cpp +++ b/protocols/Gadu-Gadu/src/gg.cpp diff --git a/protocols/Gadu-Gadu/gg.h b/protocols/Gadu-Gadu/src/gg.h index 742f06b093..742f06b093 100644 --- a/protocols/Gadu-Gadu/gg.h +++ b/protocols/Gadu-Gadu/src/gg.h diff --git a/protocols/Gadu-Gadu/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp index 0a0db3a173..0a0db3a173 100644 --- a/protocols/Gadu-Gadu/gg_proto.cpp +++ b/protocols/Gadu-Gadu/src/gg_proto.cpp diff --git a/protocols/Gadu-Gadu/gg_proto.h b/protocols/Gadu-Gadu/src/gg_proto.h index 8765392328..8765392328 100644 --- a/protocols/Gadu-Gadu/gg_proto.h +++ b/protocols/Gadu-Gadu/src/gg_proto.h diff --git a/protocols/Gadu-Gadu/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp index 4089c8fac3..4089c8fac3 100644 --- a/protocols/Gadu-Gadu/groupchat.cpp +++ b/protocols/Gadu-Gadu/src/groupchat.cpp diff --git a/protocols/Gadu-Gadu/icolib.cpp b/protocols/Gadu-Gadu/src/icolib.cpp index f99540ac76..f99540ac76 100644 --- a/protocols/Gadu-Gadu/icolib.cpp +++ b/protocols/Gadu-Gadu/src/icolib.cpp diff --git a/protocols/Gadu-Gadu/image.cpp b/protocols/Gadu-Gadu/src/image.cpp index 0ad225ad06..0ad225ad06 100644 --- a/protocols/Gadu-Gadu/image.cpp +++ b/protocols/Gadu-Gadu/src/image.cpp diff --git a/protocols/Gadu-Gadu/import.cpp b/protocols/Gadu-Gadu/src/import.cpp index e4ff066d11..e4ff066d11 100644 --- a/protocols/Gadu-Gadu/import.cpp +++ b/protocols/Gadu-Gadu/src/import.cpp diff --git a/protocols/Gadu-Gadu/keepalive.cpp b/protocols/Gadu-Gadu/src/keepalive.cpp index 02b661c222..02b661c222 100644 --- a/protocols/Gadu-Gadu/keepalive.cpp +++ b/protocols/Gadu-Gadu/src/keepalive.cpp diff --git a/protocols/Gadu-Gadu/libgadu/COPYING b/protocols/Gadu-Gadu/src/libgadu/COPYING index 6e816402b7..6e816402b7 100644 --- a/protocols/Gadu-Gadu/libgadu/COPYING +++ b/protocols/Gadu-Gadu/src/libgadu/COPYING diff --git a/protocols/Gadu-Gadu/libgadu/common.c b/protocols/Gadu-Gadu/src/libgadu/common.c index b9b41c0547..b9b41c0547 100644 --- a/protocols/Gadu-Gadu/libgadu/common.c +++ b/protocols/Gadu-Gadu/src/libgadu/common.c diff --git a/protocols/Gadu-Gadu/libgadu/compat.h b/protocols/Gadu-Gadu/src/libgadu/compat.h index 1aa17d1e4a..1aa17d1e4a 100644 --- a/protocols/Gadu-Gadu/libgadu/compat.h +++ b/protocols/Gadu-Gadu/src/libgadu/compat.h diff --git a/protocols/Gadu-Gadu/libgadu/dcc.c b/protocols/Gadu-Gadu/src/libgadu/dcc.c index 2fbe1b430c..2fbe1b430c 100644 --- a/protocols/Gadu-Gadu/libgadu/dcc.c +++ b/protocols/Gadu-Gadu/src/libgadu/dcc.c diff --git a/protocols/Gadu-Gadu/libgadu/dcc7.c b/protocols/Gadu-Gadu/src/libgadu/dcc7.c index f3813e6e83..f3813e6e83 100644 --- a/protocols/Gadu-Gadu/libgadu/dcc7.c +++ b/protocols/Gadu-Gadu/src/libgadu/dcc7.c diff --git a/protocols/Gadu-Gadu/libgadu/events.c b/protocols/Gadu-Gadu/src/libgadu/events.c index a730e9d620..a730e9d620 100644 --- a/protocols/Gadu-Gadu/libgadu/events.c +++ b/protocols/Gadu-Gadu/src/libgadu/events.c diff --git a/protocols/Gadu-Gadu/libgadu/http.c b/protocols/Gadu-Gadu/src/libgadu/http.c index c070b3ee53..c070b3ee53 100644 --- a/protocols/Gadu-Gadu/libgadu/http.c +++ b/protocols/Gadu-Gadu/src/libgadu/http.c diff --git a/protocols/Gadu-Gadu/libgadu/internal.h b/protocols/Gadu-Gadu/src/libgadu/internal.h index 0ffd39fdd5..0ffd39fdd5 100644 --- a/protocols/Gadu-Gadu/libgadu/internal.h +++ b/protocols/Gadu-Gadu/src/libgadu/internal.h diff --git a/protocols/Gadu-Gadu/libgadu/libgadu.c b/protocols/Gadu-Gadu/src/libgadu/libgadu.c index f06f8a5b84..f06f8a5b84 100644 --- a/protocols/Gadu-Gadu/libgadu/libgadu.c +++ b/protocols/Gadu-Gadu/src/libgadu/libgadu.c diff --git a/protocols/Gadu-Gadu/libgadu/libgadu.h b/protocols/Gadu-Gadu/src/libgadu/libgadu.h index d273d998e1..d273d998e1 100644 --- a/protocols/Gadu-Gadu/libgadu/libgadu.h +++ b/protocols/Gadu-Gadu/src/libgadu/libgadu.h diff --git a/protocols/Gadu-Gadu/libgadu/obsolete.c b/protocols/Gadu-Gadu/src/libgadu/obsolete.c index f8fe4dc5de..f8fe4dc5de 100644 --- a/protocols/Gadu-Gadu/libgadu/obsolete.c +++ b/protocols/Gadu-Gadu/src/libgadu/obsolete.c diff --git a/protocols/Gadu-Gadu/libgadu/protocol.h b/protocols/Gadu-Gadu/src/libgadu/protocol.h index 5b4895c260..5b4895c260 100644 --- a/protocols/Gadu-Gadu/libgadu/protocol.h +++ b/protocols/Gadu-Gadu/src/libgadu/protocol.h diff --git a/protocols/Gadu-Gadu/libgadu/pthread.c b/protocols/Gadu-Gadu/src/libgadu/pthread.c index 9a8988a358..9a8988a358 100644 --- a/protocols/Gadu-Gadu/libgadu/pthread.c +++ b/protocols/Gadu-Gadu/src/libgadu/pthread.c diff --git a/protocols/Gadu-Gadu/libgadu/pthread.h b/protocols/Gadu-Gadu/src/libgadu/pthread.h index 4de1053e0e..4de1053e0e 100644 --- a/protocols/Gadu-Gadu/libgadu/pthread.h +++ b/protocols/Gadu-Gadu/src/libgadu/pthread.h diff --git a/protocols/Gadu-Gadu/libgadu/pubdir.c b/protocols/Gadu-Gadu/src/libgadu/pubdir.c index f9d656dfe3..f9d656dfe3 100644 --- a/protocols/Gadu-Gadu/libgadu/pubdir.c +++ b/protocols/Gadu-Gadu/src/libgadu/pubdir.c diff --git a/protocols/Gadu-Gadu/libgadu/pubdir50.c b/protocols/Gadu-Gadu/src/libgadu/pubdir50.c index 6914cbd01a..6914cbd01a 100644 --- a/protocols/Gadu-Gadu/libgadu/pubdir50.c +++ b/protocols/Gadu-Gadu/src/libgadu/pubdir50.c diff --git a/protocols/Gadu-Gadu/libgadu/resolver.c b/protocols/Gadu-Gadu/src/libgadu/resolver.c index 1adef3ef9d..1adef3ef9d 100644 --- a/protocols/Gadu-Gadu/libgadu/resolver.c +++ b/protocols/Gadu-Gadu/src/libgadu/resolver.c diff --git a/protocols/Gadu-Gadu/libgadu/resolver.h b/protocols/Gadu-Gadu/src/libgadu/resolver.h index 145c5178a4..145c5178a4 100644 --- a/protocols/Gadu-Gadu/libgadu/resolver.h +++ b/protocols/Gadu-Gadu/src/libgadu/resolver.h diff --git a/protocols/Gadu-Gadu/libgadu/sha1.c b/protocols/Gadu-Gadu/src/libgadu/sha1.c index 124a1cffaa..124a1cffaa 100644 --- a/protocols/Gadu-Gadu/libgadu/sha1.c +++ b/protocols/Gadu-Gadu/src/libgadu/sha1.c diff --git a/protocols/Gadu-Gadu/libgadu/win32.c b/protocols/Gadu-Gadu/src/libgadu/win32.c index 4f5ad3ff5d..4f5ad3ff5d 100644 --- a/protocols/Gadu-Gadu/libgadu/win32.c +++ b/protocols/Gadu-Gadu/src/libgadu/win32.c diff --git a/protocols/Gadu-Gadu/libgadu/win32.h b/protocols/Gadu-Gadu/src/libgadu/win32.h index d432a359ac..d432a359ac 100644 --- a/protocols/Gadu-Gadu/libgadu/win32.h +++ b/protocols/Gadu-Gadu/src/libgadu/win32.h diff --git a/protocols/Gadu-Gadu/links.cpp b/protocols/Gadu-Gadu/src/links.cpp index 53770f0bcd..53770f0bcd 100644 --- a/protocols/Gadu-Gadu/links.cpp +++ b/protocols/Gadu-Gadu/src/links.cpp diff --git a/protocols/Gadu-Gadu/oauth.cpp b/protocols/Gadu-Gadu/src/oauth.cpp index 43983edb6d..43983edb6d 100644 --- a/protocols/Gadu-Gadu/oauth.cpp +++ b/protocols/Gadu-Gadu/src/oauth.cpp diff --git a/protocols/Gadu-Gadu/ownerinfo.cpp b/protocols/Gadu-Gadu/src/ownerinfo.cpp index 6c37cdb180..6c37cdb180 100644 --- a/protocols/Gadu-Gadu/ownerinfo.cpp +++ b/protocols/Gadu-Gadu/src/ownerinfo.cpp diff --git a/protocols/Gadu-Gadu/popups.cpp b/protocols/Gadu-Gadu/src/popups.cpp index 69ac1c350d..69ac1c350d 100644 --- a/protocols/Gadu-Gadu/popups.cpp +++ b/protocols/Gadu-Gadu/src/popups.cpp diff --git a/protocols/Gadu-Gadu/resource.h b/protocols/Gadu-Gadu/src/resource.h index 86ec31eadb..86ec31eadb 100644 --- a/protocols/Gadu-Gadu/resource.h +++ b/protocols/Gadu-Gadu/src/resource.h diff --git a/protocols/Gadu-Gadu/services.cpp b/protocols/Gadu-Gadu/src/services.cpp index a172d10609..a172d10609 100644 --- a/protocols/Gadu-Gadu/services.cpp +++ b/protocols/Gadu-Gadu/src/services.cpp diff --git a/protocols/Gadu-Gadu/sessions.cpp b/protocols/Gadu-Gadu/src/sessions.cpp index 6f047cd783..6f047cd783 100644 --- a/protocols/Gadu-Gadu/sessions.cpp +++ b/protocols/Gadu-Gadu/src/sessions.cpp diff --git a/protocols/Gadu-Gadu/token.cpp b/protocols/Gadu-Gadu/src/token.cpp index d2946c12ef..d2946c12ef 100644 --- a/protocols/Gadu-Gadu/token.cpp +++ b/protocols/Gadu-Gadu/src/token.cpp diff --git a/protocols/Gadu-Gadu/userutils.cpp b/protocols/Gadu-Gadu/src/userutils.cpp index c9681c56ef..c9681c56ef 100644 --- a/protocols/Gadu-Gadu/userutils.cpp +++ b/protocols/Gadu-Gadu/src/userutils.cpp diff --git a/protocols/Gadu-Gadu/version.h b/protocols/Gadu-Gadu/src/version.h index ce9e719bd6..ce9e719bd6 100644 --- a/protocols/Gadu-Gadu/version.h +++ b/protocols/Gadu-Gadu/src/version.h |