Bug 116721

Summary:	Show new name of renamed incoming DCC file
Product:	[Applications] konversation	Reporter:	Maarten ter Huurne <maarten>
Component:	general	Assignee:	Konversation Bugs <konversation-bugs-null>
Status:	RESOLVED FIXED
Severity:	wishlist
Priority:	NOR
Version First Reported In:	unspecified
Target Milestone:	---
Platform:	unspecified
OS:	Linux
Latest Commit:		Version Fixed/Implemented In:
Sentry Crash Report:

Description Maarten ter Huurne 2005-11-19 21:44:21 UTC

Version:           0.18 #3016 (using KDE 3.4.2 Level "b" , SUSE 9.3 UNSUPPORTED)
Compiler:          gcc version 3.3.5 20050117 (prerelease) (SUSE Linux)
OS:                Linux (i686) release 2.6.11.4-21.9-default

Scenario:
- someone sends me a file through DCC, let's say this file is named "abc"
- I have auto-accept turned on, but since the same person sent a different file with the name "abc" before, Konversation will ask me whether I want to overwrite or rename the file
- I choose to rename the file to "xyz"
- the file is saved just fine, but in the DCC Status tab the file is still listed as "abc", while I would prefer "xyz"
- if I choose "Open File" from the context menu on the DCC Status tab, it opens "xyz", so the new name is remembered correctly, only not displayed

Comment 1 Eike Hein 2006-01-07 11:26:48 UTC

SVN commit 495144 by hein:

Show local file name in DCC GET DccPanel entry and DccStatus::Done message.
BUG:116721


 M  +1 -1      dcctransfer.cpp  
 M  +3 -3      dcctransferrecv.cpp  


--- trunk/extragear/network/konversation/src/dcctransfer.cpp #495143:495144
@@ -100,7 +100,7 @@
 
     setText( DccPanel::Column::OfferDate,     m_timeOffer.toString( "hh:mm:ss" ) );
     setText( DccPanel::Column::Status,        getStatusText() );
-    setText( DccPanel::Column::FileName,      m_fileName );
+    setText( DccPanel::Column::FileName,      m_fileURL.fileName() );
     setText( DccPanel::Column::PartnerNick,   m_partnerNick );
     setText( DccPanel::Column::Position,      getPositionPrettyText() );
     setText( DccPanel::Column::TimeRemaining, getTimeRemainingPrettyText() );
--- trunk/extragear/network/konversation/src/dcctransferrecv.cpp #495143:495144
@@ -298,7 +298,7 @@
         if ( Preferences::dccAutoResume() )
             prepareLocalKio( false, true, size );
         else
-            askAndPrepareLocalKio( i18n( "<b>A partial file is existing.</b><br>"
+            askAndPrepareLocalKio( i18n( "<b>A partial file exists.</b><br>"
                 "%1<br>"
                 "Size of the partial file: %2 bytes<br>" )
                 .arg( m_fileURL.prettyURL() )
@@ -325,7 +325,7 @@
                 << "DccTransferRecv::slotLocalGotResult(): Why was I called in spite of no error?" << endl;
             break;
         case KIO::ERR_FILE_ALREADY_EXIST:
-            askAndPrepareLocalKio( i18n( "<b>The file is already existing.</b><br>"
+            askAndPrepareLocalKio( i18n( "<b>The file already exists.</b><br>"
                 "%1<br>" )
                 .arg( m_fileURL.prettyURL() ),
                 DccResumeDialog::RA_Overwrite | DccResumeDialog::RA_Rename | DccResumeDialog::RA_Cancel,
@@ -489,7 +489,7 @@
     setStatus( Done );
     updateView();
     cleanUp();
-    emit done( m_fileName );
+    emit done( m_fileURL.fileName() );
 }
 
                                                   // <- WriteCacheHandler::gotError()