[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=f90baf1

The following commit has been merged in the master branch:
commit f90baf13e50c9323e969bf4af3312e99bf10ff42
Author: Dariusz Mikulski <dariusz.mikulski at gmail.com>
Date:   Tue Dec 15 23:59:55 2009 +0000

    Allow in interface setting a title for custom tabs, setting sensible titles for gabble pages
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1062786
---
 KTp/Models/accounts-list-model.cpp | 12 ++++++++++++
 KTp/Models/accounts-list-model.h   |  7 +++++++
 2 files changed, 19 insertions(+)

diff --git a/KTp/Models/accounts-list-model.cpp b/KTp/Models/accounts-list-model.cpp
index 9641330..0f607f2 100644
--- a/KTp/Models/accounts-list-model.cpp
+++ b/KTp/Models/accounts-list-model.cpp
@@ -156,6 +156,11 @@ void AccountsListModel::editAccount(const QModelIndex &index)
         return;
     }
 
+	connect(accountItem, SIGNAL(protocolSelected(QString, QString)),
+		this, SIGNAL(protocolSelected(QString, QString)));
+	connect(this, SIGNAL(setTitleForCustomPages(QString, QList<QString>)),
+			accountItem, SLOT(onTitleForCustomPages(QString, QList<QString>)));
+
     accountItem->edit();
 }
 
@@ -249,6 +254,13 @@ void AccountsListModel::onAccountItemUpdated()
     emit dataChanged(index, index);
 }
 
+void AccountsListModel::onTitleForCustomPages(QString mandatoryPage, QList<QString> optionalPage)
+{
+	kDebug();
+
+	emit setTitleForCustomPages(mandatoryPage, optionalPage);
+}
+
 
 #include "accounts-list-model.moc"
 
diff --git a/KTp/Models/accounts-list-model.h b/KTp/Models/accounts-list-model.h
index 6beefea..9325b5d 100644
--- a/KTp/Models/accounts-list-model.h
+++ b/KTp/Models/accounts-list-model.h
@@ -43,6 +43,13 @@ public:
     void editAccount(const QModelIndex &index);
     void removeAccount(const QModelIndex &index);
 
+Q_SIGNALS:
+	void protocolSelected(QString, QString);
+	void setTitleForCustomPages(QString, QList<QString>);
+
+public Q_SLOTS:
+	void onTitleForCustomPages(QString, QList<QString>);
+
 private Q_SLOTS:
     void onAccountItemReady();
     void onAccountItemRemoved();

-- 
ktp-common-internals packaging