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

[Alberto Mardegan]

[places] Hardcode preferred applications priorities

To decide which applications should be launched by the shortcuts in the Dash,
make a list of all applications supporting the desired content type and pick
the first one which is found in a hardcoded list.
This code can all be removed once we have a way to let the user specify his own
default application preferences.

[lp:~mardy/unity-2d/default-apps]

673. By Alberto Mardegan on 2011-08-30

[panel] Workaround QConf incomplete destruction

Ensure that the QConf object stays alive as long as the PanelManager is. This
is to workaround an issue with QConf's destructor, which doesn't disconnect
from the DConf's "notify" signal that can later be emitted while running the
event loop, and would therefore attempt to operate on an already destroyed
object.

674. By Gerry Boland on 2011-08-30

[dash] Rating Stars now cleared when "All" button pressed. Fixes bug:834640

675. By Alberto Mardegan on 2011-08-30

[panel] Padding for indicators should be 5 pixels

676. By Gerry Boland on 2011-08-30

[launcher] Context menu arrow has ugly blue edge. Harder to observe is that all the background graphics have blu-ish edges. This commit cleans up the graphics. Fixes bug:828386

677. By Alberto Mardegan on 2011-08-30

[dash] Convert UnityCore UTF-8 strings to QStrings

Add a tiny global function to perform the conversion, and use it throughout the project.

678. By Florian Boucault on 2011-08-31

[dash] Category header label changed from using literal to numeral: "See one more result" changed into "See 1 more result"

679. By Florian Boucault on 2011-08-31

[dash][launcher] When an application has no icon or the icon fails to load, display a placeholder icon.

680. By Florian Boucault on 2011-08-31

[dash] Use plural form in category header label 'See x more results'

681. By Florian Boucault on 2011-08-31

[dash] Fixed drag and drop of results from the dash (in particular applications to the launcher).

682. By Florian Boucault on 2011-08-31

[dash] Support loading lens' icon from theme in lens navigation bar.

683. By Florian Boucault on 2011-08-31

[dash] Fallback to using the default renderer if renderer requested by the lens is not found.

684. By Florian Boucault on 2011-08-31

[dash] Added horizontal renderer used by lenses such as Gwibber.

685. By Florian Boucault on 2011-08-31

[dash] Home buttons 'Media' and 'Internet' apps now also activate the right filter and open up the 'Filter results' pane.

[Alberto Mardegan (mardy)]

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

review: Disapprove

[lp:~mardy/unity-2d/default-apps]

686. By Alberto Mardegan on 2011-09-01

[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.

Unmerged revisions

=== 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-08-26 08:37:26 +0000
@@ -28,11 +28,58 @@
 #include <QTimer>
 
 // gio
-#include <gio/gio.h>
 #include <gio/gdesktopappinfo.h>
 
 static const QString MIMEAPPS_FILE = QDir::homePath() + QString("/.local/share/applications/mimeapps.list");
 
+static const gchar desktopSuffix[] = ".desktop";
+
+struct PreferredAppsMap {
+    const gchar* contentType;
+    const gchar* const* applications;
+};
+
+static const gchar* preferredBrowsers[] = {
+    "firefox",
+    "chromium-browser",
+    "epiphany-browser",
+    "midori",
+    NULL
+};
+
+static const gchar* preferredPhotoApps[] = {
+    "shotwell-viewer",
+    "f-spot",
+    "gthumb",
+    "gwenview",
+    "eog",
+    NULL
+};
+
+static const gchar* preferredMailApps[] = {
+    "evolution",
+    "thunderbird",
+    "claws-mail",
+    "kmail",
+    NULL
+};
+
+static const gchar* preferredMusicApps[] = {
+    "banshee",
+    "rhythmbox",
+    "totem",
+    "vlc",
+    NULL
+};
+
+static const PreferredAppsMap preferredAppsMap[] = {
+    { "x-scheme-handler/http", preferredBrowsers },
+    { "image/jpeg", preferredPhotoApps },
+    { "x-scheme-handler/mailto", preferredMailApps },
+    { "audio/x-vorbis+ogg", preferredMusicApps },
+    { NULL, NULL }
+};
+
 GioDefaultApplication::GioDefaultApplication(QObject* parent)
     : QObject(parent),
       m_contentType(""),
@@ -88,13 +135,88 @@
     updateDesktopFile();
 }
 
+const gchar* const* GioDefaultApplication::preferredAppsForType(
+    const gchar* contentType)
+{
+    for (int i = 0; preferredAppsMap[i].contentType != NULL; i++) {
+        if (strcmp(contentType, preferredAppsMap[i].contentType) == 0) {
+            return preferredAppsMap[i].applications;
+        }
+    }
+    return NULL;
+}
+
+GAppInfo* GioDefaultApplication::findApplication(const gchar* application,
+                                                 GList* list)
+{
+    while (list != NULL) {
+        GAppInfo* appInfo = (GAppInfo*) list->data;
+        gchar* appId = g_strdup(g_app_info_get_id(appInfo));
+
+        // the returned Id has the .desktop suffix: strip it
+        if (g_str_has_suffix(appId, desktopSuffix)) {
+            appId[strlen(appId) - sizeof(desktopSuffix) + 1] = '\0';
+        }
+
+        gboolean found = (g_strcmp0(appId, application) == 0);
+        g_free(appId);
+
+        if (found) {
+            return appInfo;
+        }
+
+        list = list->next;
+    }
+    return NULL;
+}
+
+GAppInfo* GioDefaultApplication::appInfo() const
+{
+    GAppInfo* appInfo = NULL;
+    QByteArray byteArray = m_contentType.toUtf8();
+    gchar* contentType = byteArray.data();
+
+    /* We could just call g_app_info_get_default_for_type(), but
+     * unfortunately there is no UI to set the default application yet.
+     * This causes obvious problems, such as
+     * https://bugs.launchpad.net/unity-2d/+bug/822605
+     *
+     * So, for those content types which we care about, get the list of all
+     * possible handlers and pick the one which scores best according to a
+     * hardcoded priority.
+     */
+    const gchar* const* preferredApps = preferredAppsForType(contentType);
+    if (preferredApps != NULL) {
+        GList* allApps = g_app_info_get_all_for_type(contentType);
+
+        for (int i = 0; preferredApps[i] != NULL; i++) {
+            /* if the preferred app is in the list of available apps, return
+             * that one */
+            appInfo = findApplication(preferredApps[i], allApps);
+            if (appInfo != NULL) {
+                /* This is the application we want to use; add a reference to
+                 * the GAppInfo object, to avoid it getting destroyed when we
+                 * free the whole list.
+                 */
+                g_object_ref(appInfo);
+                break;
+            }
+        }
+        g_list_free_full(allApps, g_object_unref);
+    }
+
+    if (appInfo == NULL) {
+        appInfo = g_app_info_get_default_for_type(contentType, false);
+    }
+
+    return appInfo;
+}
+
 void GioDefaultApplication::updateDesktopFile()
 {
     GObjectScopedPointer<GAppInfo> app_info;
-    QByteArray byte_array = m_contentType.toUtf8();
-    gchar *content_type = byte_array.data();
+    app_info.reset(appInfo());
 
-    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-08-26 08:37:26 +0000
@@ -20,9 +20,13 @@
 #ifndef GIODEFAULTAPPLICATION_H
 #define GIODEFAULTAPPLICATION_H
 
+// Qt
 #include <QObject>
 #include <QString>
 
+// gio
+#include <gio/gio.h>
+
 class QFileSystemWatcher;
 
 /* Wrapper around GIO's g_app_info_get_default_for_type.
@@ -54,6 +58,11 @@
     Q_SLOT void updateDesktopFile();
     Q_SLOT void onMimeappsFileChanged();
 
+    static GAppInfo* findApplication(const gchar* application,
+                                     GList* list);
+    static const gchar* const* preferredAppsForType(const gchar* contentType);
+    GAppInfo* appInfo() const;
+
     QString m_contentType;
     QString m_desktopFile;
     QFileSystemWatcher* m_mimeappsWatcher;