[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=25b69f2

The following commit has been merged in the master branch:
commit 25b69f2caeeef8e015d46580780fd7b36647b0b5
Author: Dominik Cermak <d.cermak at arcor.de>
Date:   Sat May 12 16:29:59 2012 +0200

    Only show the "Previous conversations" action if tp-logger-qt is found
---
 app/chat-window.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 7b5449a..929fda0 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -593,8 +593,10 @@ void ChatWindow::setupCustomActions()
     spellDictComboAction->setIcon(KIcon(QLatin1String("tools-check-spelling")));
     spellDictComboAction->setIconText(i18n("Choose Spelling Language"));
 
+#ifdef TELEPATHY_LOGGER_QT4_FOUND
     KAction *openLogAction = new KAction(KIcon(QLatin1String("view-pim-journal")), i18nc("Action to open the log viwer with a specified contact","&Previous conversations"), this);
     connect(openLogAction, SIGNAL(triggered()), SLOT(onOpenLogTriggered()));
+#endif
 
     KAction *accountIconAction = new KAction(KIcon(QLatin1String("telepathy-kde")), i18n("Account Icon"), this);
     m_accountIconLabel = new QLabel(this);
@@ -611,7 +613,9 @@ void ChatWindow::setupCustomActions()
     actionCollection()->addAction(QLatin1String("language"), spellDictComboAction);
     actionCollection()->addAction(QLatin1String("account-icon"), accountIconAction);
     actionCollection()->addAction(QLatin1String("block-contact"), blockContactAction);
+#ifdef TELEPATHY_LOGGER_QT4_FOUND
     actionCollection()->addAction(QLatin1String("open-log"), openLogAction);
+#endif
 }
 
 void ChatWindow::setAudioCallEnabled(bool enable)

-- 
ktp-text-ui packaging