← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/mainwindow.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Modestas Vainius
  • Date: 2009-05-15 11:24:24 UTC
  • mfrom: (1.15.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 47.
  • Revision ID: james.westby@ubuntu.com-20090515112424-b74i26lciabf4qnk
Tags: 1.1.75+svn968012-1
* New upstream development snapshot:
  - Last Changed Author: hein
  - Last Changed Rev: 968012
  - Last Changed Date: 2009-05-14 21:03:55 +0300
* Update README.source.
* Use dh --quilt instead of custom patch handling, build depend on
  quilt 0.46-7~.
* Update patches to upstream changes.
* Update konversation.install: remove docs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mainwindow.cpp
420
420
    awayAction->setShortcut(KShortcut("Ctrl+Shift+A"));
421
421
    awayAction->setEnabled(false);
422
422
    awayAction->setIcon(KIcon("im-user-away"));
423
 
    connect(awayAction, SIGNAL(toggled(bool)), KonversationApplication::instance()->getAwayManager(), SLOT(toggleGlobalAway(bool)));
 
423
    connect(awayAction, SIGNAL(triggered(bool)), KonversationApplication::instance()->getAwayManager(), SLOT(toggleGlobalAway(bool)));
424
424
    actionCollection()->addAction("toggle_away", awayAction);
425
425
 
426
426
    action=new KAction(this);
747
747
{
748
748
    if (!m_serverListDialog)
749
749
    {
750
 
        m_serverListDialog = new Konversation::ServerListDialog(this);
 
750
        m_serverListDialog = new Konversation::ServerListDialog(i18n("Server List"), this);
751
751
        KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp);
752
752
 
753
753
        connect(m_serverListDialog, SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettingsPtr)),