[X2Go-Commits] [x2goclient] 01/01: src/appdialog.cpp: logic so that X2Go-Top applications are shown again.

git-admin at x2go.org git-admin at x2go.org
Thu Feb 16 04:10:28 CET 2017


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 3aa8515b302d52e73a13433641bfa01a562d21e4
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Feb 15 07:18:20 2017 +0100

    src/appdialog.cpp: logic so that X2Go-Top applications are shown again.
    
    Used faulty logic when silencing compiler warnings.
---
 debian/changelog  |    2 ++
 src/appdialog.cpp |   24 +++++++++++-------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5501b9b..c4b6f1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -570,6 +570,8 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
       differently.
     - macbuild.sh: get rid of problems and use gfind directly. We need special
       GNU features.
+    - src/appdialog.cpp: logic so that X2Go-Top applications are shown again.
+      Used faulty logic when silencing compiler warnings.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/appdialog.cpp b/src/appdialog.cpp
index 2a42a12..2276ce8 100644
--- a/src/appdialog.cpp
+++ b/src/appdialog.cpp
@@ -92,7 +92,7 @@ QTreeWidgetItem* AppDialog::initTopItem(QString text, QPixmap icon)
 
 void AppDialog::loadApps()
 {
-    QTreeWidgetItem* parent;
+    QTreeWidgetItem* parent = NULL;
     foreach (Application app, mw->getApplications())
     {
         switch (app.category)
@@ -157,18 +157,16 @@ void AppDialog::loadApps()
             break;
         }
 
-        if (parent) {
-            QTreeWidgetItem* it;
-            if (app.category==Application::TOP)
-                it=new QTreeWidgetItem(treeWidget);
-            else
-                it=new QTreeWidgetItem(parent);
-            it->setText(0, app.name);
-            it->setToolTip(0,app.comment);
-            it->setIcon(0,app.icon);
-            it->setData(0, Qt::UserRole, app.exec);
-            it->setData(0, Qt::UserRole+1, app.comment);
-        }
+        QTreeWidgetItem* it;
+        if (app.category==Application::TOP)
+            it=new QTreeWidgetItem(treeWidget);
+        else
+            it=new QTreeWidgetItem(parent);
+        it->setText(0, app.name);
+        it->setToolTip(0,app.comment);
+        it->setIcon(0,app.icon);
+        it->setData(0, Qt::UserRole, app.exec);
+        it->setData(0, Qt::UserRole+1, app.comment);
     }
     treeWidget->sortItems(0,Qt::AscendingOrder);
 }

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list