Merge lp:~gerboland/qtubuntu/fix-click-packages into lp:qtubuntu

[Gerry Boland]

Fix click package execution, and correct icon path

Fix click package execution, and correct icon path

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:176
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/76/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/64
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/64/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtubuntu-ci/76/rebuild

review: Approve (continuous-integration)

[Ricardo Mendoza (ricmm)]

Works fine, fixes launching.

review: Approve

=== modified file 'src/modules/application/application.cc'
--- src/modules/application/application.cc	2013-09-05 14:56:54 +0000
+++ src/modules/application/application.cc	2013-09-12 16:26:50 +0000
@@ -54,7 +54,16 @@
 }
 
 QUrl Application::icon() const {
-  return desktopData_->icon();
+  QString iconString = desktopData_->icon().toString();
+  QString pathString = desktopData_->path();
+
+  if (QFileInfo(iconString).exists()) {
+    return desktopData_->icon();
+  } else if (QFileInfo(pathString + '/' + iconString).exists()) {
+    return QUrl(pathString + '/' + iconString);
+  } else {
+    return QUrl("image://theme/" + iconString);
+  }
 }
 
 QString Application::exec() const {
 
=== modified file 'src/modules/application/desktopdata.cpp'
--- src/modules/application/desktopdata.cpp	2013-09-04 12:01:57 +0000
+++ src/modules/application/desktopdata.cpp	2013-09-12 16:26:50 +0000
@@ -16,6 +16,7 @@
 #include "desktopdata.h"
 
 #include <QFile>
+#include <QDir>
 
 #include "logging.h"
 
@@ -23,10 +24,9 @@
 #define ARRAY_SIZE(a) \
     ((sizeof(a) / sizeof(*(a))) / static_cast<size_t>(!(sizeof(a) % sizeof(*(a)))))
 
-const QString desktopFilePath = "/usr/share/applications/";
-
 DesktopData::DesktopData(QString appId)
     : appId_(appId)
+    , file_(findDesktopFile(appId))
     , entries_(DesktopData::kNumberOfEntries, "") {
     DLOG("DesktopData::DesktopData (this=%p, appId='%s')", this, appId.toLatin1().data());
     DASSERT(appId != NULL);
@@ -38,13 +38,45 @@
     entries_.clear();
 }
 
-QString DesktopData::file() const {
-    return desktopFilePath + appId_ + ".desktop";
+QString DesktopData::findDesktopFile(const QString &appId) const
+{
+    int dashPos = -1;
+    QString helper = appId;
+
+    QStringList searchDirs;
+    searchDirs << QDir::homePath() + "/.local/share/applications";
+    searchDirs << "/usr/share/applications";
+
+#ifdef TEST_MODE
+    searchDirs << "";
+#endif
+
+    do {
+        if (dashPos != -1) {
+            helper = helper.replace(dashPos, 1, '/');
+        }
+
+        Q_FOREACH(const QString &searchDir, searchDirs) {
+            QFileInfo fileInfo(QDir(searchDir), helper + ".desktop");
+            if (fileInfo.exists()) {
+                return fileInfo.absoluteFilePath();
+            }
+        }
+
+        dashPos = helper.indexOf("-");
+    } while (dashPos != -1);
+
+    return QString();
 }
 
 bool DesktopData::load() {
     DLOG("DesktopData::load (this=%p, appId='%s')", this, qPrintable(appId_));
 
+    if (this->file().isNull() || this->file().isEmpty()) {
+        DLOG("No desktop file found for appId: %s", qPrintable(appId_));
+        return false;
+    }
+
     const struct { const char* const name; int size; unsigned int flag; } kEntryNames[] = {
         { "Name=", sizeof("Name=") - 1, 1 << DesktopData::kNameIndex },
         { "Comment=", sizeof("Comment=") - 1, 1 << DesktopData::kCommentIndex },
 
=== modified file 'src/modules/application/desktopdata.h'
--- src/modules/application/desktopdata.h	2013-09-03 18:03:17 +0000
+++ src/modules/application/desktopdata.h	2013-09-12 16:26:50 +0000
@@ -26,7 +26,7 @@
     ~DesktopData();
 
     QString appId() const { return appId_; }
-    QString file() const;
+    QString file() const { return file_; };
     QString name() const { return entries_[kNameIndex]; }
     QString comment() const { return entries_[kCommentIndex]; }
     QUrl icon() const { return QUrl(entries_[kIconIndex]); }
@@ -34,6 +34,7 @@
     QString path() const { return entries_[kPathIndex]; }
     QString stageHint() const { return entries_[kStageHintIndex]; }
     bool loaded() const { return loaded_; }
+    QString findDesktopFile(const QString &appId) const;
 
 private:
     static const int kNameIndex = 0,
@@ -47,6 +48,7 @@
     bool load();
 
     QString appId_;
+    QString file_;
     QVector<QString> entries_;
     bool loaded_;
 };