← Back to branch summary

~ubuntu-branches/debian/stretch/psi-plus/stretch

« back to all changes in this revision

Viewing changes to src/contactmanager/contactmanagerdlg.cpp

  • Committer: Package Import Robot
  • Author(s): Boris Pek
  • Date: 2013-10-23 02:42:20 UTC
  • mfrom: (1.4.7)
  • Revision ID: package-import@ubuntu.com-20131023024220-bk2hyoenqkwfhpgw
Tags: 0.16.242-1
http://bugs.debian.org/724880
* New upstream release:
  fixed the problem of initialization of private conversation when both
  sides use libotr 4.0.x. (Closes: #724880)
* Update debian/watch: sources were moved.
* Delete psi-plus-content-downloader package and update all related files.
  This plugin is in psi-plus-plugins package now.
* Update debian/control:
  - remove all currently unneeded Replaces and Breaks fields
  - add build dependency on libidn11-dev
* Update debian/rules: simplify get-orig-source section.
* Update debian/copyright:
  - update Source field due to changes in sources location
  - remove copyright holders whose code was deleted from source tree
    (bundled libidn library was removed)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/contactmanager/contactmanagerdlg.cpp
299
299
                        }
300
300
                        labelContent.append(QString("%1 (%2)").arg(jid).arg(nicks[jid]));
301
301
                }
302
 
                
 
302
 
303
303
                QMessageBox confirmDlg(
304
304
                                QMessageBox::Question,tr("Confirm contacts importing"),
305
305
                                tr("Do you really want to import these contacts?"), QMessageBox::Cancel | QMessageBox::Yes);