Merge lp:~junrrein/pantheon-files/progressuihandler-to-vala into lp:~elementary-apps/pantheon-files/trunk

[Julián Unrrein]

Port marlin-progress-ui-handler to Vala, also fixing bug #1208994.

Port marlin-progress-ui-handler to Vala, and fix bug #1208994 in the process.

What needs to be tested is basically the notification policy for in-progress files operations. Taken from the code:

    /* Our policy for showing progress notification is the following:
     * - File operations that end within two seconds do not get notified in any way.
     * - If no file operations are running, and one passes the two seconds
     * timeout, a window is displayed with the progress.
     * - If the window is closed, we show a resident notification, or a status icon, depending on
     * the capabilities of the notification daemon running in the session.
     * - If some file operations are running, and another one passes the two seconds
     * timeout, and the window is showing, we add it to the window directly.
     * - In the same case, but when the window is not showing, we update the resident
     * notification, changing its message, or the status icon's tooltip.
     * - When one file operation finishes, if it's not the last one, we only update the
     * resident notification's message, or the status icon's tooltip.
     * - In the same case, if it's the last one, we close the resident notification,
     * or the status icon, and trigger a transient one.
     * - In the same case, but the window was showing, we just hide the window.
     */

[Cody Garver (codygarver)]

Testing went normally.

review: Approve

[David Gomes (davidgomes)]

Newline after 360, 381, 431, 441. I'll also be testing this and the other branches under Unity of course.

review: Needs Fixing

[David Gomes (davidgomes)]

>/home/david/src/pantheon-files/unity-quicklist-to-vala/src/marlin-places-sidebar.c:34:25: fatal error: marlin-vala.h: No such file or directory
compilation terminated.

Doesn't compile for me on Ubuntu 13.04.

[David Gomes (davidgomes)]

Actually, disregard that last comment it was meant to be posted here - https://code.launchpad.net/~junrrein/pantheon-files/unity-quicklist-to-vala/+merge/178843 (and I just posted it there too).

This branch compiles and runs just fine. I didn't test *everything* but side. Unity displayed the progress of long file operations just fine and there were no bugs regarding that so I'm approving this test-wise. Now all that needs to be done are the code style fixes and it'll be ready to merge.

review: Approve

[David Gomes (davidgomes)]

It also properly fixes bug 1208994.

[lp:~junrrein/pantheon-files/progressuihandler-to-vala]

1346. By Julián Unrrein on 2013-08-15

Merge from parent branch.

1347. By Julián Unrrein on 2013-08-15

Improve code style.

[Julián Unrrein (junrrein)]

Applied code style suggestions.

See diff lines 266-267. It's the same question I asked in my other branch. Is the list being properly freed?

[lp:~junrrein/pantheon-files/progressuihandler-to-vala]

1348. By Julián Unrrein on 2013-08-16

Remove unneeded methods from QuicklistHandler.vala.

1349. By Julián Unrrein on 2013-08-16

Remove redundant ternary operation.

1350. By Julián Unrrein on 2013-08-16

Remove TODO comment.

[Julián Unrrein (junrrein)]

Freeing the list explicitly is not necessary - Vala frees it automatically when it is pointed to null.

=== modified file 'libcore/marlincore-C.vapi'
--- libcore/marlincore-C.vapi	2013-08-06 20:20:44 +0000
+++ libcore/marlincore-C.vapi	2013-08-16 22:51:52 +0000
@@ -106,6 +106,29 @@
         public void undo (UndoFinishCallback? cb);
         public void redo (UndoFinishCallback? cb);
     }
+
+    [CCode (cheader_filename = "marlin-progress-info.h")]
+    public class Progress.Info : Object {
+        public Info ();
+        public signal void started ();
+        public signal void finished ();
+        public signal void progress_changed ();
+        public void cancel ();
+        public double get_progress ();
+        public double get_current ();
+        public double get_total ();
+        public bool get_is_finished ();
+        public bool get_is_paused ();
+        public Cancellable get_cancellable ();
+    }
+
+    [CCode (cheader_filename = "marlin-progress-info-manager.h")]
+    public class Progress.InfoManager : Object {
+        public InfoManager ();
+        public signal void new_progress_info (Progress.Info info);
+        public void add_new_info (Progress.Info info);
+        public unowned List<Progress.Info> get_all_infos ();
+    }
 }
 
 [CCode (cprefix = "MarlinFile", lower_case_cprefix = "marlin_file_", cheader_filename = "marlin-file-changes-queue.h")]

=== modified file 'src/Application.vala'
--- src/Application.vala	2013-08-16 22:51:52 +0000
+++ src/Application.vala	2013-08-16 22:51:52 +0000
@@ -41,7 +41,7 @@
         application_singleton = this;
     }
 
-    public static new Application get () {
+    public static new unowned Application get () {
         if (application_singleton == null)
             application_singleton = new Marlin.Application ();
 

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-08-16 22:51:52 +0000
+++ src/CMakeLists.txt	2013-08-16 22:51:52 +0000
@@ -42,6 +42,7 @@
         Application.vala
         main.vala
         marlin-deep-count.vala
+        ProgressUIHandler.vala
         QuicklistHandler.vala
         View/DiskRenderer.vala
         View/DirectoryNotFound.vala
@@ -86,6 +87,7 @@
         Application.vala
         main.vala
         marlin-deep-count.vala
+        ProgressUIHandler.vala
         View/DiskRenderer.vala
         View/DirectoryNotFound.vala
         View/Window.vala
@@ -148,7 +150,6 @@
     fm-columns-view.c
     marlin-connect-server-dialog.c
     marlin-connect-server-operation.c
-    marlin-progress-ui-handler.c
     marlin-progress-info-widget.c
     ${VALA_C} )
 

=== added file 'src/ProgressUIHandler.vala'
--- src/ProgressUIHandler.vala	1970-01-01 00:00:00 +0000
+++ src/ProgressUIHandler.vala	2013-08-16 22:51:52 +0000
@@ -0,0 +1,413 @@
+/***
+  Copyright (C) 2007, 2011 Red Hat, Inc.
+  Copyright (C) 2013 Julián Unrrein <[e-mail]>
+
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License version 3, as published
+  by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranties of
+  MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+
+  Authors: Alexander Larsson <[e-mail]>
+           Cosimo Cecchi <[e-mail]>
+           Julián Unrrein <[e-mail]>
+***/
+
+public class Marlin.Progress.UIHandler : Object {
+
+    private Marlin.Progress.InfoManager manager = null;
+
+    private Gtk.Widget progress_window = null;
+    private Gtk.Widget window_vbox = null;
+    private uint active_infos = 0;
+
+    private bool notification_supports_persistence = false;
+    private Notify.Notification progress_notification = null;
+    private Gtk.StatusIcon status_icon = null;
+#if HAVE_UNITY
+    private Marlin.QuicklistHandler quicklist_handler = null;
+#endif
+
+    private const string ACTION_DETAILS = "details";
+
+    /* Our policy for showing progress notification is the following:
+     * - File operations that end within two seconds do not get notified in any way.
+     * - If no file operations are running, and one passes the two seconds
+     *   timeout, a window is displayed with the progress.
+     * - If the window is closed, we show a resident notification, or a status icon, depending on
+     *   the capabilities of the notification daemon running in the session.
+     * - If some file operations are running, and another one passes the two seconds
+     *   timeout, and the window is showing, we add it to the window directly.
+     * - In the same case, but when the window is not showing, we update the resident
+     *   notification, changing its message, or the status icon's tooltip.
+     * - When one file operation finishes, if it's not the last one, we only update the
+     *   resident notification's message, or the status icon's tooltip.
+     * - In the same case, if it's the last one, we close the resident notification,
+     *   or the status icon, and trigger a transient one.
+     * - In the same case, but the window was showing, we just hide the window.
+     */
+
+    public UIHandler () {
+        this.manager = new Marlin.Progress.InfoManager ();
+
+        manager.new_progress_info.connect ((info) => {
+            info.started.connect (progress_info_started_cb);
+        });
+
+        this.notification_supports_persistence = server_has_persistence ();
+    }
+
+    private bool server_has_persistence () {
+        unowned List<string> cappabilities = Notify.get_server_caps ();
+
+        return cappabilities.find ("persistence") != null;
+    }
+
+    private void progress_info_started_cb (Marlin.Progress.Info info) {
+        var application = Marlin.Application.get ();
+        application.hold ();
+
+        info.finished.connect (() => {
+            debug ("Release application");
+            application.release ();
+        });
+
+        Timeout.add_seconds (2, () => {
+            if (info.get_is_paused ())
+                return true;
+
+            if (!info.get_is_finished ())
+                handle_new_progress_info (info);
+
+            return false;
+        });
+    }
+
+    private void handle_new_progress_info (Marlin.Progress.Info info) {
+        info.finished.connect (progress_info_finished_cb);
+
+        this.active_infos++;
+
+        if (this.active_infos == 1) {
+            /* This is the only active operation, present the window */
+            add_to_window (info);
+            (this.progress_window as Gtk.Window).present ();
+        } else {
+            if (this.progress_window.visible)
+                add_to_window (info);
+            else
+                update_notification_or_status ();
+        }
+
+#if HAVE_UNITY
+        update_unity_launcher (info, true);
+#endif
+    }
+
+    private void add_to_window (Marlin.Progress.Info info) {
+        ensure_window ();
+
+        var progress_widget = new Marlin.Progress.InfoWidget (info);
+        (this.window_vbox as Gtk.Box).pack_start (progress_widget, false, false, 6);
+
+        progress_widget.show ();
+        if (this.progress_window.visible)
+            (this.progress_window as Gtk.Window).present ();
+    }
+
+    private void ensure_window () {
+        if (this.progress_window != null)
+            return;
+
+        this.progress_window = new Gtk.Window (Gtk.WindowType.TOPLEVEL);
+
+        (this.progress_window as Gtk.Window).resizable = false;
+        (this.progress_window as Gtk.Container).set_border_width (10);
+        (this.progress_window as Gtk.Window).title = _("File Operations");
+        (this.progress_window as Gtk.Window).set_wmclass ("file_progress", "Marlin");
+        (this.progress_window as Gtk.Window).set_position (Gtk.WindowPosition.CENTER);
+        (this.progress_window as Gtk.Window).icon_name = "system-file-manager";
+
+        this.window_vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 5);
+
+        (this.progress_window as Gtk.Container).add (this.window_vbox);
+        this.window_vbox.show ();
+
+        this.progress_window.delete_event.connect ((widget, event) => {
+            widget.hide ();
+            update_notification_or_status ();
+            return true;
+        });
+    }
+
+    private void update_notification_or_status () {
+        if (this.notification_supports_persistence)
+            update_notification ();
+        else
+            update_status_icon ();
+    }
+
+    private void progress_info_finished_cb (Marlin.Progress.Info info) {
+        this.active_infos--;
+
+        if (this.active_infos > 0) {
+            if (!this.progress_window.visible)
+                update_notification_or_status ();
+        } else {
+            if (this.progress_window.visible) {
+                progress_window.hide ();
+            } else {
+                hide_notification_or_status ();
+                show_complete_notification ();
+            }
+        }
+
+#if HAVE_UNITY
+        update_unity_launcher (info, false);
+#endif
+    }
+
+    private void hide_notification_or_status () {
+        if (this.status_icon != null)
+            this.status_icon.visible = false;
+
+        if (this.progress_notification != null) {
+            try {
+                this.progress_notification.close ();
+            } catch (Error error) {
+                warning ("There was an error when showing the notification: %s", error.message);
+            }
+
+            this.progress_notification = null;
+        }
+    }
+
+    private void show_complete_notification () {
+        /* Don't display the notification if we'd be using a status icon */
+        if (!this.notification_supports_persistence)
+            return;
+
+        var complete_notification = new Notify.Notification (_("File Operations"),
+                                                             _("All file operations have been successfully completed"),
+                                                             null);
+        try {
+            complete_notification.show ();
+        } catch (Error error) {
+            warning ("There was an error when showing the notification: %s", error.message);
+        }
+    }
+
+    private void update_notification () {
+        ensure_notification ();
+
+        string body = ngettext ("%'d file operation active",
+                                "%'d file operations active",
+                                this.active_infos);
+
+        this.progress_notification.update (_("File Operations"),
+                                           body, "");
+
+        try {
+            this.progress_notification.show ();
+        } catch (Error error) {
+            warning ("There was an error when showing the notification: %s", error.message);
+        }
+    }
+
+    private void ensure_notification () {
+        if (this.progress_notification != null)
+            return;
+
+        this.progress_notification = new Notify.Notification (_("File Operations"),
+                                                              null, null);
+
+        this.progress_notification.set_category ("transfer");
+        this.progress_notification.set_hint ("resident", new Variant.boolean (true));
+        this.progress_notification.add_action (ACTION_DETAILS,
+                                               _("Show Details"),
+                                               (Notify.ActionCallback) notification_show_details_cb);
+    }
+
+    private void notification_show_details_cb (Notify.Notification notification,
+                                               string action_name) {
+        if (action_name != ACTION_DETAILS)
+            return;
+
+        try {
+            progress_notification.close ();
+        } catch (Error error) {
+            warning ("There was an error when closing the notification: %s", error.message);
+        }
+
+        (progress_window as Gtk.Window).present ();
+    }
+
+    private void update_status_icon () {
+        ensure_status_icon ();
+
+        string tooltip = ngettext ("%'d file operation active",
+                                   "%'d file operations active",
+                                   this.active_infos);
+
+        this.status_icon.set_tooltip_text (tooltip);
+
+        this.status_icon.visible = true;
+    }
+
+    private void ensure_status_icon () {
+        if (this.status_icon != null)
+            return;
+
+        var icon = new ThemedIcon.with_default_fallbacks ("system-file-manager-symbolic");
+        this.status_icon = new Gtk.StatusIcon.from_gicon (icon);
+
+        this.status_icon.activate.connect (() => {
+            this.status_icon.visible = false;
+            (this.progress_window as Gtk.Window).present ();
+        });
+
+        this.status_icon.visible = false;
+    }
+
+#if HAVE_UNITY
+    private void update_unity_launcher (Marlin.Progress.Info info,
+                                        bool added) {
+
+        if (this.quicklist_handler == null) {
+            this.quicklist_handler = QuicklistHandler.get_singleton ();
+
+            if (this.quicklist_handler == null)
+                return;
+
+            build_unity_quicklist ();
+        }
+
+        foreach (var marlin_lentry in this.quicklist_handler.launcher_entries)
+            update_unity_launcher_entry (info, marlin_lentry);
+
+        if (added)
+            info.progress_changed.connect (unity_progress_changed);
+    }
+
+    private void build_unity_quicklist () {
+        /* Create menu items for the quicklist */
+        foreach (var marlin_lentry in this.quicklist_handler.launcher_entries) {
+            /* Separator between bookmarks and progress items */
+            var separator = new Dbusmenu.Menuitem ();
+
+            separator.property_set (Dbusmenu.MENUITEM_PROP_TYPE,
+                                    Dbusmenu.CLIENT_TYPES_SEPARATOR);
+            separator.property_set (Dbusmenu.MENUITEM_PROP_LABEL,
+                                    "Progress items separator");
+            marlin_lentry.progress_quicklists.append (separator);
+
+            /* "Show progress window" menu item */
+            var show_menuitem = new Dbusmenu.Menuitem ();
+
+            show_menuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL,
+                                        _("Show Copy Dialog"));
+
+            show_menuitem.item_activated.connect (() => {
+                (this.progress_window as Gtk.Window).present ();
+            });
+
+            marlin_lentry.progress_quicklists.append (show_menuitem);
+
+            /* "Cancel in-progress operations" menu item */
+            var cancel_menuitem = new Dbusmenu.Menuitem ();
+
+            cancel_menuitem.property_set (Dbusmenu.MENUITEM_PROP_LABEL,
+                                          _("Cancel All In-progress Actions"));
+
+            cancel_menuitem.item_activated.connect (() => {
+                unowned List<Marlin.Progress.Info> infos = this.manager.get_all_infos ();
+
+                foreach (var info in infos)
+                    info.cancel ();
+            });
+
+            marlin_lentry.progress_quicklists.append (cancel_menuitem);
+        }
+    }
+
+    private void update_unity_launcher_entry (Marlin.Progress.Info info,
+                                              Marlin.LauncherEntry marlin_lentry) {
+        Unity.LauncherEntry unity_lentry = marlin_lentry.entry;
+
+        if (this.active_infos > 0) {
+            unity_lentry.progress_visible = true;
+            unity_progress_changed ();
+            show_unity_quicklist (marlin_lentry, true);
+        } else {
+            unity_lentry.progress_visible = false;
+            unity_lentry.progress = 0.0;
+            show_unity_quicklist (marlin_lentry, false);
+
+            Cancellable pc = info.get_cancellable ();
+
+            if (!pc.is_cancelled ()) {
+                unity_lentry.urgent = true;
+
+                Timeout.add_seconds (2, () => {
+                    unity_lentry.urgent = false;
+                    return false;
+                });
+            }
+        }
+    }
+
+    private void show_unity_quicklist (Marlin.LauncherEntry marlin_lentry,
+                                       bool show) {
+
+        Unity.LauncherEntry unity_lentry = marlin_lentry.entry;
+        Dbusmenu.Menuitem quicklist = unity_lentry.quicklist;
+
+        foreach (Dbusmenu.Menuitem menuitem in marlin_lentry.progress_quicklists) {
+            if (show) {
+                if (menuitem.get_parent () == null)
+                    quicklist.child_add_position (menuitem, -1);
+            } else {
+                quicklist.child_delete (menuitem);
+            }
+        }
+    }
+
+    private void unity_progress_changed () {
+        double progress = 0;
+        double current = 0;
+        double total = 0;
+        unowned List<Marlin.Progress.Info> infos = this.manager.get_all_infos ();
+
+        foreach (var _info in infos) {
+            double c = _info.get_current ();
+            double t = _info.get_total ();
+
+            if (c < 0)
+                c = 0;
+
+            if (t <= 0)
+                continue;
+
+            current += c;
+            total += t;
+        }
+
+        if (current >= 0 && total > 0)
+            progress = current / total;
+
+        if (progress > 1.0)
+            progress = 1.0;
+
+        foreach (Marlin.LauncherEntry marlin_lentry in this.quicklist_handler.launcher_entries) {
+            Unity.LauncherEntry unity_lentry = marlin_lentry.entry;
+            unity_lentry.progress = progress;
+        }
+    }
+#endif
+}

=== modified file 'src/QuicklistHandler.vala'
--- src/QuicklistHandler.vala	2013-08-16 22:51:52 +0000
+++ src/QuicklistHandler.vala	2013-08-16 22:51:52 +0000
@@ -27,7 +27,7 @@
 
     public class QuicklistHandler : Object {
 
-        private List<Marlin.LauncherEntry> launcher_entries = null;
+        public List<Marlin.LauncherEntry> launcher_entries = null;
 
         private QuicklistHandler () {
             this.entry_add ("pantheon-files.desktop");
@@ -52,14 +52,6 @@
             return quicklisthandler_singleton;
         }
 
-        public unowned List<Marlin.LauncherEntry> get_launcher_entries () {
-            return this.launcher_entries;
-        }
-
-        public static Unity.LauncherEntry get_launcher_entry (List<Marlin.LauncherEntry> list) {
-            return list.data.entry;
-        }
-
         private void entry_add (string entry_id) {
             var unity_lentry = Unity.LauncherEntry.get_for_desktop_id (entry_id);
 

=== removed file 'src/marlin-progress-ui-handler.c'
--- src/marlin-progress-ui-handler.c	2013-08-16 22:51:52 +0000
+++ src/marlin-progress-ui-handler.c	1970-01-01 00:00:00 +0000
@@ -1,691 +0,0 @@
-/*
- * marlin-progress-ui-handler.c: file operation progress user interface.
- *
- * Copyright (C) 2007, 2011 Red Hat, Inc.
- *
- * 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; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Alexander Larsson <[e-mail]>
- *          Cosimo Cecchi <[e-mail]>
- *          Marco Trevisan <[e-mail]>
- *
- */
-
-#include "marlin-progress-ui-handler.h"
-
-#include "marlin-vala.h"
-#include "marlin-progress-info-widget.h"
-
-#include "marlin-progress-info.h"
-#include "marlin-progress-info-manager.h"
-#include "eel-i18n.h"
-
-#include <libnotify/notify.h>
-
-#ifdef HAVE_UNITY
-#include <unity.h>
-#endif
-
-struct _MarlinProgressUIHandlerPriv {
-    MarlinProgressInfoManager *manager;
-
-    GtkWidget *progress_window;
-    GtkWidget *window_vbox;
-    guint active_infos;
-
-    gboolean notification_supports_persistence;
-    NotifyNotification *progress_notification;
-    GtkStatusIcon *status_icon;
-#ifdef HAVE_UNITY
-    MarlinQuicklistHandler *unity_quicklist_handler;
-#endif
-};
-
-G_DEFINE_TYPE (MarlinProgressUIHandler, marlin_progress_ui_handler, G_TYPE_OBJECT);
-
-/* Our policy for showing progress notification is the following:
- * - file operations that end within two seconds do not get notified in any way
- * - if no file operations are running, and one passes the two seconds
- *   timeout, a window is displayed with the progress
- * - if the window is closed, we show a resident notification, or a status icon, depending on
- *   the capabilities of the notification daemon running in the session
- * - if some file operations are running, and another one passes the two seconds
- *   timeout, and the window is showing, we add it to the window directly
- * - in the same case, but when the window is not showing, we update the resident
- *   notification, changing its message, or the status icon's tooltip
- * - when one file operation finishes, if it's not the last one, we only update the
- *   resident notification's message, or the status icon's tooltip
- * - in the same case, if it's the last one, we close the resident notification,
- *   or the status icon, and trigger a transient one
- * - in the same case, but the window was showing, we just hide the window
- */
-
-#define ACTION_DETAILS "details"
-
-static void
-status_icon_activate_cb (GtkStatusIcon *icon,
-                         MarlinProgressUIHandler *self)
-{
-    gtk_status_icon_set_visible (icon, FALSE);
-    gtk_window_present (GTK_WINDOW (self->priv->progress_window));
-}
-
-static void
-notification_show_details_cb (NotifyNotification *notification,
-                              char *action_name,
-                              gpointer user_data)
-{
-    MarlinProgressUIHandler *self = user_data;
-
-
-    if (g_strcmp0 (action_name, ACTION_DETAILS) != 0) {
-        return;
-    }
-
-    notify_notification_close (self->priv->progress_notification, NULL);
-    gtk_window_present (GTK_WINDOW (self->priv->progress_window));
-}
-
-static void
-progress_ui_handler_ensure_notification (MarlinProgressUIHandler *self)
-{
-    NotifyNotification *notify;
-
-    if (self->priv->progress_notification) {
-        return;
-    }
-
-    notify = notify_notification_new (_("File Operations"),
-                                      NULL, NULL);
-    self->priv->progress_notification = notify;
-
-    notify_notification_set_category (notify, "transfer");
-    notify_notification_set_hint (notify, "resident",
-                                  g_variant_new_boolean (TRUE));
-
-    notify_notification_add_action (notify, ACTION_DETAILS,
-                                    _("Show Details"),
-                                    notification_show_details_cb,
-                                    self,
-                                    NULL);
-}
-
-static void
-progress_ui_handler_ensure_status_icon (MarlinProgressUIHandler *self)
-{
-    GIcon *icon;
-    GtkStatusIcon *status_icon;
-
-    if (self->priv->status_icon != NULL) {
-        return;
-    }
-
-    icon = g_themed_icon_new_with_default_fallbacks ("system-file-manager-symbolic");
-    status_icon = gtk_status_icon_new_from_gicon (icon);
-    g_signal_connect (status_icon, "activate",
-                      (GCallback) status_icon_activate_cb,
-                      self);
-
-    gtk_status_icon_set_visible (status_icon, FALSE);
-    g_object_unref (icon);
-
-    self->priv->status_icon = status_icon;
-}
-
-static void
-progress_ui_handler_update_notification (MarlinProgressUIHandler *self)
-{
-    gchar *body;
-
-    progress_ui_handler_ensure_notification (self);
-
-    body = g_strdup_printf (ngettext ("%'d file operation active",
-                                      "%'d file operations active",
-                                      self->priv->active_infos),
-                            self->priv->active_infos);
-
-    notify_notification_update (self->priv->progress_notification,
-                                _("File Operations"),
-                                body,
-                                NULL);
-
-    notify_notification_show (self->priv->progress_notification, NULL);
-
-    g_free (body);
-}
-
-static void
-progress_ui_handler_update_status_icon (MarlinProgressUIHandler *self)
-{
-    gchar *tooltip;
-
-    progress_ui_handler_ensure_status_icon (self);
-
-    tooltip = g_strdup_printf (ngettext ("%'d file operation active",
-                                         "%'d file operations active",
-                                         self->priv->active_infos),
-                               self->priv->active_infos);
-    gtk_status_icon_set_tooltip_text (self->priv->status_icon, tooltip);
-    g_free (tooltip);
-
-    gtk_status_icon_set_visible (self->priv->status_icon, TRUE);
-}
-
-#ifdef HAVE_UNITY
-
-static void
-progress_ui_handler_unity_progress_changed (MarlinProgressInfo *info,
-                                            MarlinProgressUIHandler *self)
-{
-    g_return_if_fail (self);
-    g_return_if_fail (self->priv->unity_quicklist_handler);
-    g_return_if_fail (self->priv->manager);
-
-    GList *infos, *l;
-    double progress = 0;
-    double c, current = 0;
-    double t, total = 0;
-
-    infos = marlin_progress_info_manager_get_all_infos (self->priv->manager);
-
-    for (l = infos; l; l = l->next) {
-        MarlinProgressInfo *i = l->data;
-        c = marlin_progress_info_get_current (i);
-        t = marlin_progress_info_get_total (i);
-
-        if (c < 0) c = 0;
-        if (t <= 0) continue;
-
-        total += t;
-        current += c;
-    }
-
-    if (current >= 0 && total > 0)
-        progress = current / total;
-
-    if (progress > 1.0)
-        progress = 1.0;
-
-    for (l = marlin_quicklist_handler_get_launcher_entries (self->priv->unity_quicklist_handler); l; l = l->next) {
-        UnityLauncherEntry *entry = marlin_quicklist_handler_get_launcher_entry (l);
-        unity_launcher_entry_set_progress (entry, progress);
-    }
-}
-
-static gboolean
-progress_ui_handler_disable_unity_urgency (UnityLauncherEntry *entry)
-{
-    g_return_if_fail (entry);
-
-    unity_launcher_entry_set_urgent (entry, FALSE);
-    return FALSE;
-}
-
-static void
-progress_ui_handler_unity_quicklist_show_activated (DbusmenuMenuitem *menu,
-                                                    guint timestamp,
-                                                    MarlinProgressUIHandler *self)
-{
-    g_return_if_fail (self);
-
-    if (!gtk_widget_get_visible (self->priv->progress_window)) {
-        gtk_window_present (GTK_WINDOW (self->priv->progress_window));
-    } else {
-        gtk_window_set_keep_above (GTK_WINDOW (self->priv->progress_window), TRUE);
-        gtk_window_set_keep_above (GTK_WINDOW (self->priv->progress_window), FALSE);
-    }
-}
-
-static void
-progress_ui_handler_unity_quicklist_cancel_activated (DbusmenuMenuitem *menu,
-                                                      guint timestamp,
-                                                      MarlinProgressUIHandler *self)
-{
-    g_return_if_fail (self);
-    g_return_if_fail (self->priv->manager);
-
-    GList *infos, *l;
-    infos = marlin_progress_info_manager_get_all_infos (self->priv->manager);
-
-    for (l = infos; l; l = l->next) {
-        MarlinProgressInfo *info = l->data;
-        marlin_progress_info_cancel (info);
-    }
-}
-
-static void
-progress_ui_handler_build_unity_quicklist (MarlinProgressUIHandler *self)
-{
-    g_return_if_fail (self);
-    GList *l;
-
-    for (l = marlin_quicklist_handler_get_launcher_entries (self->priv->unity_quicklist_handler); l; l = l->next) {
-        MarlinLauncherEntry *lentry = l->data;
-        UnityLauncherEntry *entry = marlin_quicklist_handler_get_launcher_entry (l);
-        DbusmenuMenuitem *ql = unity_launcher_entry_get_quicklist (entry);
-
-        DbusmenuMenuitem *quickmenu = dbusmenu_menuitem_new ();
-        dbusmenu_menuitem_property_set (quickmenu,
-                                        DBUSMENU_MENUITEM_PROP_LABEL,
-                                        _("Show Copy Dialog"));
-        dbusmenu_menuitem_property_set_bool (quickmenu,
-                                             DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
-        dbusmenu_menuitem_child_add_position (ql, quickmenu, -1);
-        lentry->progress_quicklists = g_list_prepend (lentry->progress_quicklists, quickmenu);
-        g_signal_connect (quickmenu, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
-                          (GCallback) progress_ui_handler_unity_quicklist_show_activated,
-                          self);
-
-        quickmenu = dbusmenu_menuitem_new ();
-        dbusmenu_menuitem_property_set (quickmenu,
-                                        DBUSMENU_MENUITEM_PROP_LABEL,
-                                        _("Cancel All In-progress Actions"));
-        dbusmenu_menuitem_property_set_bool (quickmenu,
-                                             DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
-        dbusmenu_menuitem_child_add_position (ql, quickmenu, -1);
-        lentry->progress_quicklists = g_list_prepend (lentry->progress_quicklists, quickmenu);
-        g_signal_connect (quickmenu, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
-                          (GCallback) progress_ui_handler_unity_quicklist_cancel_activated,
-                          self);
-    }
-}
-
-static void
-progress_ui_handler_show_unity_quicklist (MarlinProgressUIHandler *self,
-                                          MarlinLauncherEntry *lentry,
-                                          gboolean show)
-{
-    g_return_if_fail (self);
-    g_return_if_fail (lentry);
-
-    GList *l;
-
-    for (l = lentry->progress_quicklists; l; l = l->next) {
-        dbusmenu_menuitem_property_set_bool(l->data,
-                                            DBUSMENU_MENUITEM_PROP_VISIBLE, show);
-    }
-}
-
-static void
-progress_ui_handler_update_unity_launcher_entry (MarlinProgressUIHandler *self,
-                                                 MarlinProgressInfo *info,
-                                                 MarlinLauncherEntry *lentry)
-{
-    UnityLauncherEntry *entry = lentry->entry;
-
-    g_return_if_fail (self);
-    g_return_if_fail (entry);
-
-    if (self->priv->active_infos > 0) {
-        unity_launcher_entry_set_progress_visible (entry, TRUE);
-        progress_ui_handler_show_unity_quicklist (self, lentry, TRUE);
-        progress_ui_handler_unity_progress_changed (NULL, self);
-    } else {
-        unity_launcher_entry_set_progress_visible (entry, FALSE);
-        unity_launcher_entry_set_progress (entry, 0.0);
-        unity_launcher_entry_set_count_visible (entry, FALSE);
-        progress_ui_handler_show_unity_quicklist (self, lentry, FALSE);
-        GCancellable *pc = marlin_progress_info_get_cancellable (info);
-
-        if (!g_cancellable_is_cancelled (pc)) {
-            unity_launcher_entry_set_urgent (entry, TRUE);
-
-            g_timeout_add_seconds (2, (GSourceFunc)
-                                   progress_ui_handler_disable_unity_urgency,
-                                   entry);
-        }
-    }
-}
-
-static void
-progress_ui_handler_update_unity_launcher (MarlinProgressUIHandler *self,
-                                           MarlinProgressInfo *info,
-                                           gboolean added)
-{
-    g_return_if_fail (self);
-    GList *l;
-
-    if (!self->priv->unity_quicklist_handler) {
-        self->priv->unity_quicklist_handler = marlin_quicklist_handler_get_singleton ();
-        if (!self->priv->unity_quicklist_handler)
-            return;
-
-        progress_ui_handler_build_unity_quicklist (self);
-    }
-
-    for (l = marlin_quicklist_handler_get_launcher_entries (self->priv->unity_quicklist_handler); l; l = l->next) {
-        MarlinLauncherEntry *lentry = l->data;
-        UnityLauncherEntry *entry = marlin_quicklist_handler_get_launcher_entry (l);
-        progress_ui_handler_update_unity_launcher_entry (self, info, lentry);
-    }
-
-    if (added) {
-        g_signal_connect (info, "progress-changed",
-                          (GCallback) progress_ui_handler_unity_progress_changed,
-                          self);
-    }
-}
-#endif
-
-
-static gboolean
-progress_window_delete_event (GtkWidget *widget,
-                              GdkEvent *event,
-                              MarlinProgressUIHandler *self)
-{
-    gtk_widget_hide (widget);
-
-    if (self->priv->notification_supports_persistence) {
-        progress_ui_handler_update_notification (self);
-    } else {
-        progress_ui_handler_update_status_icon (self);
-    }
-
-    return TRUE;
-}
-
-static void
-progress_ui_handler_ensure_window (MarlinProgressUIHandler *self)
-{
-    GtkWidget *vbox, *progress_window;
-
-    if (self->priv->progress_window != NULL) {
-        return;
-    }
-
-    progress_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    self->priv->progress_window = progress_window;
-    gtk_window_set_resizable (GTK_WINDOW (progress_window),
-                              FALSE);
-    gtk_container_set_border_width (GTK_CONTAINER (progress_window), 10);
-
-    gtk_window_set_title (GTK_WINDOW (progress_window),
-                          _("File Operations"));
-    gtk_window_set_wmclass (GTK_WINDOW (progress_window),
-                            "file_progress", "Marlin");
-    gtk_window_set_position (GTK_WINDOW (progress_window),
-                             GTK_WIN_POS_CENTER);
-    gtk_window_set_icon_name (GTK_WINDOW (progress_window),
-                              "system-file-manager");
-
-    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-    gtk_box_set_spacing (GTK_BOX (vbox), 5);
-    gtk_container_add (GTK_CONTAINER (progress_window),
-                       vbox);
-    self->priv->window_vbox = vbox;
-    gtk_widget_show (vbox);
-
-    g_signal_connect (progress_window,
-                      "delete-event",
-                      (GCallback) progress_window_delete_event, self);
-}
-
-static void
-progress_ui_handler_update_notification_or_status (MarlinProgressUIHandler *self)
-{
-    if (self->priv->notification_supports_persistence) {
-        progress_ui_handler_update_notification (self);
-    } else {
-        progress_ui_handler_update_status_icon (self);
-    }
-}
-
-static void
-progress_ui_handler_add_to_window (MarlinProgressUIHandler *self,
-                                   MarlinProgressInfo *info)
-{
-    GtkWidget *progress;
-
-    progress = marlin_progress_info_widget_new (info);
-    progress_ui_handler_ensure_window (self);
-
-    gtk_box_pack_start (GTK_BOX (self->priv->window_vbox),
-                        progress,
-                        FALSE, FALSE, 6);
-
-    gtk_widget_show (progress);
-}
-
-static void
-progress_ui_handler_show_complete_notification (MarlinProgressUIHandler *self)
-{
-    NotifyNotification *complete_notification;
-
-    /* don't display the notification if we'd be using a status icon */
-    if (!self->priv->notification_supports_persistence) {
-        return;
-    }
-
-    complete_notification = notify_notification_new (_("File Operations"),
-                                                     _("All file operations have been successfully completed"),
-                                                     NULL);
-    notify_notification_show (complete_notification, NULL);
-
-    g_object_unref (complete_notification);
-}
-
-static void
-progress_ui_handler_hide_notification_or_status (MarlinProgressUIHandler *self)
-{
-    if (self->priv->status_icon != NULL) {
-        gtk_status_icon_set_visible (self->priv->status_icon, FALSE);
-    }
-
-    if (self->priv->progress_notification != NULL) {
-        notify_notification_close (self->priv->progress_notification, NULL);
-        g_clear_object (&self->priv->progress_notification);
-    }
-}
-
-static void
-progress_info_finished_cb (MarlinProgressInfo *info,
-                           MarlinProgressUIHandler *self)
-{
-    self->priv->active_infos--;
-
-    if (self->priv->active_infos > 0) {
-        if (!gtk_widget_get_visible (self->priv->progress_window)) {
-            progress_ui_handler_update_notification_or_status (self);
-        }
-    } else {
-        if (gtk_widget_get_visible (self->priv->progress_window)) {
-            gtk_widget_hide (self->priv->progress_window);
-        } else {
-            progress_ui_handler_hide_notification_or_status (self);
-            progress_ui_handler_show_complete_notification (self);
-        }
-    }
-
-#ifdef HAVE_UNITY
-    progress_ui_handler_update_unity_launcher (self, info, FALSE);
-#endif
-}
-
-static void
-handle_new_progress_info (MarlinProgressUIHandler *self,
-                          MarlinProgressInfo *info)
-{
-    g_signal_connect (info, "finished",
-                      G_CALLBACK (progress_info_finished_cb), self);
-
-    self->priv->active_infos++;
-
-    if (self->priv->active_infos == 1) {
-        /* this is the only active operation, present the window */
-        progress_ui_handler_add_to_window (self, info);
-        gtk_window_present (GTK_WINDOW (self->priv->progress_window));
-    } else {
-        if (gtk_widget_get_visible (self->priv->progress_window)) {
-            progress_ui_handler_add_to_window (self, info);
-        } else {
-            progress_ui_handler_update_notification_or_status (self);
-        }
-    }
-
-#ifdef HAVE_UNITY
-    progress_ui_handler_update_unity_launcher (self, info, TRUE);
-#endif
-}
-
-typedef struct {
-    MarlinProgressInfo *info;
-    MarlinProgressUIHandler *self;
-} TimeoutData;
-
-static void
-timeout_data_free (TimeoutData *data)
-{
-    g_clear_object (&data->self);
-    g_clear_object (&data->info);
-
-    g_slice_free (TimeoutData, data);
-}
-
-static TimeoutData *
-timeout_data_new (MarlinProgressUIHandler *self,
-                  MarlinProgressInfo *info)
-{
-    TimeoutData *retval;
-
-    retval = g_slice_new0 (TimeoutData);
-    retval->self = g_object_ref (self);
-    retval->info = g_object_ref (info);
-
-    return retval;
-}
-
-static gboolean
-new_op_started_timeout (TimeoutData *data)
-{
-    MarlinProgressInfo *info = data->info;
-    MarlinProgressUIHandler *self = data->self;
-
-    if (marlin_progress_info_get_is_paused (info)) {
-        return TRUE;
-    }
-
-    if (!marlin_progress_info_get_is_finished (info)) {
-        handle_new_progress_info (self, info);
-    }
-
-    timeout_data_free (data);
-
-    return FALSE;
-}
-
-static void
-release_application (MarlinProgressInfo *info,
-                     MarlinProgressUIHandler *self)
-{
-    MarlinApplication *app;
-
-    /* release the GApplication hold we acquired */
-    app = marlin_application_get ();
-    g_application_release (G_APPLICATION (app));
-
-    //amtest
-    g_message ("%s", G_STRFUNC);
-}
-
-static void
-progress_info_started_cb (MarlinProgressInfo *info,
-                          MarlinProgressUIHandler *self)
-{
-    MarlinApplication *app;
-    TimeoutData *data;
-
-    /* hold GApplication so we never quit while there's an operation pending */
-    app = marlin_application_get ();
-    g_application_hold (G_APPLICATION (app));
-
-    g_signal_connect (info, "finished",
-                      G_CALLBACK (release_application), self);
-
-    data = timeout_data_new (self, info);
-
-    /* timeout for the progress window to appear */
-    g_timeout_add_seconds (2,
-                           (GSourceFunc) new_op_started_timeout,
-                           data);
-}
-
-static void
-new_progress_info_cb (MarlinProgressInfoManager *manager,
-                      MarlinProgressInfo *info,
-                      MarlinProgressUIHandler *self)
-{
-    g_signal_connect (info, "started",
-                      G_CALLBACK (progress_info_started_cb), self);
-}
-
-static void
-marlin_progress_ui_handler_dispose (GObject *obj)
-{
-    MarlinProgressUIHandler *self = MARLIN_PROGRESS_UI_HANDLER (obj);
-
-    g_clear_object (&self->priv->manager);
-
-    G_OBJECT_CLASS (marlin_progress_ui_handler_parent_class)->dispose (obj);
-}
-
-static gboolean
-server_has_persistence (void)
-{
-    gboolean retval;
-    GList *caps, *l;
-
-    caps = notify_get_server_caps ();
-    if (caps == NULL) {
-        return FALSE;
-    }
-
-    l = g_list_find_custom (caps, "persistence", (GCompareFunc) g_strcmp0);
-    retval = (l != NULL);
-
-    g_list_free_full (caps, g_free);
-
-    return retval;
-}
-
-static void
-marlin_progress_ui_handler_init (MarlinProgressUIHandler *self)
-{
-    self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, MARLIN_TYPE_PROGRESS_UI_HANDLER,
-                                              MarlinProgressUIHandlerPriv);
-
-    self->priv->manager = marlin_progress_info_manager_new ();
-    g_signal_connect (self->priv->manager, "new-progress-info",
-                      G_CALLBACK (new_progress_info_cb), self);
-
-    self->priv->notification_supports_persistence = server_has_persistence ();
-}
-
-static void
-marlin_progress_ui_handler_class_init (MarlinProgressUIHandlerClass *klass)
-{
-    GObjectClass *oclass;
-
-    oclass = G_OBJECT_CLASS (klass);
-    oclass->dispose = marlin_progress_ui_handler_dispose;
-
-    g_type_class_add_private (klass, sizeof (MarlinProgressUIHandlerPriv));
-}
-
-MarlinProgressUIHandler *
-marlin_progress_ui_handler_new (void)
-{
-    return g_object_new (MARLIN_TYPE_PROGRESS_UI_HANDLER, NULL);
-}

=== removed file 'src/marlin-progress-ui-handler.h'
--- src/marlin-progress-ui-handler.h	2011-07-27 10:29:20 +0000
+++ src/marlin-progress-ui-handler.h	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-/*
- * marlin-progress-ui-handler.h: file operation progress user interface.
- *
- * Copyright (C) 2007, 2011 Red Hat, Inc.
- *
- * 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; either version 2 of the
- * License, or (at your option) any later version.
- *
- * 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, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Alexander Larsson <[e-mail]>
- *          Cosimo Cecchi <[e-mail]>
- *
- */
-
-#ifndef __MARLIN_PROGRESS_UI_HANDLER_H__
-#define __MARLIN_PROGRESS_UI_HANDLER_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define MARLIN_TYPE_PROGRESS_UI_HANDLER marlin_progress_ui_handler_get_type()
-#define MARLIN_PROGRESS_UI_HANDLER(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), MARLIN_TYPE_PROGRESS_UI_HANDLER, MarlinProgressUIHandler))
-#define MARLIN_PROGRESS_UI_HANDLER_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_CAST ((klass), MARLIN_TYPE_PROGRESS_UI_HANDLER, MarlinProgressUIHandlerClass))
-#define MARLIN_IS_PROGRESS_UI_HANDLER(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MARLIN_TYPE_PROGRESS_UI_HANDLER))
-#define MARLIN_IS_PROGRESS_UI_HANDLER_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_TYPE ((klass), MARLIN_TYPE_PROGRESS_UI_HANDLER))
-#define MARLIN_PROGRESS_UI_HANDLER_GET_CLASS(obj) \
-    (G_TYPE_INSTANCE_GET_CLASS ((obj), MARLIN_TYPE_PROGRESS_UI_HANDLER, MarlinProgressUIHandlerClass))
-
-typedef struct _MarlinProgressUIHandlerPriv MarlinProgressUIHandlerPriv;
-
-typedef struct {
-    GObject parent;
-
-    /* private */
-    MarlinProgressUIHandlerPriv *priv;
-} MarlinProgressUIHandler;
-
-typedef struct {
-    GObjectClass parent_class;
-} MarlinProgressUIHandlerClass;
-
-GType marlin_progress_ui_handler_get_type (void);
-
-MarlinProgressUIHandler * marlin_progress_ui_handler_new (void);
-
-G_END_DECLS
-
-#endif /* __MARLIN_PROGRESS_UI_HANDLER_H__ */

=== modified file 'src/marlin.vapi'
--- src/marlin.vapi	2013-08-16 22:51:52 +0000
+++ src/marlin.vapi	2013-08-16 22:51:52 +0000
@@ -56,7 +56,7 @@
     public class Thumbnailer : Object {
         public static Thumbnailer get();
         public bool queue_file(GOF.File file, int? request, bool large);
-        
+
     }
     [CCode (cheader_filename = "marlin-bookmark.h")]
     public class Bookmark : Object {
@@ -118,11 +118,8 @@
         [CCode (cheader_filename = "marlin-file-operations.h")]
         public void new_folder_with_name_recursive(Gtk.Widget? parent_view, Gdk.Point? target_point, File file, string name, void* callback, void* data_callback);
     }
-    [CCode (cprefix = "MarlinProgress", lower_case_cprefix = "marlin_progress_")]
-    namespace Progress {
-        [CCode (cheader_filename = "marlin-progress-ui-handler.h")]
-        public class UIHandler : Object {
-            public UIHandler ();
-        }
+    [CCode (cheader_filename = "marlin-progress-info-widget.h")]
+    public class Progress.InfoWidget : Gtk.Box {
+        public InfoWidget (Marlin.Progress.Info info);
     }
 }