diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-03-05 22:31:01 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-03-05 22:31:01 +0000 |
commit | 61a263fd68beb2dd4b488d4b27d11095214b122d (patch) | |
tree | 5c4dd2316c23aecd166c6f1cf39e4048470907fd /kde-base/kdenetwork/files | |
parent | Patch to fix GCC4 compilation by node <nullcore@gmail.com> closes bug #121989. (diff) | |
download | gentoo-2-61a263fd68beb2dd4b488d4b27d11095214b122d.tar.gz gentoo-2-61a263fd68beb2dd4b488d4b27d11095214b122d.tar.bz2 gentoo-2-61a263fd68beb2dd4b488d4b27d11095214b122d.zip |
Add patch from upstream to fix MSN filetransfer bug.
(Portage version: 2.1_pre5-r4)
Diffstat (limited to 'kde-base/kdenetwork/files')
-rw-r--r-- | kde-base/kdenetwork/files/digest-kdenetwork-3.5.1-r1 | 3 | ||||
-rw-r--r-- | kde-base/kdenetwork/files/kopete-3.5.x-msn-filetransfer.patch | 41 |
2 files changed, 44 insertions, 0 deletions
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.5.1-r1 b/kde-base/kdenetwork/files/digest-kdenetwork-3.5.1-r1 new file mode 100644 index 000000000000..7dd4b5329b8b --- /dev/null +++ b/kde-base/kdenetwork/files/digest-kdenetwork-3.5.1-r1 @@ -0,0 +1,3 @@ +MD5 02ced8c14c80f28635056488949d56d7 kdenetwork-3.5.1.tar.bz2 7464777 +RMD160 6f3271dd50f4bebf1784c3822cab91a6b41d6fb6 kdenetwork-3.5.1.tar.bz2 7464777 +SHA256 4067db7d60927c309cfd268609d5a638c67786da6c573bb32a5af18c3939c725 kdenetwork-3.5.1.tar.bz2 7464777 diff --git a/kde-base/kdenetwork/files/kopete-3.5.x-msn-filetransfer.patch b/kde-base/kdenetwork/files/kopete-3.5.x-msn-filetransfer.patch new file mode 100644 index 000000000000..9aee13aa697d --- /dev/null +++ b/kde-base/kdenetwork/files/kopete-3.5.x-msn-filetransfer.patch @@ -0,0 +1,41 @@ +Index: kopete/protocols/msn/incomingtransfer.cpp +=================================================================== +--- kopete/protocols/msn/incomingtransfer.cpp (revision 516055) ++++ kopete/protocols/msn/incomingtransfer.cpp (revision 516056) +@@ -256,19 +256,26 @@ + { + // NOTE The sending client can ask for a direct connections + // if one was established before. +- QFile *destionation = new QFile(m_transfer->destinationURL().path()); +- if(!destionation->open(IO_WriteOnly)) ++ if(!m_file) + { +- if(m_transfer){ +- m_transfer->slotError(KIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Cannot open file for writing")); +- m_transfer = 0l; ++ QFile *destionation = new QFile(m_transfer->destinationURL().path()); ++ if(!destionation->open(IO_WriteOnly)) ++ { ++ if(m_transfer){ ++ m_transfer->slotError(KIO::ERR_CANNOT_OPEN_FOR_WRITING, i18n("Cannot open file for writing")); ++ m_transfer = 0l; ++ } ++ ++ error(); ++ return; + } +- +- error(); +- return; ++ ++ m_file = destionation; + } +- +- m_file = destionation; ++ else ++ { ++ // TODO ++ } + } + + m_state = DataTransfer; |