diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2010-11-10 01:46:14 +0200 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2010-11-10 01:46:14 +0200 |
| commit | f499a663032ad79a2e5ccfe6195b36f8645ca9f0 (patch) | |
| tree | d60d6aed7002506798c390ec263ca535c8c4903d | |
| parent | bb3438a3b447fb5e11e53404265e956c9d580433 (diff) | |
| parent | f08961f1a4193c49353e8610d557c07c50f6fb67 (diff) | |
Merge branch 'new_gpg' into new_gpg_autoexchange
| -rw-r--r-- | new_gpg.sln | 2 | ||||
| -rw-r--r-- | utilities.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/new_gpg.sln b/new_gpg.sln index c991fcf..6a74e17 100644 --- a/new_gpg.sln +++ b/new_gpg.sln @@ -29,7 +29,7 @@ Global {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug(service)|Win32.ActiveCfg = Debug(service)|x64
{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug(service)|x64.ActiveCfg = Debug(service)|x64
{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug(service)|x64.Build.0 = Debug(service)|x64
- {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug|Win32.ActiveCfg = Debug|x64
+ {F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug|Win32.ActiveCfg = Debug|Win32
{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug|x64.ActiveCfg = Debug|x64
{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug|x64.Build.0 = Debug|x64
{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (service only)(static)|Win32.ActiveCfg = Release Unicode (service only)(static)|x64
diff --git a/utilities.cpp b/utilities.cpp index 619cded..4f594cb 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -280,8 +280,8 @@ int onProtoAck(WPARAM w, LPARAM l) if (ack->type!=ACKTYPE_FILE)
return 0;
PROTOFILETRANSFERSTATUS *f = (PROTOFILETRANSFERSTATUS*) ack->lParam;
- if(!f)
- f = (PROTOFILETRANSFERSTATUS*) ack->hProcess;
+// if(!f)
+// f = (PROTOFILETRANSFERSTATUS*) ack->hProcess;
if(!f)
return 0;
@@ -292,9 +292,9 @@ int onProtoAck(WPARAM w, LPARAM l) case ACKRESULT_SUCCESS:
{
TCHAR *filename = NULL;
- if(f->szCurrentFile && f->szCurrentFile[0])
- filename = mir_utf8decodeW(f->szCurrentFile);
- else if(f->tszCurrentFile && f->tszCurrentFile[0])
+// if(f->szCurrentFile && f->szCurrentFile[0])
+// filename = mir_utf8decodeW(f->szCurrentFile);
+ if(f->tszCurrentFile && f->tszCurrentFile[0])
filename = mir_wstrdup(f->tszCurrentFile);
if(!filename)
break;
|