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

The following commit has been merged in the master branch:
commit c78179c06bc2ea0ab58b5cb81dbf55976ff3a25a
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Feb 9 17:08:24 2015 +0100

    [app] Move KAboutData to TelepathyChatUi
    
    We need to set up KAboutData in there, before the ChatWindow gets
    created, otherwise the Settings and Help menu will not have the
    Application Name set and will contain just "ktp-text-ui".
    
    And if it's set from main.cpp, it will definitely be set only
    afterwards.
---
 app/main.cpp              | 17 +----------------
 app/telepathy-chat-ui.cpp | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/app/main.cpp b/app/main.cpp
index a478ebe..38a35b5 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -21,7 +21,6 @@
 #include "telepathy-chat-ui.h"
 
 #include "defines.h"
-#include "../ktptextui_version.h"
 
 #include <TelepathyQt/ClientRegistrar>
 #include <TelepathyQt/AccountFactory>
@@ -35,27 +34,16 @@
 #include <KTp/core.h>
 #include <KTp/OTR/types.h>
 
-#include <KAboutData>
-#include <KLocalizedString>
-
 #include <Kdelibs4ConfigMigrator>
 
 int main(int argc, char *argv[])
 {
-
     Kdelibs4ConfigMigrator migrator(QLatin1String("ktp-text-ui"));
     migrator.setConfigFiles(QStringList() << QLatin1String("ktp-text-uirc"));
     migrator.setUiFiles(QStringList() << QLatin1String("chatwindow.rc"));
     migrator.migrate();
 
-    KAboutData aboutData("ktp-text-ui", i18n("Chat Application"),
-                         QStringLiteral(KTP_TEXT_UI_VERSION_STRING));
-    aboutData.addAuthor(i18n("David Edmundson"), i18n("Developer"), "david at davidedmundson.co.uk");
-    aboutData.addAuthor(i18n("Marcin Ziemiński"), i18n("Developer"), "zieminn at gmail.com");
-    aboutData.addAuthor(i18n("Dominik Schmidt"), i18n("Past Developer"), "kde at dominik-schmidt.de");
-    aboutData.addAuthor(i18n("Francesco Nwokeka"), i18n("Past Developer"), "francesco.nwokeka at gmail.com");
-    aboutData.setProductName("telepathy/text-ui"); //set the correct name for bug reporting
-    aboutData.setLicense(KAboutLicense::GPL_V2);
+    // KAboutData is in telepathy-chat-ui.cpp, read there why
 
     Tp::registerTypes();
     KTp::registerOtrTypes();
@@ -77,8 +65,5 @@ int main(int argc, char *argv[])
     Tp::AbstractClientPtr handler = Tp::AbstractClientPtr(app);
     registrar->registerClient(handler, QLatin1String(KTP_TEXTUI_CLIENT_NAME));
 
-    QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("telepathy-kde")));
-    KAboutData::setApplicationData(aboutData);
-
     return app->exec();
 }
diff --git a/app/telepathy-chat-ui.cpp b/app/telepathy-chat-ui.cpp
index c45bb44..c77e0a8 100644
--- a/app/telepathy-chat-ui.cpp
+++ b/app/telepathy-chat-ui.cpp
@@ -39,6 +39,10 @@
 
 #include <KTp/message-processor.h>
 
+#include <KAboutData>
+#include <KLocalizedString>
+#include "../ktptextui_version.h"
+
 
 inline Tp::ChannelClassSpecList channelClassList()
 {
@@ -52,6 +56,20 @@ TelepathyChatUi::TelepathyChatUi(int &argc, char *argv[])
     : KTp::TelepathyHandlerApplication(argc, argv, -1, -1),
       AbstractClientHandler(channelClassList())
 {
+    // We need to set up KAboutData in here, before the ChatWindow gets created,
+    // otherwise the Settings and Help menu will not have the Application Name
+    // set and will contain just "ktp-text-ui".
+    KAboutData aboutData("ktp-text-ui", i18n("Chat Application"), QStringLiteral(KTP_TEXT_UI_VERSION_STRING));
+    aboutData.addAuthor(i18n("David Edmundson"), i18n("Developer"), "david at davidedmundson.co.uk");
+    aboutData.addAuthor(i18n("Marcin Ziemiński"), i18n("Developer"), "zieminn at gmail.com");
+    aboutData.addAuthor(i18n("Dominik Schmidt"), i18n("Past Developer"), "kde at dominik-schmidt.de");
+    aboutData.addAuthor(i18n("Francesco Nwokeka"), i18n("Past Developer"), "francesco.nwokeka at gmail.com");
+    aboutData.setProductName("telepathy/text-ui"); //set the correct name for bug reporting
+    aboutData.setLicense(KAboutLicense::GPL_V2);
+
+    QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("telepathy-kde")));
+    KAboutData::setApplicationData(aboutData);
+
     m_eventLoopLocker = 0;
     m_notifyFilter = new NotifyFilter;
     ChatWindow *window = createWindow();

-- 
ktp-text-ui packaging