[Xfce4-commits] <xfdesktop:master> Improve the eject/unmount notifications (Bug #9845)
Eric Koegel
noreply at xfce.org
Sun Mar 3 06:38:01 CET 2013
Updating branch refs/heads/master
to 8674fc7ea9e0acae40db69714be13054053ef44d (commit)
from e271e0b54b633ada23f625252c8ba24fc679e205 (commit)
commit 8674fc7ea9e0acae40db69714be13054053ef44d
Author: Eric Koegel <eric.koegel at gmail.com>
Date: Mon Feb 18 16:25:54 2013 +0300
Improve the eject/unmount notifications (Bug #9845)
Fix the eject/unmount notifications so that it only reports success
when it was successful. This patch also uses the gtk_mount_operation
to provide better feedback on which processes are holding up the
operation and allow the device to unmount anyway.
src/xfdesktop-notify.c | 14 +++++++++++-
src/xfdesktop-notify.h | 4 +-
src/xfdesktop-volume-icon.c | 47 ++++++++++++++++++++++++++++++++-----------
3 files changed, 49 insertions(+), 16 deletions(-)
diff --git a/src/xfdesktop-notify.c b/src/xfdesktop-notify.c
index 1430e39..ae55a96 100644
--- a/src/xfdesktop-notify.c
+++ b/src/xfdesktop-notify.c
@@ -168,7 +168,7 @@ xfdesktop_notify_unmount (GMount *mount)
void
-xfdesktop_notify_unmount_finish (GMount *mount)
+xfdesktop_notify_unmount_finish (GMount *mount, gboolean unmount_successful)
{
const gchar * const *icon_names;
NotifyNotification *notification = NULL;
@@ -215,6 +215,11 @@ xfdesktop_notify_unmount_finish (GMount *mount)
g_object_set_data (G_OBJECT (mount), "xfdesktop-notification", NULL);
}
+ /* if the unmount operation wasn't successful then stop here, otherwise
+ * display a message letting the user know it has been removed */
+ if(!unmount_successful)
+ return;
+
summary = _("Unmount Finished");
message = g_strdup_printf (_("The device \"%s\" has been safely removed from the system. "), name);
@@ -343,7 +348,7 @@ xfdesktop_notify_eject (GVolume *volume)
void
-xfdesktop_notify_eject_finish (GVolume *volume)
+xfdesktop_notify_eject_finish (GVolume *volume, gboolean eject_successful)
{
const gchar * const *icon_names;
NotifyNotification *notification = NULL;
@@ -390,6 +395,11 @@ xfdesktop_notify_eject_finish (GVolume *volume)
g_object_set_data (G_OBJECT (volume), "xfdesktop-notification", NULL);
}
+ /* if the eject operation wasn't successful then stop here, otherwise
+ * display a message letting the user know it has been removed */
+ if(!eject_successful)
+ return;
+
summary = _("Eject Finished");
message = g_strdup_printf (_("The device \"%s\" has been safely removed from the system. "), name);
diff --git a/src/xfdesktop-notify.h b/src/xfdesktop-notify.h
index a547b65..55d08b3 100644
--- a/src/xfdesktop-notify.h
+++ b/src/xfdesktop-notify.h
@@ -27,9 +27,9 @@
G_BEGIN_DECLS
void xfdesktop_notify_unmount (GMount *mount);
-void xfdesktop_notify_unmount_finish (GMount *mount);
+void xfdesktop_notify_unmount_finish (GMount *mount, gboolean unmount_successful);
void xfdesktop_notify_eject (GVolume *volume);
-void xfdesktop_notify_eject_finish (GVolume *volume);
+void xfdesktop_notify_eject_finish (GVolume *volume, gboolean eject_successful);
void xfdesktop_notify_uninit (void);
G_END_DECLS
diff --git a/src/xfdesktop-volume-icon.c b/src/xfdesktop-volume-icon.c
index 50bcc45..4f2154e 100644
--- a/src/xfdesktop-volume-icon.c
+++ b/src/xfdesktop-volume-icon.c
@@ -468,12 +468,15 @@ xfdesktop_volume_icon_eject_finish(GObject *object,
GtkWidget *toplevel = icon_view ? gtk_widget_get_toplevel(icon_view) : NULL;
GVolume *volume = G_VOLUME(object);
GError *error = NULL;
+ gboolean eject_successful;
g_return_if_fail(G_IS_VOLUME(object));
g_return_if_fail(G_IS_ASYNC_RESULT(result));
g_return_if_fail(XFDESKTOP_IS_VOLUME_ICON(icon));
- if(!g_volume_eject_with_operation_finish(volume, result, &error)) {
+ eject_successful = g_volume_eject_with_operation_finish(volume, result, &error);
+
+ if(!eject_successful) {
/* ignore GIO errors handled internally */
if(error->domain != G_IO_ERROR || error->code != G_IO_ERROR_FAILED_HANDLED) {
gchar *volume_name = g_volume_get_name(volume);
@@ -494,7 +497,7 @@ xfdesktop_volume_icon_eject_finish(GObject *object,
}
#ifdef HAVE_LIBNOTIFY
- xfdesktop_notify_eject_finish(volume);
+ xfdesktop_notify_eject_finish(volume, eject_successful);
#endif
g_object_unref(icon);
@@ -510,12 +513,15 @@ xfdesktop_volume_icon_unmount_finish(GObject *object,
GtkWidget *toplevel = gtk_widget_get_toplevel(icon_view);
GMount *mount = G_MOUNT(object);
GError *error = NULL;
+ gboolean unmount_successful;
g_return_if_fail(G_IS_MOUNT(object));
g_return_if_fail(G_IS_ASYNC_RESULT(result));
g_return_if_fail(XFDESKTOP_IS_VOLUME_ICON(icon));
- if(!g_mount_unmount_with_operation_finish(mount, result, &error)) {
+ unmount_successful = g_mount_unmount_with_operation_finish(mount, result, &error);
+
+ if(!unmount_successful) {
/* ignore GIO errors handled internally */
if(error->domain != G_IO_ERROR || error->code != G_IO_ERROR_FAILED_HANDLED) {
gchar *mount_name = g_mount_get_name(mount);
@@ -536,7 +542,7 @@ xfdesktop_volume_icon_unmount_finish(GObject *object,
}
#ifdef HAVE_LIBNOTIFY
- xfdesktop_notify_unmount_finish(mount);
+ xfdesktop_notify_unmount_finish(mount, unmount_successful);
#endif
g_object_unref(icon);
@@ -646,8 +652,11 @@ static void
xfdesktop_volume_icon_menu_unmount(GtkWidget *widget, gpointer user_data)
{
XfdesktopVolumeIcon *icon = XFDESKTOP_VOLUME_ICON(user_data);
+ GtkWidget *icon_view = xfdesktop_icon_peek_icon_view(XFDESKTOP_ICON(icon));
+ GtkWidget *toplevel = gtk_widget_get_toplevel(icon_view);
GVolume *volume;
GMount *mount;
+ GMountOperation *operation;
volume = xfdesktop_volume_icon_peek_volume(icon);
mount = g_volume_get_mount(volume);
@@ -658,14 +667,20 @@ xfdesktop_volume_icon_menu_unmount(GtkWidget *widget, gpointer user_data)
#ifdef HAVE_LIBNOTIFY
xfdesktop_notify_unmount(mount);
#endif
- /* TODO: GMountOperation could be used to show what processes
- * are preventing an unmount. */
- g_mount_unmount_with_operation(mount, G_MOUNT_UNMOUNT_NONE,
- NULL, NULL,
+
+ operation = gtk_mount_operation_new(toplevel ? GTK_WINDOW(toplevel) : NULL);
+ gtk_mount_operation_set_screen(GTK_MOUNT_OPERATION(operation),
+ icon->priv->gscreen);
+
+ g_mount_unmount_with_operation(mount,
+ G_MOUNT_UNMOUNT_NONE,
+ operation,
+ NULL,
xfdesktop_volume_icon_unmount_finish,
g_object_ref(icon));
g_object_unref(mount);
+ g_object_unref(operation);
}
static void
@@ -673,8 +688,11 @@ xfdesktop_volume_icon_menu_eject(GtkWidget *widget,
gpointer user_data)
{
XfdesktopVolumeIcon *icon = XFDESKTOP_VOLUME_ICON(user_data);
+ GtkWidget *icon_view = xfdesktop_icon_peek_icon_view(XFDESKTOP_ICON(icon));
+ GtkWidget *toplevel = gtk_widget_get_toplevel(icon_view);
GVolume *volume;
GMount *mount;
+ GMountOperation *operation;
volume = xfdesktop_volume_icon_peek_volume(icon);
mount = g_volume_get_mount(volume);
@@ -686,10 +704,14 @@ xfdesktop_volume_icon_menu_eject(GtkWidget *widget,
#ifdef HAVE_LIBNOTIFY
xfdesktop_notify_eject(volume);
#endif
- /* TODO: GMountOperation could be used to show what processes
- * are preventing an eject. */
- g_volume_eject_with_operation(volume, G_MOUNT_UNMOUNT_NONE,
- NULL, NULL,
+ operation = gtk_mount_operation_new(toplevel ? GTK_WINDOW(toplevel) : NULL);
+ gtk_mount_operation_set_screen(GTK_MOUNT_OPERATION(operation),
+ icon->priv->gscreen);
+
+ g_volume_eject_with_operation(volume,
+ G_MOUNT_UNMOUNT_NONE,
+ operation,
+ NULL,
xfdesktop_volume_icon_eject_finish,
g_object_ref(icon));
} else {
@@ -698,6 +720,7 @@ xfdesktop_volume_icon_menu_eject(GtkWidget *widget,
}
g_object_unref(mount);
+ g_object_unref(operation);
}
static void
More information about the Xfce4-commits
mailing list