[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [spacebar] app: [app] Cleanup + comment
From:       Martin Klapetek <mklapetek () kde ! org>
Date:       2016-03-17 22:28:45
Message-ID: E1aggPN-0005uE-Hh () scm ! kde ! org
[Download RAW message or body]

Git commit 6ed66a2755574ddbec73b40e52af08f6dd7afa2e by Martin Klapetek.
Committed on 17/03/2016 at 22:28.
Pushed by mklapetek into branch 'master'.

[app] Cleanup + comment

M  +2    -0    app/package/contents/ui/MainPage.qml
M  +0    -12   app/src/main.cpp

http://commits.kde.org/spacebar/6ed66a2755574ddbec73b40e52af08f6dd7afa2e

diff --git a/app/package/contents/ui/MainPage.qml \
b/app/package/contents/ui/MainPage.qml index 1086183..a0958e9 100644
--- a/app/package/contents/ui/MainPage.qml
+++ b/app/package/contents/ui/MainPage.qml
@@ -92,6 +92,8 @@ MobileComponents.Page {
                     onClicked: {
                         root.pageStack.push(conversationPageComponent);
                         root.pageStack.currentPage.conversation = \
model.conversation; +
+                        // If the account is online, request a channel
                         if (mainModel.canChat(accountId)) {
                             mainModel.startChat(accountId, contactId);
                         }
diff --git a/app/src/main.cpp b/app/src/main.cpp
index bbf932c..5d6f28c 100644
--- a/app/src/main.cpp
+++ b/app/src/main.cpp
@@ -75,18 +75,6 @@ int main(int argc, char** argv)
 
     QWindow *window = qobject_cast<QWindow *>(obj->rootObject());
     if (window) {
-//         QObject::connect(&service, &KDBusService::activateRequested, [=](const \
                QStringList &arguments, const QString &workingDirectory) {
-//             Q_UNUSED(workingDirectory);
-//             window->show();
-//             window->requestActivate();
-//             if (arguments.length() > 0) {
-//                 QString numberArg = arguments[1];
-//                 if (numberArg.startsWith("call://")) {
-//                     numberArg = numberArg.mid(7);
-//                 }
-//                 obj->rootObject()->metaObject()->invokeMethod(obj->rootObject(), \
                "call", Q_ARG(QVariant, numberArg));
-//             }
-//         });
         window->show();
         window->requestActivate();
         window->setTitle(obj->package().metadata().name());


[prev in list] [next in list] [prev in thread] [next in thread]