Merge lp:~mardy/unity-2d/default-apps into lp:unity-2d

[Alberto Mardegan]

[places] Use shotwell as default photo viewer

Extend GioDefaultApplication with a defaultDesktopFile property which can be
used to override the default application registered for the content-type.

[Alberto Mardegan (mardy)]

As I commented on the bug, I don't think this is how we should deal with the problem.

review: Disapprove

[Florian Boucault (fboucault)]

Looks great, I will test it later.

[Florian Boucault (fboucault)]

Fantastic!

=== modified file 'libunity-2d-private/src/giodefaultapplication.cpp'
--- libunity-2d-private/src/giodefaultapplication.cpp	2011-07-05 15:27:03 +0000
+++ libunity-2d-private/src/giodefaultapplication.cpp	2011-09-01 12:37:25 +0000
@@ -37,6 +37,7 @@
     : QObject(parent),
       m_contentType(""),
       m_desktopFile(""),
+      m_defaultDesktopFile(""),
       m_mimeappsWatcher(new QFileSystemWatcher(this))
 {
     /* GIO does not have any signal to inform us of changes in default
@@ -77,6 +78,11 @@
     return m_contentType;
 }
 
+QString GioDefaultApplication::defaultDesktopFile() const
+{
+    return m_defaultDesktopFile;
+}
+
 void GioDefaultApplication::setContentType(const QString& contentType)
 {
     if (contentType == m_contentType) {
@@ -88,13 +94,34 @@
     updateDesktopFile();
 }
 
+void GioDefaultApplication::setDefaultDesktopFile(
+    const QString& defaultDesktopFile)
+{
+    if (defaultDesktopFile == m_defaultDesktopFile) {
+        return;
+    }
+
+    m_defaultDesktopFile = defaultDesktopFile;
+    Q_EMIT defaultDesktopFileChanged();
+    updateDesktopFile();
+}
+
 void GioDefaultApplication::updateDesktopFile()
 {
     GObjectScopedPointer<GAppInfo> app_info;
-    QByteArray byte_array = m_contentType.toUtf8();
-    gchar *content_type = byte_array.data();
-
-    app_info.reset(g_app_info_get_default_for_type(content_type, false));
+
+    if (!m_defaultDesktopFile.isEmpty()) {
+        QByteArray byte_array = m_defaultDesktopFile.toUtf8();
+        gchar *desktopFile = byte_array.data();
+        app_info.reset((GAppInfo*)g_desktop_app_info_new(desktopFile));
+    }
+
+    if (app_info.isNull()) {
+        QByteArray byte_array = m_contentType.toUtf8();
+        gchar *content_type = byte_array.data();
+        app_info.reset(g_app_info_get_default_for_type(content_type, false));
+    }
+
     if (!app_info.isNull()) {
         m_desktopFile = QString::fromUtf8(g_desktop_app_info_get_filename((GDesktopAppInfo*)app_info.data()));
     } else {
 
=== modified file 'libunity-2d-private/src/giodefaultapplication.h'
--- libunity-2d-private/src/giodefaultapplication.h	2011-07-26 16:06:48 +0000
+++ libunity-2d-private/src/giodefaultapplication.h	2011-09-01 12:37:25 +0000
@@ -35,6 +35,7 @@
 
     Q_PROPERTY(QString desktopFile READ desktopFile NOTIFY desktopFileChanged)
     Q_PROPERTY(QString contentType READ contentType WRITE setContentType NOTIFY contentTypeChanged)
+    Q_PROPERTY(QString defaultDesktopFile READ defaultDesktopFile WRITE setDefaultDesktopFile NOTIFY defaultDesktopFileChanged)
 
 public:
     GioDefaultApplication(QObject* parent=0);
@@ -42,13 +43,16 @@
     /* getters */
     QString desktopFile() const;
     QString contentType() const;
+    QString defaultDesktopFile() const;
 
     /* setters */
+    void setDefaultDesktopFile(const QString& defaultDesktopFile);
     void setContentType(const QString& contentType);
 
 Q_SIGNALS:
     void desktopFileChanged();
     void contentTypeChanged();
+    void defaultDesktopFileChanged();
 
 private:
     Q_SLOT void updateDesktopFile();
@@ -56,6 +60,7 @@
 
     QString m_contentType;
     QString m_desktopFile;
+    QString m_defaultDesktopFile;
     QFileSystemWatcher* m_mimeappsWatcher;
 };
 
 
=== modified file 'places/HomeButtonDefaultApplication.qml'
--- places/HomeButtonDefaultApplication.qml	2011-08-10 00:10:39 +0000
+++ places/HomeButtonDefaultApplication.qml	2011-09-01 12:37:25 +0000
@@ -21,6 +21,10 @@
 
 HomeButton {
     property alias contentType: defaultApplication.contentType
+    /* If the desktopFile property is set and points to an existing
+     * application, the contentType property is ignored.
+     */
+    property alias desktopFile: defaultApplication.defaultDesktopFile
 
     GioDefaultApplication {
         id: defaultApplication
 
=== modified file 'places/HomeShortcuts.qml'
--- places/HomeShortcuts.qml	2011-08-31 10:57:31 +0000
+++ places/HomeShortcuts.qml	2011-09-01 12:37:25 +0000
@@ -85,6 +85,7 @@
     HomeButtonDefaultApplication {
         label: u2d.tr("View Photos")
         contentType: "image/jpeg"
+        desktopFile: "shotwell-viewer.desktop"
     }
 
     HomeButtonDefaultApplication {