[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=c78f4ac

The following commit has been merged in the master branch:
commit c78f4acf84dd1a831da8066631de94facfab7820
Author: Hrvoje Senjan <hrvoje.senjan at gmail.com>
Date:   Tue Sep 16 20:57:38 2014 +0200

    Conditionally use setIcon
    
    KMessageWidget gained setIcon member only with kdelibs 4.11
    Fixes build with kdelibs 4.10.x
    
    Reviewed-by: Martin Klapetek
---
 main-widget.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main-widget.cpp b/main-widget.cpp
index cf1b97d..0734e3c 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -61,6 +61,8 @@
 #include <KStandardAction>
 #include <KWindowSystem>
 
+#include <kdeversion.h>
+
 #ifdef HAVE_KPEOPLE
 // #include <kpeople/widgets/mergedialog.h> //Disable for now, re-enable when kpeople re-enables it
 #include <KPeople/PersonsModel>
@@ -760,7 +762,9 @@ void MainWidget::onModelInitialized(bool success)
     if (!success) {
         m_messageWidget->setMessageType(KMessageWidget::Warning);
         m_messageWidget->setText(i18n("Some data sources failed to initialize properly, your contact list might be incomplete."));
+        #if KDE_IS_VERSION(4, 11, 0)
         m_messageWidget->setIcon(KIcon::fromTheme(QLatin1String("dialog-warning")));
+        #endif
         m_messageWidget->animatedShow();
     }
 

-- 
ktp-contact-list packaging