[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=98118f0

The following commit has been merged in the master branch:
commit 98118f099fd3a2cf7273a6441f0ccac4db812243
Author: Alexandr Akulich <akulichalexander at gmail.com>
Date:   Thu Feb 27 17:52:15 2014 +0600

    Set application icon globally in aboutData, instead of in MainWidget only.
    
    REVIEW: 116115
    BUG: 331491
    FIXED-IN: 0.8.0
---
 main-widget.cpp | 1 -
 main.cpp        | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index e4a9cda..27a941d 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -91,7 +91,6 @@ MainWidget::MainWidget(QWidget *parent)
     setupUi(this);
 
     m_filterBar->hide();
-    setWindowIcon(KIcon("telepathy-kde"));
     setAutoSaveSettings();
     setupTelepathy();
 
diff --git a/main.cpp b/main.cpp
index 65801df..a5b6806 100644
--- a/main.cpp
+++ b/main.cpp
@@ -41,6 +41,7 @@ int main(int argc, char *argv[])
     aboutData.addAuthor(ki18nc("@info:credit", "Martin Klapetek"), ki18n("Developer"),
                         "martin.klapetek at gmail.com");
     aboutData.setProductName("telepathy/contactlist"); //set the correct name for bug reporting
+    aboutData.setProgramIconName("telepathy-kde");
 
     KCmdLineArgs::init(argc, argv, &aboutData);
 

-- 
ktp-contact-list packaging