diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-05-18 21:36:53 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-05-18 21:36:53 +0000 |
| commit | e328df9bdc816810545b91dccd52e7741e962dc0 (patch) | |
| tree | 3f118077918773ba4b6d835c72ce7068c12ce496 /plugins | |
| parent | 5e4ecb158a9835d79536326835287d49f22d65f1 (diff) | |
bunch of fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@57 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/CountryFlags/flags.h | 1 | ||||
| -rw-r--r-- | plugins/CountryFlags/flags.vcxproj | 5 | ||||
| -rw-r--r-- | plugins/FavContacts/favcontacts.vcxproj | 2 | ||||
| -rw-r--r-- | plugins/FavContacts/src/http_api.cpp | 2 | ||||
| -rw-r--r-- | plugins/SecureIM/svcs_proto.cpp | 10 |
5 files changed, 11 insertions, 9 deletions
diff --git a/plugins/CountryFlags/flags.h b/plugins/CountryFlags/flags.h index 98a28b88f4..79ec67d426 100644 --- a/plugins/CountryFlags/flags.h +++ b/plugins/CountryFlags/flags.h @@ -17,6 +17,7 @@ along with this program (Flags-License.txt); if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#define _CRT_SECURE_NO_WARNINGS
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#define NONAMELESSUNION
diff --git a/plugins/CountryFlags/flags.vcxproj b/plugins/CountryFlags/flags.vcxproj index 4177b01a2e..e3dfa10e7f 100644 --- a/plugins/CountryFlags/flags.vcxproj +++ b/plugins/CountryFlags/flags.vcxproj @@ -91,7 +91,8 @@ <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<BaseAddress>0x24200000</BaseAddress>
<AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalOptions> /mapinfo:lines /mapinfo:lines </AdditionalOptions>
+ <AdditionalOptions>
+ </AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -104,7 +105,7 @@ <SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level4</WarningLevel>
<AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;UNICODE;WIN32;_WINDOWS;_USRDLL;STRICT;ASSOCMGR_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;UNICODE;WIN32;_WINDOWS;_USRDLL;STRICT;ASSOCMGR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<UndefinePreprocessorDefinitions>_MBCS;NO_STRICT;%(UndefinePreprocessorDefinitions)</UndefinePreprocessorDefinitions>
<BrowseInformation>true</BrowseInformation>
<PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
diff --git a/plugins/FavContacts/favcontacts.vcxproj b/plugins/FavContacts/favcontacts.vcxproj index a12544ec93..326056cef0 100644 --- a/plugins/FavContacts/favcontacts.vcxproj +++ b/plugins/FavContacts/favcontacts.vcxproj @@ -52,7 +52,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;FAVCONTACTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
diff --git a/plugins/FavContacts/src/http_api.cpp b/plugins/FavContacts/src/http_api.cpp index 147cabdd7d..ac9171f9c5 100644 --- a/plugins/FavContacts/src/http_api.cpp +++ b/plugins/FavContacts/src/http_api.cpp @@ -86,7 +86,7 @@ public: Send("', ");
Send(status);
Send(", '");
- SendQuoted(avatar ? avatar->szFilename : "");
+ SendQuoted(avatar ? avatar->szFilename : _T(""));
Send("');\r\n");
}
Send("} catch(e) {}\r\n");
diff --git a/plugins/SecureIM/svcs_proto.cpp b/plugins/SecureIM/svcs_proto.cpp index b1f6910686..e6e538c60a 100644 --- a/plugins/SecureIM/svcs_proto.cpp +++ b/plugins/SecureIM/svcs_proto.cpp @@ -1040,20 +1040,20 @@ int __cdecl onProtoAck(WPARAM wParam,LPARAM lParam) { PROTOFILETRANSFERSTATUS *f = (PROTOFILETRANSFERSTATUS*) ack->lParam;
pUinKey ptr = getUinKey(ack->hContact);
- if (!ptr || (f && f->sending && !bSFT)) return 0;
+ if (!ptr || (f && (f->flags & PFTS_SENDING) && !bSFT)) return 0;
if( isContactSecured(ack->hContact)&SECURED ) {
switch(ack->result) {
// case ACKRESULT_FILERESUME:
case ACKRESULT_DATA: {
- if( !f->sending ) {
+ if( !( f->flags & PFTS_SENDING )) {
ptr->finFileRecv = (f->currentFileSize == f->currentFileProgress);
- if( !ptr->lastFileRecv ) ptr->lastFileRecv = mir_strdup(f->currentFile);
+ if( !ptr->lastFileRecv ) ptr->lastFileRecv = mir_strdup(f->szCurrentFile);
}
else
- if( f->sending ) {
+ if( f->flags & PFTS_SENDING ) {
ptr->finFileSend = (f->currentFileSize == f->currentFileProgress);
- if( !ptr->lastFileSend ) ptr->lastFileSend = mir_strdup(f->currentFile);
+ if( !ptr->lastFileSend ) ptr->lastFileSend = mir_strdup(f->szCurrentFile);
}
} break;
// case ACKRESULT_INITIALISING:
|