← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/konversation/gutsy

« back to all changes in this revision

Viewing changes to debian/patches/12_dbug405384_dccsendfile.diff

  • Committer: Bazaar Package Importer
  • Author(s): Frode M. Døving, Jonathan Riddell, Frode M. Døving
  • Date: 2007-07-25 22:25:27 UTC
  • mfrom: (10.1.12 gutsy)
  • Revision ID: james.westby@ubuntu.com-20070725222527-jfhzav3ak5ln4u6v
Tags: 1.0.1-3ubuntu1
[ Jonathan Riddell ]
* Drop channel patch, default channel is changed in kubuntu-default-settings
  and it can fall back to freenode if that's not installed

[ Frode M. Døving ]
* Mergeing from Debian. See changelog entries below.
  A big thank you goes to the Debian KDE Extras Team, you rock!
* Remaining change: kubuntu_01_kdepot.diff
* Change maintainer address to ubuntu-core-dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/12_dbug405384_dccsendfile.diff
 
1
diff -uNr -x debian -x .pc konversation-1.0.1/konversation/src/server.cpp konversation-1.0.1.n/konversation/src/server.cpp
 
2
--- konversation-1.0.1/konversation/src/server.cpp      2006-10-06 19:43:29.000000000 +0300
 
3
+++ konversation-1.0.1.n/konversation/src/server.cpp    2007-07-21 13:39:41.000000000 +0300
 
4
@@ -1817,7 +1817,7 @@
 
5
     if(!recipient.isEmpty())
 
6
     {
 
7
         KURL::List fileURLs=KFileDialog::getOpenURLs(
 
8
-            lastDccDir,
 
9
+            ":lastDccDir",
 
10
             QString::null,
 
11
             getViewContainer()->getWindow(),
 
12
             i18n("Select File(s) to Send to %1").arg(recipient)
 
13
@@ -1825,7 +1825,6 @@
 
14
         KURL::List::iterator it;
 
15
         for ( it = fileURLs.begin() ; it != fileURLs.end() ; ++it )
 
16
         {
 
17
-            lastDccDir = (*it).directory();
 
18
             addDccSend( recipient, *it );
 
19
         }
 
20
     }
 
21
diff -uNr -x debian -x .pc konversation-1.0.1/konversation/src/server.h konversation-1.0.1.n/konversation/src/server.h
 
22
--- konversation-1.0.1/konversation/src/server.h        2006-10-06 19:43:29.000000000 +0300
 
23
+++ konversation-1.0.1.n/konversation/src/server.h      2007-07-21 13:39:06.000000000 +0300
 
24
@@ -608,7 +608,6 @@
 
25
         QString m_loweredNickname;
 
26
         QString ownIpByUserhost;                  // RPL_USERHOST
 
27
         QString ownIpByWelcome;                   // RPL_WELCOME
 
28
-        QString lastDccDir;
 
29
 
 
30
         QPtrList<Channel> channelList;
 
31
         QPtrList<Query> queryList;