← Back to branch summary

~ubuntu-branches/ubuntu/lucid/konversation/lucid-updates

« back to all changes in this revision

Viewing changes to src/dcc/resumedialog.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Modestas Vainius
  • Date: 2009-05-19 09:44:08 UTC
  • mfrom: (1.16.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 47.
  • Revision ID: james.westby@ubuntu.com-20090519094408-yi3yv1v4zzbsu2nx
Tags: 1.1.75+svn969816-1
* New upstream development snapshot:
  - Last Changed Author: tjmchenry
  - Last Changed Rev: 969816
  - Last Changed Date: 2009-05-19 04:45:54 +0300
  - Translations as of Tue, 19 May 2009 09:21:13 are included.
* Update download URL in debian/copyright.
* Update Debian menu icons.
* Update konversation.install: install translations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dcc/resumedialog.cpp
16
16
 
17
17
#include <qlabel.h>
18
18
#include <qlayout.h>
 
19
#include <QPointer>
19
20
 
20
21
#include <kdebug.h>
21
22
#include <klocale.h>
43
44
    else if(defaultAction == RA_Cancel)
44
45
        defaultButtonCode = KDialog::Cancel;
45
46
 
46
 
    DccResumeDialog dlg(item, i18n("DCC Receive Question"), message, enabledActions, enabledButtonCodes, defaultButtonCode);
47
 
    dlg.exec();
 
47
    QPointer<DccResumeDialog> dlg = new DccResumeDialog(item, i18n("DCC Receive Question"), message, enabledActions, enabledButtonCodes, defaultButtonCode);
 
48
    dlg->exec();
48
49
 
49
 
    ReceiveAction ra = dlg.m_selectedAction;
 
50
    ReceiveAction ra = dlg->m_selectedAction;
50
51
 
51
52
    if(ra == RA_Rename)
52
 
        item->setFileURL( dlg.m_urlreqFileURL->url() );
 
53
        item->setFileURL( dlg->m_urlreqFileURL->url() );
 
54
 
 
55
    delete dlg;
53
56
 
54
57
    return ra;
55
58
}