← Back to branch summary

~ubuntu-branches/ubuntu/trusty/sflphone/trusty

« back to all changes in this revision

Viewing changes to kde/src/widgets/immanager.cpp

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2014-01-28 18:23:36 UTC
  • mfrom: (4.3.4 sid)
  • Revision ID: package-import@ubuntu.com-20140128182336-jrsv0k9u6cawc068
Tags: 1.3.0-1
http://bugs.debian.org/735846
http://bugs.debian.org/727164
http://bugs.debian.org/718178
http://bugs.debian.org/736583
http://bugs.debian.org/722040
http://bugs.debian.org/736746
* New upstream release 
  - Fixes "New Upstream Release" (Closes: #735846)
  - Fixes "Ringtone does not stop" (Closes: #727164)
  - Fixes "[sflphone-kde] crash on startup" (Closes: #718178)
  - Fixes "sflphone GUI crashes when call is hung up" (Closes: #736583)
* Build-Depends: ensure GnuTLS 2.6
  - libucommon-dev (>= 6.0.7-1.1), libccrtp-dev (>= 2.0.6-3)
  - Fixes "FTBFS Build-Depends libgnutls{26,28}-dev" (Closes: #722040)
* Fix "boost 1.49 is going away" unversioned Build-Depends: (Closes: #736746)
* Add Build-Depends: libsndfile-dev, nepomuk-core-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
kde/src/widgets/immanager.cpp
1
1
/***************************************************************************
2
 
 *   Copyright (C) 2012-2013 by Savoir-Faire Linux                         *
 
2
 *   Copyright (C) 2012-2014 by Savoir-Faire Linux                         *
3
3
 *   Author : Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>*
4
4
 *                                                                         *
5
5
 *   This program is free software; you can redistribute it and/or modify  *
18
18
#include "immanager.h"
19
19
#include "../lib/instantmessagingmodel.h"
20
20
#include "../lib/call.h"
21
 
#include "imtab.h"
 
21
#include "../delegates/imdelegate.h"
22
22
#include <KDebug>
23
23
#include <KLocale>
24
24
 
27
27
{
28
28
   setVisible(false);
29
29
   setTabsClosable(true);
30
 
   connect(InstantMessagingModelManager::getInstance(),SIGNAL(newMessagingModel(Call*,InstantMessagingModel*)),this,SLOT(newConversation(Call*,InstantMessagingModel*)));
 
30
   connect(InstantMessagingModelManager::instance(),SIGNAL(newMessagingModel(Call*,InstantMessagingModel*)),this,SLOT(newConversation(Call*,InstantMessagingModel*)));
31
31
   connect(this,SIGNAL(tabCloseRequested(int)),this,SLOT(closeRequest(int)));
32
32
}
33
33
 
37
37
   IMTab* newTab = new IMTab(model,this);
38
38
   m_lTabs[call] = newTab;
39
39
   setVisible(true);
40
 
   QString name = call->getFormattedName();
 
40
   QString name = call->formattedName();
41
41
   addTab(newTab,name);
42
42
}
43
43