author | Michael Krelin <hacker@klever.net> | 2004-09-12 11:46:21 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2004-09-12 11:46:21 (UTC) |
commit | 4435ed85c3acb4df42135e009b133fb8e9d2f09c (patch) (unidiff) | |
tree | c1f4b4da029153459465d3679acdf48c594943ae | |
parent | 9bd9ea789778ff25ba61a22bca0eacc14ae47cb7 (diff) | |
download | pumpkin-4435ed85c3acb4df42135e009b133fb8e9d2f09c.zip pumpkin-4435ed85c3acb4df42135e009b133fb8e9d2f09c.tar.gz pumpkin-4435ed85c3acb4df42135e009b133fb8e9d2f09c.tar.bz2 |
quick fix to the backslash conversion problem.
git-svn-id: http://svn.klever.net/kin/pumpkin/trunk@46 fe716a7a-6dde-0310-88d9-d003556173a8
-rw-r--r-- | PumpKINDlg.cpp | 8 | ||||
-rw-r--r-- | install/install.cpp | 2 | ||||
-rw-r--r-- | install/install.rc | 8 | ||||
-rw-r--r-- | pumpkin.rc | 10 |
4 files changed, 16 insertions, 12 deletions
diff --git a/PumpKINDlg.cpp b/PumpKINDlg.cpp index 1e6d03f..0b3bf41 100644 --- a/PumpKINDlg.cpp +++ b/PumpKINDlg.cpp | |||
@@ -1220,5 +1220,9 @@ BOOL CWRQSocket::Create(LPCTSTR localFile,LPCTSTR hostName) | |||
1220 | m_Daddy->m_Xfers[m_hSocket]=this; | 1220 | m_Daddy->m_Xfers[m_hSocket]=this; |
1221 | TurnSlashes(m_FileName,TRUE); | ||
1222 | UpdateList(); | 1221 | UpdateList(); |
1223 | CString fn = localFile?ApplyRootGently(localFile):ApplyRoot(m_FileName); | 1222 | CString lf; |
1223 | if(!localFile) { | ||
1224 | lf = m_FileName; | ||
1225 | TurnSlashes(lf,TRUE); | ||
1226 | } | ||
1227 | CString fn = localFile?ApplyRootGently(localFile):ApplyRoot(lf); | ||
1224 | if(!localFile){// This is an incoming request.. | 1228 | if(!localFile){// This is an incoming request.. |
diff --git a/install/install.cpp b/install/install.cpp index 62f1e20..6fa4ae4 100644 --- a/install/install.cpp +++ b/install/install.cpp | |||
@@ -3,3 +3,3 @@ | |||
3 | 3 | ||
4 | #defineKINAME "PumpKIN 2.5" | 4 | #defineKINAME "PumpKIN 2.5.1-trunk" |
5 | #define SKINAME "PumpKIN" | 5 | #define SKINAME "PumpKIN" |
diff --git a/install/install.rc b/install/install.rc index b1a3037..30907ad 100644 --- a/install/install.rc +++ b/install/install.rc | |||
@@ -133,4 +133,4 @@ IDI_ICON ICON DISCARDABLE "../shared-data/install-icon.ico | |||
133 | VS_VERSION_INFO VERSIONINFO | 133 | VS_VERSION_INFO VERSIONINFO |
134 | FILEVERSION 2,5,0,0 | 134 | FILEVERSION 2,5,1,0 |
135 | PRODUCTVERSION 2,5,0,0 | 135 | PRODUCTVERSION 2,5,1,0 |
136 | FILEFLAGSMASK 0x3fL | 136 | FILEFLAGSMASK 0x3fL |
@@ -151,3 +151,3 @@ BEGIN | |||
151 | VALUE "FileDescription", "INSTALL: PumpKIN, tftp client/daemon\0" | 151 | VALUE "FileDescription", "INSTALL: PumpKIN, tftp client/daemon\0" |
152 | VALUE "FileVersion", "2, 5, 0, 0\0" | 152 | VALUE "FileVersion", "2, 5, 1, 0\0" |
153 | VALUE "InternalName", "INSTALL\0" | 153 | VALUE "InternalName", "INSTALL\0" |
@@ -157,3 +157,3 @@ BEGIN | |||
157 | VALUE "ProductName", "PumpKIN\0" | 157 | VALUE "ProductName", "PumpKIN\0" |
158 | VALUE "ProductVersion", "2, 5, 0, 0\0" | 158 | VALUE "ProductVersion", "2, 5, 1, 0\0" |
159 | END | 159 | END |
@@ -84,3 +84,3 @@ BEGIN | |||
84 | ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20 | 84 | ICON IDR_MAINFRAME,IDC_STATIC,7,17,18,20 |
85 | LTEXT "PumpKIN, Version 2.5",IDC_STATIC,40,15,119,8,SS_NOPREFIX | 85 | LTEXT "PumpKIN, Version 2.5.1-trunk",IDC_STATIC,40,15,119,8,SS_NOPREFIX |
86 | LTEXT "Copyright © 1997-2004 Klever Group",IDC_STATIC,40,30,170, | 86 | LTEXT "Copyright © 1997-2004 Klever Group",IDC_STATIC,40,30,170, |
@@ -288,4 +288,4 @@ END | |||
288 | VS_VERSION_INFO VERSIONINFO | 288 | VS_VERSION_INFO VERSIONINFO |
289 | FILEVERSION 2,5,0,0 | 289 | FILEVERSION 2,5,1,0 |
290 | PRODUCTVERSION 2,5,0,0 | 290 | PRODUCTVERSION 2,5,1,0 |
291 | FILEFLAGSMASK 0x3fL | 291 | FILEFLAGSMASK 0x3fL |
@@ -306,3 +306,3 @@ BEGIN | |||
306 | VALUE "FileDescription", "PumpKIN, tftp client/daemon\0" | 306 | VALUE "FileDescription", "PumpKIN, tftp client/daemon\0" |
307 | VALUE "FileVersion", "2, 5, 0, 0\0" | 307 | VALUE "FileVersion", "2, 5, 1, 0\0" |
308 | VALUE "InternalName", "PUMPKIN\0" | 308 | VALUE "InternalName", "PUMPKIN\0" |
@@ -312,3 +312,3 @@ BEGIN | |||
312 | VALUE "ProductName", "PumpKIN\0" | 312 | VALUE "ProductName", "PumpKIN\0" |
313 | VALUE "ProductVersion", "2, 5, 0, 0\0" | 313 | VALUE "ProductVersion", "2, 5, 1, 0\0" |
314 | END | 314 | END |