summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2013-04-07 09:43:40 +0000
committerKirill Volinsky <mataes2007@gmail.com>2013-04-07 09:43:40 +0000
commitd4f596ff40ca7ef70801e396def3a5b693f182cc (patch)
tree7fd5cd2d63012a4bd21cb1927682bbf197127327
parent0259852c00d9d8b4b2a3c2491f17602575857ac3 (diff)
compilation fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@4360 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--protocols/Skype/Skype_11.vcxproj1
-rw-r--r--protocols/Skype/Skype_11.vcxproj.filters3
-rw-r--r--protocols/Skype/src/skype_menus.cpp6
3 files changed, 7 insertions, 3 deletions
diff --git a/protocols/Skype/Skype_11.vcxproj b/protocols/Skype/Skype_11.vcxproj
index 9ee8ebf0dd..2e5b50fb89 100644
--- a/protocols/Skype/Skype_11.vcxproj
+++ b/protocols/Skype/Skype_11.vcxproj
@@ -211,6 +211,7 @@
<ClCompile Include="src\skype_services.cpp" />
<ClCompile Include="src\skype_settings.cpp" />
<ClCompile Include="src\skype_subclassing.cpp" />
+ <ClCompile Include="src\skype_transfer.cpp" />
<ClCompile Include="src\skype_utils.cpp" />
</ItemGroup>
<ItemGroup>
diff --git a/protocols/Skype/Skype_11.vcxproj.filters b/protocols/Skype/Skype_11.vcxproj.filters
index f3c307bd41..520432a767 100644
--- a/protocols/Skype/Skype_11.vcxproj.filters
+++ b/protocols/Skype/Skype_11.vcxproj.filters
@@ -72,6 +72,9 @@
<ClCompile Include="src\base64\base64.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="src\skype_transfer.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\resource.h">
diff --git a/protocols/Skype/src/skype_menus.cpp b/protocols/Skype/src/skype_menus.cpp
index 5ab78ef5e2..c9d6468427 100644
--- a/protocols/Skype/src/skype_menus.cpp
+++ b/protocols/Skype/src/skype_menus.cpp
@@ -148,7 +148,7 @@ void CSkypeProto::InitMenus()
// "Request authorization"
mi.ptszName = LPGENT("Request authorization");
- mi.flags = CMIF_ICONFROMICOLIB | CMIF_TCHAR;
+ mi.flags = CMIF_TCHAR;
mi.position = -2000001000;
mi.icolibItem = CSkypeProto::GetIconHandle("authRequest");
mi.pszService = "Skype/ReqAuth";
@@ -191,7 +191,7 @@ void CSkypeProto::OnInitStatusMenu()
mi.ptszName = m_tszUserName;
mi.position = -1999901006;
mi.hParentMenu = HGENMENU_ROOT;
- mi.flags = CMIF_ICONFROMICOLIB | CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
+ mi.flags = CMIF_ROOTPOPUP | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
mi.icolibItem = CSkypeProto::GetIconHandle("Skype_main");
hJabberRoot = m_hMenuRoot = ::Menu_AddProtoMenuItem(&mi);
}
@@ -202,7 +202,7 @@ void CSkypeProto::OnInitStatusMenu()
}
mi.hParentMenu = hJabberRoot;
- mi.flags = CMIF_ICONFROMICOLIB | CMIF_CHILDPOPUP | CMIF_TCHAR;
+ mi.flags = CMIF_CHILDPOPUP | CMIF_TCHAR;
// Invite Command
strcpy(tDest, "/InviteCommand");