[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=984c251

The following commit has been merged in the master branch:
commit 984c25118c9c4313b4940f64afd825018e1b2502
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Feb 1 17:41:55 2013 +0000

    more fixes
---
 contact-delegate.cpp | 1 -
 main-widget.cpp      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index 8f7290a..4dd7162 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -34,7 +34,6 @@
 #include <KGlobalSettings>
 #include <KDE/KLocale>
 
-#include <KTp/Models/contacts-model.h>
 #include <KTp/presence.h>
 
 ContactDelegate::ContactDelegate(QObject * parent)
diff --git a/main-widget.cpp b/main-widget.cpp
index 6cef884..c7eb052 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -54,6 +54,7 @@
 #include <KStandardShortcut>
 #include <KNotification>
 #include <KToolInvocation>
+#include <KMenuBar>
 
 #include "ui_main-widget.h"
 #include "account-buttons-panel.h"
@@ -116,7 +117,6 @@ MainWidget::MainWidget(QWidget *parent)
     m_toolBar->setToolButtonStyle(Qt::ToolButtonIconOnly);
 
     m_addContactAction = new KAction(KIcon("list-add-user"), i18n("Add New Contacts..."), this);
-    actionCollection()->addAction("add_contact", m_addContactAction);
 
     m_toolBar->addAction(m_addContactAction);
 

-- 
ktp-contact-list packaging