← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/contactlistaccountmenu.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/contactlistaccountmenu.cpp
214
214
                bookmarksMenu_->addAction(doGroupChatAction_);
215
215
                bookmarksMenu_->addSeparator();
216
216
                bookmarksMenu_->addAction(bookmarksManageAction_);
 
217
                bookmarksMenu_->setEnabled(true);
217
218
                if (account->account()->bookmarkManager()->isAvailable()) {
218
 
                        bookmarksMenu_->setEnabled(true);
 
219
                        bookmarksManageAction_->setEnabled(true);
219
220
                        bookmarksMenu_->addSeparator();
220
221
                        foreach(ConferenceBookmark c, account->account()->bookmarkManager()->conferences()) {
221
222
                                QAction* joinAction = new QAction(QString(tr("Join %1")).arg(c.name()), this);
226
227
                        }
227
228
                }
228
229
                else {
229
 
                        bookmarksMenu_->setEnabled(false);
 
230
                        bookmarksManageAction_->setEnabled(false);
230
231
                }
231
232
 
232
233
                newMessageAction_->setVisible(PsiOptions::instance()->getOption("options.ui.message.enabled").toBool());