diff options
| -rw-r--r-- | new_gpg.vcxproj | 4 | ||||
| -rw-r--r-- | utilities.cpp | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/new_gpg.vcxproj b/new_gpg.vcxproj index 21ee00c..6ca3ea2 100644 --- a/new_gpg.vcxproj +++ b/new_gpg.vcxproj @@ -477,7 +477,7 @@ </Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>x:\temp\windows\libs\utf8cpp\include;C:\Boost\include\boost-1_46;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>x:\temp\windows\libs\utf8cpp\include;X:\temp\windows\libs\Boost\include\boost-1_46;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -501,7 +501,7 @@ <Link>
<AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies) libboost_thread-vc100-mt-sgd-1_46_1.lib</AdditionalDependencies>
<SuppressStartupBanner>true</SuppressStartupBanner>
- <AdditionalLibraryDirectories>C:\Boost\lib-debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>X:\temp\windows\libs\Boost\lib-debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
<GenerateMapFile>false</GenerateMapFile>
diff --git a/utilities.cpp b/utilities.cpp index 115c2bf..2248cf0 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -272,9 +272,12 @@ int OnPreBuildContactMenu(WPARAM w, LPARAM l) list<wstring> transfers; +extern bool bFileTransfers; int onProtoAck(WPARAM w, LPARAM l) { + if(!bFileTransfers) + return 0; ACKDATA *ack=(ACKDATA*)l; CCSDATA *ccs=(CCSDATA*)ack->lParam; if (ack->type!=ACKTYPE_FILE) @@ -351,10 +354,11 @@ int onProtoAck(WPARAM w, LPARAM l) return 0; } - //from secureim partially int onSendFile(WPARAM w, LPARAM l) { + if(!bFileTransfers) + return 0; CCSDATA *ccs=(CCSDATA*)l; if(isContactSecured(ccs->hContact)) { @@ -430,8 +434,8 @@ int onSendFile(WPARAM w, LPARAM l) } } } - mir_free(file[i]); - file[i]=mir_wstrdup(path_out.c_str()); +// mir_free(file[i]); + file[i]=mir_tstrdup(path_out.c_str()); delete [] file_out; transfers.push_back(path_out); } |