Merge lp:~osomon/unity-2d/webfavs into lp:unity-2d/0.4

[Florian Boucault]

[launcher] Add web favorites support.

Web pages can be bookmarked in the launcher like other favorite applications. They will open in the default browser.
Two mechanisms are provided to favorite a web page:
 - drag’n’drop a URL from your browser’s address bar to the launcher (tested with firefox and chromium)
 - a DBus API that accepts a URL string as parameter (interface: com.canonical.Unity2d.Launcher).

The full URL, including the scheme (e.g. "http://") must be provided.

Browser plugins could be implemented to bookmark the current page using the DBus API.

This branch implements web favorites support (bug #669926).

See details of the functionality implemented in the commit message.

[lp:~osomon/unity-2d/webfavs]

373. By Olivier Tilloy on 2011-01-22

Cope with chromium’s unfriendly handling of drag events
in order to accept URLs dragged from its address bar as web favorites.

374. By Olivier Tilloy on 2011-01-22

Enclose the URL in double quotes in the desktop file.
This fixes opening web favorites with a fragment in the URL.

375. By Olivier Tilloy on 2011-01-22

Cope with badly configured web servers that don’t return error codes on non-existing files.
If the data is not an actual image, try the next one.

[Florian Boucault (fboucault)]

I get a SEGFAULT in a special case.

Steps to reproduce:
1. Add a webfav
2. Add the same webfav again
3. Remove the second webfav

review: Needs Fixing (functional)

[lp:~osomon/unity-2d/webfavs]

376. By Olivier Tilloy on 2011-01-31

Made the web scrapper a child object of the application, so if the application is deleted (i.e. removed from the launcher)
before the scrapping is complete, the launcher won’t segfault.

[Olivier Tilloy (osomon)]

Fixed in revision 376.
The actual issue was not with duplicate web favorites, but with deleting a favorite before its icon had been fetched.

[Florian Boucault (fboucault)]

static const QString REL_STORE = ".local/share/applications/";

don't use abbreviations. In this case, you don't need REL_STORE at all, get rid of it.

review: Needs Fixing

[Florian Boucault (fboucault)]

In LauncherApplicationsList::slotWebscrapperFinished:

don't use abbreviation:

        gboolean res = [...]

review: Needs Fixing

[Florian Boucault (fboucault)]

Duplicated code detected inn LauncherApplicationsList::insertWebFavorite and LauncherApplicationsList::slotWebscrapperFinished:

    QFile file(desktop_file);
    file.open(QIODevice::WriteOnly);
    file.write(contents.toUtf8());
    file.close();

[...]

    QFile file(filename);
    file.open(QIODevice::WriteOnly);
    file.write(contents);
    file.close();

And that duplication has a delta:

    file.write(contents.toUtf8());

vs.

    file.write(contents);

review: Needs Fixing

[Florian Boucault (fboucault)]

In LauncherApplicationsList::slotWebscrapperFinished:

application->setDesktopFile(filename);

does not seem necessary since application has already the same desktop filename set. I suppose it's a hack to workaround a bug. Please document it.

review: Needs Fixing

[Florian Boucault (fboucault)]

In webscrapper.cpp same remark as above for REL_ICON_STORE, drop REL_ICON_STORE and rename ABS_ICON_STORE into ICON_STORE.

review: Needs Fixing

[lp:~osomon/unity-2d/webfavs]

377. By Olivier Tilloy on 2011-01-31

Cosmetics: renamed a local variable to a more evocative name.

378. By Olivier Tilloy on 2011-01-31

Simplified the code that checks for the existence of specific directories in $HOME/.local/share/ a good deal.

379. By Olivier Tilloy on 2011-01-31

Comment to explain a hack.

[Florian Boucault (fboucault)]

webscrapper's functionality is probably implemented in QWebSettings::iconForUrl but it seems that using it would have a couple of drawbacks:
- dependency on libqtwebkit
- possible bugs: https://bugs.webkit.org/show_bug.cgi?id=29440

[lp:~osomon/unity-2d/webfavs]

380. By Olivier Tilloy on 2011-01-31

Factor out some common code that writes a desktop file to disk.

[Olivier Tilloy (osomon)]

I ruled out the dependency on QtWebkit from the beginning as it seemed like a huge one for little benefits (all the more so if it has bugs which we’d need to work around).

[lp:~osomon/unity-2d/webfavs]

381. By Olivier Tilloy on 2011-01-31

Major refactoring to isolate all the code related to web favorites in its own class.
WebScrapper was renamed to WebFavorite.

Missing bit: the Applications need to monitor their desktop files for changes,k
the hack that was in place to avoid this has been removed.

382. By Olivier Tilloy on 2011-01-31

Applications now monitor their desktop file for live changes.
This fixes the deferred update of the icon and name of web favorites.

383. By Olivier Tilloy on 2011-01-31

Remove some useless leftover includes.

384. By Olivier Tilloy on 2011-01-31

Do not check for null-ness, delete does it already.

[Florian Boucault (fboucault)]

Looks pretty good.

Make LauncherApplication::setDesktopPath a Q_SLOT and get rid of LauncherApplication::slotDesktopFileChanged

More comments to come.

review: Needs Fixing

[lp:~osomon/unity-2d/webfavs]

385. By Olivier Tilloy on 2011-02-01

Make LauncherApplication::setDesktopFile(…) a public slot, so it can be directly invoked
when the file system watcher detects that the desktop file has changed.

[Florian Boucault (fboucault)]

14:32 < Kaleo> oSoMoN: I don't know if you tried but changing contents in a desktop file displayed in the launcher does not work really well
14:32 < Kaleo> oSoMoN: for example I take gcalctool's desktop file
14:32 < Kaleo> oSoMoN: change the icon or description or exec string
14:32 < Kaleo> oSoMoN: and nothing seems to really get updated

[Florian Boucault (fboucault)]

I get a SEGFAULT in a special case.

Steps to reproduce:
1. Add a webfav
3. Remove the webfav *before* the favicon and title have been retrieved

review: Needs Fixing

[lp:~osomon/unity-2d/webfavs]

386. By Olivier Tilloy on 2011-02-07

Fix desktop file monitoring in various tricky cases, including a potential bug in QT.
This is largely documented.

387. By Olivier Tilloy on 2011-02-07

When a desktop file is deleted, remove the corresponding application from the launcher.

[Olivier Tilloy (osomon)]

All the issues introduced with the major refactoring (see revision 381) should now be fixed.

As a bonus, applications now monitor their desktop files for changes and update their attributes accordingly. If a desktop file is deleted (which may happen for example when a package is removed), the corresponding launcher entry will be removed from favorites, and removed from the launcher if not running.

Please test again and review the changes.

[lp:~osomon/unity-2d/webfavs]

388. By Olivier Tilloy on 2011-02-07

Merge the latest changes from the trunk, resolving conflicts in launcher/app/launcher.cpp.

[Florian Boucault (fboucault)]

Issues with commits 386 and 387:

- emitting desktopFileChanged with an empty string when the property's value has not really changed is misleading and will cause trouble in the future.
- signal handlers (slot methods) should not be prefixed 'slot'; 'on' is the convention for prefixing signal handlers though it's much better to name the method by what it actually does when possible.
- m_removedDesktopFile seems to always have the same value as desktop_file().
- LauncherApplicationsList already has a protocol to remove applications when needed through the favoriting/sticky property. The additional code of revision 387 is not welcome.

Thinking that will resolve these issues:
Essentially you do _not_ want to touch desktop_file() at all. It is fine for it to point to a non existent file. What needs to happen is to apply the regular treatment for applications that have no desktop files:
- if the application is running then it should be impossible to favorite it and if it is already favorited, then it should be un-favorited
- if the application is not running then it means it is favorited and should be un-favorited

Bottom line: whenever the desktop file's existence changes LauncherApplication::setSticky should be called to be updated.

Implementing that roughly equates to:
- reverting commit 387
- realising that LauncherApplication::slotDesktopFileChanged is in fact about updating the sticky status depending on the existence of the desktop file and should therefore always call setSticky (and be renamed to something that represents that)
- making LauncherApplication::createMenuActions check not only for !desktop_file().isEmpty() but also for the existence of the desktop file

- OPTIONALLY remember the desktop files of the applications that were favorited by the user and monitor the parent folder of the desktop file for their creation and re-add them to the launcher as favorites them when appropriate (that will also avoid implementing the grace period timer for vi & co at the expense of having a tiny visual glitch where the icon disappears and then reappears immediately in the launcher)

review: Needs Fixing

[Olivier Tilloy (osomon)]

I agree on most of your points, I’ll update my code accordingly. Please see my comments below.

> signal handlers (slot methods) should not be prefixed 'slot';
> 'on' is the convention for prefixing signal handlers though
> it's much better to name the method by what it actually does
> when possible.

This convention is not part of the coding guidelines. A quick analysis of the header files shows that the two prefixes currently happily coexist in the trunk:

$ grep -r --include="*.h" "void\ on" * | wc -l
32
$ grep -r --include="*.h" "void\ slot" * | wc -l
19

I agree that it would be better to name the methods according to what they actually do, so I’ll do that.

> OPTIONALLY remember the desktop files of the applications that
> were favorited by the user and monitor the parent folder of the
> desktop file for their creation and re-add them to the launcher
> as favorites them when appropriate (that will also avoid implementing
> the grace period timer for vi & co at the expense of having a tiny
> visual glitch where the icon disappears and then reappears
> immediately in the launcher)

This is by no means a "tiny" visual glitch, it’s rather a major issue that will make the launcher look broken. The grace period is fine, it just delays the removal by one second, which I think is perfectly acceptable. Note that it’s not just "vi & co", it’s also the more frequent use case of an application being upgraded: the new desktop file is copied over the old one, effectively equivalent to the file being removed and then written again.
On top of that, monitoring several directories that may contain several hundreds of desktop files has a cost. And if an application is really removed for good, keeping on monitoring the parent folder of its desktop file is useless.

[Florian Boucault (fboucault)]

> I agree on most of your points, I’ll update my code accordingly. Please see my
> comments below.
>
> > signal handlers (slot methods) should not be prefixed 'slot';
> > 'on' is the convention for prefixing signal handlers though
> > it's much better to name the method by what it actually does
> > when possible.
>
> This convention is not part of the coding guidelines. A quick analysis of the
> header files shows that the two prefixes currently happily coexist in the
> trunk:
>
> $ grep -r --include="*.h" "void\ on" * | wc -l
> 32
> $ grep -r --include="*.h" "void\ slot" * | wc -l
> 19
>
The convention is indeed not in the CODING file though the prefix "on" is in majority in the code base, not only in C++ as you shown already but also in QML:

$ grep -r --include="*.qml" \ on[A-Z] . | wc -l
168

> I agree that it would be better to name the methods according to what they
> actually do, so I’ll do that.

That's the best option indeed.

>
>
> > OPTIONALLY remember the desktop files of the applications that
> > were favorited by the user and monitor the parent folder of the
> > desktop file for their creation and re-add them to the launcher
> > as favorites them when appropriate (that will also avoid implementing
> > the grace period timer for vi & co at the expense of having a tiny
> > visual glitch where the icon disappears and then reappears
> > immediately in the launcher)
>
> This is by no means a "tiny" visual glitch, it’s rather a major issue that
> will make the launcher look broken. The grace period is fine, it just delays
> the removal by one second, which I think is perfectly acceptable. Note that
> it’s not just "vi & co", it’s also the more frequent use case of an
> application being upgraded: the new desktop file is copied over the old one,
> effectively equivalent to the file being removed and then written again.
> On top of that, monitoring several directories that may contain several
> hundreds of desktop files has a cost. And if an application is really removed
> for good, keeping on monitoring the parent folder of its desktop file is
> useless.

I agree. I misread your comment in the code and completely ignored that important case. The timer is therefore not optional.

[lp:~osomon/unity-2d/webfavs]

389. By Olivier Tilloy on 2011-02-08

Merged the latest changes to trunk.

390. By Olivier Tilloy on 2011-02-08

Removed a useless member: m_removedDesktopFile was always equal to desktop_file().

391. By Olivier Tilloy on 2011-02-08

When a desktop file is removed, simply mark the application as not sticky.
The launcher will act accordingly.

392. By Olivier Tilloy on 2011-02-08

Only applications with a valid, existent desktop file can be favorited.

393. By Olivier Tilloy on 2011-02-08

Cosmetics: renamed some slots.

[Florian Boucault (fboucault)]

Olivier, have you pushed everything you wanted to? Can I review?

[Olivier Tilloy (osomon)]

Yes, it is ready for review!

[lp:~osomon/unity-2d/webfavs]

394. By Olivier Tilloy on 2011-02-10

Merge the latest changes from the trunk, resolving several conflicts.

[Olivier Tilloy (osomon)]

Sorry, it turns out recent changes in the trunk prevented this branch from merging correctly, I fixed those issues, it is now really ready for review.

[Florian Boucault (fboucault)]

Good job!

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2011-01-27 16:42:10 +0000
+++ .bzrignore	2011-02-10 08:40:10 +0000
@@ -3,6 +3,8 @@
 
 launcher/UnityApplications/libUnityApplications.so*
 launcher/app/unity-2d-launcher
+launcher/app/launcheradaptor.*
+launcher/app/unity-2d-launcher.service
 launcher/tests/launchermenutest
 launcher/tests/launcherviewtest
 

=== modified file 'debian/unity-2d-launcher.install'
--- debian/unity-2d-launcher.install	2011-01-14 21:41:39 +0000
+++ debian/unity-2d-launcher.install	2011-02-10 08:40:10 +0000
@@ -1,4 +1,5 @@
 usr/bin/unity-2d-launcher
+usr/share/dbus-1/services/unity-2d-launcher.service
 usr/share/applications/unity-2d-launcher.desktop
 usr/share/unity-2d/launcher/*.qml
 usr/share/unity-2d/launcher/launchermenu.css

=== modified file 'launcher/Launcher.qml'
--- launcher/Launcher.qml	2011-02-08 11:33:57 +0000
+++ launcher/Launcher.qml	2011-02-10 08:40:10 +0000
@@ -147,5 +147,11 @@
     Connections {
         target: launcherView
         onDesktopFileDropped: applications.insertFavoriteApplication(path)
+        onWebpageUrlDropped: applications.insertWebFavorite(url)
+    }
+
+    Connections {
+        target: launcherControl
+        onAddWebFavorite: applications.insertWebFavorite(url)
     }
 }

=== modified file 'launcher/UnityApplications/CMakeLists.txt'
--- launcher/UnityApplications/CMakeLists.txt	2011-02-09 10:48:43 +0000
+++ launcher/UnityApplications/CMakeLists.txt	2011-02-10 08:40:10 +0000
@@ -3,6 +3,7 @@
 pkg_check_modules(QTGCONF REQUIRED libqtgconf)
 pkg_check_modules(QTDEE REQUIRED libqtdee)
 pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
+pkg_check_modules(GLIB REQUIRED glib-2.0)
 pkg_check_modules(GDK REQUIRED gdk-2.0)
 pkg_check_modules(GIO REQUIRED gio-2.0)
 pkg_check_modules(WNCK REQUIRED libwnck-1.0)
@@ -21,6 +22,7 @@
     launcherplaceslist.cpp
     trash.cpp
     launchermenu.cpp
+    webfavorite.cpp
     plugin.cpp
     workspaces.cpp
     )
@@ -37,6 +39,7 @@
     launcherplaceslist.h
     trash.h
     launchermenu.h
+    webfavorite.h
     plugin.h
     workspaces.h
     )
@@ -59,6 +62,7 @@
     ${QTGCONF_INCLUDE_DIRS}
     ${QTDEE_INCLUDE_DIRS}
     ${DBUSMENUQT_INCLUDE_DIRS}
+    ${GLIB_INCLUDE_DIRS}
     ${GDK_INCLUDE_DIRS}
     ${GIO_INCLUDE_DIRS}
     ${WNCK_INCLUDE_DIRS}
@@ -72,6 +76,7 @@
     ${QTGCONF_LDFLAGS}
     ${QTDEE_LDFLAGS}
     ${DBUSMENUQT_LDFLAGS}
+    ${GLIB_LDFLAGS}
     ${GDK_LDFLAGS}
     ${GIO_LDFLAGS}
     ${WNCK_LDFLAGS}

=== modified file 'launcher/UnityApplications/launcherapplication.cpp'
--- launcher/UnityApplications/launcherapplication.cpp	2011-02-09 16:44:38 +0000
+++ launcher/UnityApplications/launcherapplication.cpp	2011-02-10 08:40:10 +0000
@@ -39,9 +39,15 @@
 #include <QAction>
 #include <QDBusInterface>
 #include <QDBusReply>
+#include <QFile>
+#include <QFileSystemWatcher>
 
-LauncherApplication::LauncherApplication() :
-    m_application(NULL), m_appInfo(NULL), m_sticky(false), m_has_visible_window(false)
+LauncherApplication::LauncherApplication()
+    : m_application(NULL)
+    , m_desktopFileWatcher(NULL)
+    , m_appInfo(NULL)
+    , m_sticky(false)
+    , m_has_visible_window(false)
 {
     /* Make sure wnck_set_client_type is called only once */
     static bool client_type_set = false;
@@ -174,7 +180,7 @@
 }
 
 void
-LauncherApplication::setDesktopFile(QString desktop_file)
+LauncherApplication::setDesktopFile(const QString& desktop_file)
 {
     QByteArray byte_array = desktop_file.toUtf8();
     gchar *file = byte_array.data();
@@ -200,6 +206,73 @@
         emit nameChanged(name());
         emit iconChanged(icon());
     }
+
+    monitorDesktopFile(this->desktop_file());
+}
+
+void
+LauncherApplication::monitorDesktopFile(const QString& path)
+{
+    /* Monitor the desktop file for live changes */
+    if (m_desktopFileWatcher == NULL) {
+        m_desktopFileWatcher = new QFileSystemWatcher(this);
+        connect(m_desktopFileWatcher, SIGNAL(fileChanged(const QString&)),
+                SLOT(onDesktopFileChanged(const QString&)));
+    }
+
+    /* If the file is already being monitored, we shouldn’t need to do anything.
+       However it seems that in some cases, a change to the file will stop
+       emiting further fileChanged signals, despite the file still being in the
+       list of monitored files. This is the case when the desktop file is being
+       edited in gedit for example. This may be a bug in QT itself.
+       To work around this issue, remove the path and add it again. */
+    if (m_desktopFileWatcher->files().contains(path)) {
+        m_desktopFileWatcher->removePath(path);
+    }
+    m_desktopFileWatcher->addPath(path);
+}
+
+void
+LauncherApplication::onDesktopFileChanged(const QString& path)
+{
+    if (m_desktopFileWatcher->files().contains(path) || QFile::exists(path)) {
+        /* The contents of the file have changed. */
+        setDesktopFile(path);
+    }
+    else {
+        /* The desktop file has been deleted.
+           This can happen in a number of cases:
+            - the package it belongs to has been uninstalled
+            - the package it belongs to has been upgraded, in which case it is
+              likely that the desktop file has been removed and a new version of
+              it has been installed in place of the old version
+            - the file has been written to using an editor that first saves to a
+              temporary file and then moves this temporary file to the
+              destination file, which effectively results in the file being
+              temporarily deleted (vi for example does that, whereas gedit
+              doesn’t)
+           In the first case, we want to remove the application from the
+           launcher. In the last two cases, we need to consider that the desktop
+           file’s contents have changed. At this point there is no way to be
+           sure that the file has been permanently removed, so we want to give
+           the application a grace period before checking for real deletion. */
+        QTimer::singleShot(1000, this, SLOT(checkDesktopFileReallyRemoved()));
+    }
+}
+
+void
+LauncherApplication::checkDesktopFileReallyRemoved()
+{
+    QString path = desktop_file();
+    if (QFile::exists(path)) {
+        /* The desktop file hasn’t really been removed, it was only temporarily
+           deleted. */
+        setDesktopFile(path);
+    }
+    else {
+        /* The desktop file has really been removed. */
+        setSticky(false);
+    }
 }
 
 void
@@ -610,7 +683,7 @@
     bool is_running = running();
 
     /* Only applications with a corresponding desktop file can be kept in the launcher */
-    if (!desktop_file().isEmpty()) {
+    if (QFile::exists(desktop_file())) {
         QAction* keep = new QAction(m_menu);
         keep->setCheckable(is_running);
         keep->setChecked(sticky());

=== modified file 'launcher/UnityApplications/launcherapplication.h'
--- launcher/UnityApplications/launcherapplication.h	2011-02-09 16:44:38 +0000
+++ launcher/UnityApplications/launcherapplication.h	2011-02-10 08:40:10 +0000
@@ -32,6 +32,7 @@
 #include "bamf-application.h"
 
 class DBusMenuImporter;
+class QFileSystemWatcher;
 
 class LauncherApplication : public LauncherItem
 {
@@ -62,8 +63,8 @@
     bool has_visible_window() const;
 
     /* setters */
+    void setDesktopFile(const QString& desktop_file);
     void setSticky(bool sticky);
-    void setDesktopFile(QString desktop_file);
     void setBamfApplication(BamfApplication *application);
 
     /* methods */
@@ -106,8 +107,12 @@
     void slotChildRemoved(BamfView*);
     void onIndicatorMenuUpdated();
 
+    void onDesktopFileChanged(const QString&);
+    void checkDesktopFileReallyRemoved();
+
 private:
     BamfApplication *m_application;
+    QFileSystemWatcher *m_desktopFileWatcher;
     GDesktopAppInfo *m_appInfo;
     bool m_sticky;
     int m_priority;
@@ -117,6 +122,7 @@
     int m_indicatorMenusReady;
 
     void updateBamfApplicationDependentProperties();
+    void monitorDesktopFile(const QString&);
     void fetchIndicatorMenus();
     void createStaticMenuActions();
     int windowCountOnCurrentWorkspace();

=== modified file 'launcher/UnityApplications/launcherapplicationslist.cpp'
--- launcher/UnityApplications/launcherapplicationslist.cpp	2011-01-15 01:41:03 +0000
+++ launcher/UnityApplications/launcherapplicationslist.cpp	2011-02-10 08:40:10 +0000
@@ -16,6 +16,7 @@
 
 #include "launcherapplication.h"
 #include "launcherapplicationslist.h"
+#include "webfavorite.h"
 
 #include "bamf-matcher.h"
 #include "bamf-application.h"
@@ -129,6 +130,22 @@
 }
 
 void
+LauncherApplicationsList::insertWebFavorite(const QUrl& url)
+{
+    if (!url.isValid() || url.isRelative()) {
+        qWarning() << "Invalid URL:" << url;
+        return;
+    }
+
+    LauncherApplication* application = new LauncherApplication;
+    WebFavorite* webfav = new WebFavorite(url, application);
+
+    application->setDesktopFile(webfav->desktopFile());
+    insertApplication(application);
+    application->setSticky(true);
+}
+
+void
 LauncherApplicationsList::load()
 {
     /* FIXME: applications should be sorted depending on their priority */

=== modified file 'launcher/UnityApplications/launcherapplicationslist.h'
--- launcher/UnityApplications/launcherapplicationslist.h	2011-01-15 01:41:03 +0000
+++ launcher/UnityApplications/launcherapplicationslist.h	2011-02-10 08:40:10 +0000
@@ -21,6 +21,7 @@
 #include <QList>
 #include <QVariant>
 #include <QString>
+#include <QUrl>
 #include <QObject>
 #include <QtDeclarative/qdeclarative.h>
 
@@ -40,6 +41,7 @@
     int rowCount(const QModelIndex & parent = QModelIndex()) const;
 
     Q_INVOKABLE void insertFavoriteApplication(QString desktop_file);
+    Q_INVOKABLE void insertWebFavorite(const QUrl& url);
 
 private:
     void load();

=== added file 'launcher/UnityApplications/webfavorite.cpp'
--- launcher/UnityApplications/webfavorite.cpp	1970-01-01 00:00:00 +0000
+++ launcher/UnityApplications/webfavorite.cpp	2011-02-10 08:40:10 +0000
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Olivier Tilloy <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <glib.h>
+
+#include "webfavorite.h"
+
+#include <QDir>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkRequest>
+#include <QtNetwork/QNetworkReply>
+#include <QRegExp>
+#include <QPixmap>
+#include <QCryptographicHash>
+
+static const QString WEBFAV_STORE = QDir::homePath() + "/.local/share/applications/";
+static const QString ICON_STORE = QDir::homePath() + "/.local/share/icons/";
+
+static void check_store_exists(const QString& path)
+{
+    if (!QDir(path).exists()) {
+        QDir().mkpath(path);
+    }
+}
+
+#define check_webfav_store_exists() check_store_exists(WEBFAV_STORE)
+#define check_icon_store_exists() check_store_exists(ICON_STORE)
+
+static const QString WEBFAV_DESKTOP_ENTRY =
+    "[Desktop Entry]\n"
+    "Version=1.0\n"
+    "Name={name}\n"
+    "Exec=xdg-open \"{url}\"\n"
+    "Type=Application\n"
+    "Icon=emblem-web\n"
+    "Categories=Network;\n"
+    "MimeType=text/html;\n"
+    "StartupNotify=true\n";
+
+static const uint MAX_REDIRECTS = 6;
+
+WebFavorite::WebFavorite(const QUrl& url, QObject* parent)
+    : QObject(parent)
+    , m_url(url)
+    , m_redirects(0)
+{
+    m_desktopFile = WEBFAV_STORE + "webfav-" + computeUrlHash(url) + ".desktop";
+
+    QString contents = WEBFAV_DESKTOP_ENTRY;
+    QByteArray encoded = url.toEncoded();
+    contents.replace("{name}", encoded);
+    contents.replace("{url}", encoded);
+    writeDesktopFile(contents.toUtf8());
+
+    fetchPage();
+}
+
+WebFavorite::~WebFavorite()
+{
+}
+
+const QString&
+WebFavorite::desktopFile() const
+{
+    return m_desktopFile;
+}
+
+void
+WebFavorite::writeDesktopFile(const QByteArray& contents) const
+{
+    check_webfav_store_exists();
+    QFile file(m_desktopFile);
+    file.open(QIODevice::WriteOnly);
+    file.write(contents);
+    file.close();
+}
+
+void
+WebFavorite::modifyDesktopFile(const QString& key, const QString& value) const
+{
+    GKeyFile* keyFile = g_key_file_new();
+    gboolean loaded = g_key_file_load_from_file(keyFile, m_desktopFile.toUtf8().constData(),
+        (GKeyFileFlags) (G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS), NULL);
+    if (loaded) {
+        g_key_file_set_string(keyFile, "Desktop Entry", key.toUtf8().constData(), value.toUtf8().constData());
+        QByteArray contents = g_key_file_to_data(keyFile, NULL, NULL);
+        g_key_file_free(keyFile);
+        writeDesktopFile(contents);
+    }
+}
+
+void
+WebFavorite::fetchPage()
+{
+    QNetworkAccessManager* manager = new QNetworkAccessManager(this);
+    connect(manager, SIGNAL(finished(QNetworkReply*)),
+            SLOT(slotFetchPageFinished(QNetworkReply*)));
+    manager->get(QNetworkRequest(m_url));
+}
+
+void
+WebFavorite::slotFetchPageFinished(QNetworkReply* reply)
+{
+    QNetworkAccessManager* manager = static_cast<QNetworkAccessManager*>(sender());
+
+    if (reply->error() == QNetworkReply::NoError) {
+        QVariant redirect = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
+        if (redirect.isValid()) {
+            m_redirects++;
+            if (m_redirects < MAX_REDIRECTS) {
+                m_url = redirect.toUrl();
+                fetchPage();
+            }
+        }
+        else {
+            QString data = QString::fromUtf8(reply->readAll());
+
+            /* lookup title */
+            QRegExp reTitle("<title>(.*)</title>", Qt::CaseInsensitive);
+            int index = reTitle.indexIn(data);
+            if (index != -1) {
+                modifyDesktopFile("Name", reTitle.cap(1).simplified());
+            }
+
+            /* lookup favicons */
+            QRegExp reFavicon1("<link rel=\"apple-touch-icon\".*href=\"(.*)\"", Qt::CaseInsensitive);
+            reFavicon1.setMinimal(true);
+            index = reFavicon1.indexIn(data);
+            if (index != -1) {
+                m_favicons << reFavicon1.cap(1);
+            }
+            QRegExp reFavicon2("<link rel=\"(shortcut )?icon\".*href=\"(.*)\"", Qt::CaseInsensitive);
+            reFavicon2.setMinimal(true);
+            index = reFavicon2.indexIn(data);
+            if (index != -1) {
+                m_favicons << reFavicon2.cap(2);
+            }
+            m_favicons << "/apple-touch-icon.png";
+            m_favicons << "/favicon.ico";
+
+            m_current_favicon = m_favicons.begin();
+            m_redirects = 0;
+            tryNextFavicon();
+        }
+    }
+
+    reply->deleteLater();
+    manager->deleteLater();
+}
+
+void
+WebFavorite::tryNextFavicon()
+{
+    if (m_current_favicon == m_favicons.end()) {
+        return;
+    }
+
+    QUrl url(*m_current_favicon);
+    if (url.isRelative()) {
+        url = m_url.resolved(url);
+    }
+
+    QNetworkAccessManager* manager = new QNetworkAccessManager(this);
+    connect(manager, SIGNAL(finished(QNetworkReply*)),
+            SLOT(slotFetchFaviconFinished(QNetworkReply*)));
+    manager->get(QNetworkRequest(url));
+}
+
+void
+WebFavorite::slotFetchFaviconFinished(QNetworkReply* reply)
+{
+    QNetworkAccessManager* manager = static_cast<QNetworkAccessManager*>(sender());
+
+    if (reply->error() == QNetworkReply::NoError) {
+        QVariant redirect = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
+        if (redirect.isValid()) {
+            m_redirects++;
+            if (m_redirects < MAX_REDIRECTS) {
+                *m_current_favicon = redirect.toUrl().toEncoded();
+            }
+            else {
+                m_current_favicon++;
+                m_redirects = 0;
+            }
+            tryNextFavicon();
+        }
+        else {
+            /* Check that the data is actually an image. This will cope with
+               badly configured web servers that don’t return error codes on
+               non-existing files. */
+            QPixmap pixmap;
+            bool valid = pixmap.loadFromData(reply->readAll());
+            if (valid) {
+                check_icon_store_exists();
+                QUrl url = reply->url();
+                QString filepath = ICON_STORE + computeUrlHash(url);
+                QString extension = url.path().mid(url.path().lastIndexOf("."));
+                QString filename = filepath + extension;
+                pixmap.save(filename);
+                modifyDesktopFile("Icon", filename);
+            }
+            else {
+                m_current_favicon++;
+                m_redirects = 0;
+                tryNextFavicon();
+            }
+        }
+    }
+    else {
+        m_current_favicon++;
+        m_redirects = 0;
+        tryNextFavicon();
+    }
+
+    reply->deleteLater();
+    manager->deleteLater();
+}
+
+QString
+WebFavorite::computeUrlHash(const QUrl& url)
+{
+    return QCryptographicHash::hash(url.toEncoded(), QCryptographicHash::Md5).toHex().constData();
+}
+

=== added file 'launcher/UnityApplications/webfavorite.h'
--- launcher/UnityApplications/webfavorite.h	1970-01-01 00:00:00 +0000
+++ launcher/UnityApplications/webfavorite.h	2011-02-10 08:40:10 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Olivier Tilloy <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef WebFavorite_H
+#define WebFavorite_H
+
+#include <QObject>
+#include <QUrl>
+#include <QString>
+#include <QStringList>
+
+class QNetworkReply;
+
+class WebFavorite : public QObject
+{
+    Q_OBJECT
+
+public:
+    WebFavorite(const QUrl& url, QObject* parent=0);
+    ~WebFavorite();
+
+    const QString& desktopFile() const;
+
+private:
+    QUrl m_url;
+    QString m_desktopFile;
+
+    uint m_redirects;
+    QStringList m_favicons;
+    QStringList::iterator m_current_favicon;
+
+    static QString computeUrlHash(const QUrl& url);
+
+    void writeDesktopFile(const QByteArray& contents) const;
+    void modifyDesktopFile(const QString& key, const QString& value) const;
+
+    void fetchPage();
+    void tryNextFavicon();
+
+private Q_SLOTS:
+    void slotFetchPageFinished(QNetworkReply*);
+    void slotFetchFaviconFinished(QNetworkReply*);
+};
+
+#endif // WebFavorite_H
+

=== modified file 'launcher/app/CMakeLists.txt'
--- launcher/app/CMakeLists.txt	2011-02-07 22:19:04 +0000
+++ launcher/app/CMakeLists.txt	2011-02-10 08:40:10 +0000
@@ -5,19 +5,28 @@
 # Sources
 set(launcher_SRCS
     launcherview.cpp
+    launchercontrol.cpp
     )
 
 set(launcher_MOC_HDRS
     launcherview.h
+    launchercontrol.h
     )
 
 qt4_wrap_cpp(launcher_MOC_SRCS ${launcher_MOC_HDRS})
 
+configure_file(unity-2d-launcher.service.in unity-2d-launcher.service)
+
+qt4_add_dbus_adaptor(launcher_SRCS launcher.xml
+    launchercontrol.h LauncherControl
+    )
+
 # Build
 add_library(uqlauncher ${launcher_SRCS} ${launcher_MOC_SRCS})
 add_executable(unity-2d-launcher launcher.cpp)
 
 include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${GTK_INCLUDE_DIRS}
     ${X11_INCLUDE_DIRS}
@@ -27,6 +36,7 @@
 target_link_libraries(uqlauncher
     ${QT_QTCORE_LIBRARIES}
     ${QT_QTGUI_LIBRARIES}
+    ${QT_QTDBUS_LIBRARIES}
     ${QT_QTDECLARATIVE_LIBRARIES}
     ${GTK_LDFLAGS}
     ${X11_LDFLAGS}
@@ -44,3 +54,8 @@
 install(FILES unity-2d-launcher.desktop
     DESTINATION share/applications
     )
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-2d-launcher.service
+    DESTINATION share/dbus-1/services
+    )
+

=== modified file 'launcher/app/launcher.cpp'
--- launcher/app/launcher.cpp	2011-02-07 22:19:04 +0000
+++ launcher/app/launcher.cpp	2011-02-10 08:40:10 +0000
@@ -31,6 +31,7 @@
 
 #include "config.h"
 #include "launcherview.h"
+#include "launchercontrol.h"
 #include "unity2dpanel.h"
 
 int main(int argc, char *argv[])
@@ -81,6 +82,11 @@
 
     launcherView->rootContext()->setContextProperty("launcherView", launcherView);
     launcherView->rootContext()->setContextProperty("panel", &panel);
+
+    LauncherControl control;
+    launcherView->rootContext()->setContextProperty("launcherControl", &control);
+    control.connectToBus();
+
     launcherView->setSource(QUrl("./Launcher.qml"));
 
     /* Composing the QML declarative view inside the panel */

=== added file 'launcher/app/launcher.xml'
--- launcher/app/launcher.xml	1970-01-01 00:00:00 +0000
+++ launcher/app/launcher.xml	2011-02-10 08:40:10 +0000
@@ -0,0 +1,22 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
+    <dox:d><![CDATA[
+      @mainpage
+
+      An interface to activate the launcher in Unity2d.
+    ]]></dox:d>
+    <interface name="com.canonical.Unity2d.Launcher" xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
+        <dox:d>
+          An interface to activate the launcher in Unity2d.
+        </dox:d>
+        <method name="AddWebFavorite">
+            <dox:d><![CDATA[
+               Request a URL to be added to the launcher as a web favorite.
+            ]]></dox:d>
+            <arg name="url" type="s" direction="in">
+                <dox:d>The URL to be favorited.</dox:d>
+            </arg>
+        </method>
+    </interface>
+</node>
+

=== added file 'launcher/app/launchercontrol.cpp'
--- launcher/app/launchercontrol.cpp	1970-01-01 00:00:00 +0000
+++ launcher/app/launchercontrol.cpp	2011-02-10 08:40:10 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Olivier Tilloy <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "launchercontrol.h"
+#include "launcheradaptor.h"
+
+#include <QtDBus/QDBusConnection>
+
+static const char* LAUNCHER_DBUS_SERVICE = "com.canonical.Unity2d.Launcher";
+static const char* LAUNCHER_DBUS_OBJECT_PATH = "/Launcher";
+
+LauncherControl::LauncherControl(QObject* parent) : QObject(parent)
+{
+}
+
+LauncherControl::~LauncherControl()
+{
+    QDBusConnection::sessionBus().unregisterService(LAUNCHER_DBUS_SERVICE);
+}
+
+bool
+LauncherControl::connectToBus()
+{
+    bool ok = QDBusConnection::sessionBus().registerService(LAUNCHER_DBUS_SERVICE);
+    if (!ok) {
+        return false;
+    }
+    new LauncherAdaptor(this);
+    QDBusConnection::sessionBus().registerObject(LAUNCHER_DBUS_OBJECT_PATH, this);
+
+    return true;
+}
+
+void
+LauncherControl::AddWebFavorite(const QString& url)
+{
+    Q_EMIT addWebFavorite(url);
+}
+

=== added file 'launcher/app/launchercontrol.h'
--- launcher/app/launchercontrol.h	1970-01-01 00:00:00 +0000
+++ launcher/app/launchercontrol.h	2011-02-10 08:40:10 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * Authors:
+ *  Olivier Tilloy <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LauncherControl_H
+#define LauncherControl_H
+
+#include <QtCore/QObject>
+#include <QtDBus/QDBusContext>
+#include <QtDeclarative/qdeclarative.h>
+
+class LauncherControl : public QObject, protected QDBusContext
+{
+    Q_OBJECT
+
+public:
+    explicit LauncherControl(QObject* parent=0);
+    ~LauncherControl();
+
+    bool connectToBus();
+
+public Q_SLOTS:
+    Q_NOREPLY void AddWebFavorite(const QString& url);
+
+Q_SIGNALS:
+    void addWebFavorite(const QString& url);
+};
+
+QML_DECLARE_TYPE(LauncherControl)
+
+#endif // LauncherControl_H
+

=== modified file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2011-01-28 01:56:32 +0000
+++ launcher/app/launcherview.cpp	2011-02-10 08:40:10 +0000
@@ -38,14 +38,48 @@
     setAcceptDrops(true);
 }
 
+QList<QUrl>
+LauncherView::getEventUrls(QDropEvent* event)
+{
+    const QMimeData* mimeData = event->mimeData();
+    if (mimeData->hasUrls()) {
+        return mimeData->urls();
+    }
+    else if (mimeData->hasText()) {
+        /* When dragging an URL from firefox’s address bar, it is properly
+           recognized as such by the event. However, the same doesn’t work
+           for chromium: the URL is recognized as plain text.
+           We cope with this unfriendly behaviour by trying to build a URL out
+           of the text. This assumes there’s only one URL. */
+        QString text = mimeData->text();
+        QUrl url(text);
+        if (url.isRelative()) {
+            /* On top of that, chromium sometimes chops off the scheme… */
+            url = QUrl("http://" + text);
+        }
+        if (url.isValid()) {
+            QList<QUrl> urls;
+            urls.append(url);
+            return urls;
+        }
+    }
+
+    return QList<QUrl>();
+}
+
 void LauncherView::dragEnterEvent(QDragEnterEvent *event)
 {
-    // Check that data has a list of URLs and that at least one is
-    // a desktop file.
-    if (!event->mimeData()->hasUrls()) return;
-
-    foreach (QUrl url, event->mimeData()->urls()) {
-        if (url.scheme() == "file" && url.path().endsWith(".desktop")) {
+    // Check that data has a list of URLs and that at least one is either
+    // a desktop file or a web page.
+    QList<QUrl> urls = getEventUrls(event);
+
+    if (urls.isEmpty()) {
+        return;
+    }
+
+    foreach (QUrl url, urls) {
+        if ((url.scheme() == "file" && url.path().endsWith(".desktop")) ||
+            url.scheme().startsWith("http")) {
             event->acceptProposedAction();
             break;
         }
@@ -61,11 +95,16 @@
 {
     bool accepted = false;
 
-    foreach (QUrl url, event->mimeData()->urls()) {
+    QList<QUrl> urls = getEventUrls(event);
+    foreach (QUrl url, urls) {
         if (url.scheme() == "file" && url.path().endsWith(".desktop")) {
             emit desktopFileDropped(url.path());
             accepted = true;
         }
+        else if (url.scheme().startsWith("http")) {
+            emit webpageUrlDropped(url);
+            accepted = true;
+        }
     }
 
     if (accepted) event->accept();

=== modified file 'launcher/app/launcherview.h'
--- launcher/app/launcherview.h	2011-01-28 01:56:32 +0000
+++ launcher/app/launcherview.h	2011-02-10 08:40:10 +0000
@@ -21,6 +21,7 @@
 #define LAUNCHERVIEW
 
 #include <QDeclarativeView>
+#include <QUrl>
 #include <QDragEnterEvent>
 
 class LauncherView : public QDeclarativeView
@@ -33,8 +34,11 @@
 
 signals:
     void desktopFileDropped(QString path);
+    void webpageUrlDropped(const QUrl& url);
 
 private:
+    QList<QUrl> getEventUrls(QDropEvent*);
+
     void dragEnterEvent(QDragEnterEvent *event);
     void dropEvent(QDropEvent *event);
     void dragMoveEvent(QDragMoveEvent *event);

=== added file 'launcher/app/unity-2d-launcher.service.in'
--- launcher/app/unity-2d-launcher.service.in	1970-01-01 00:00:00 +0000
+++ launcher/app/unity-2d-launcher.service.in	2011-02-10 08:40:10 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.canonical.Unity2d.Launcher
+Exec=@CMAKE_INSTALL_PREFIX@/bin/unity-2d-launcher