Attachment 584471 Details for Bug 819492 – Hack for shell

[patch] Hack for shell

0001-unmount-hack.patch (text/plain), 4.54 KB, created by Adel Gadllah on 2012-05-14 20:45:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adel Gadllah

Created: 2012-05-14 20:45:04 UTC

Size: 4.54 KB

patch

obsolete

>From d42c26ed47ca9b71ac4ae661fbd20e502725a0ec Mon Sep 17 00:00:00 2001
>From: Adel Gadllah <adel.gadllah@gmail.com>
>Date: Mon, 14 May 2012 22:30:39 +0200
>Subject: [PATCH] unmount hack
>
>---
> js/ui/autorunManager.js |   59 +++++++++++++++++++++++++++++++++++++++++-----
> 1 files changed, 52 insertions(+), 7 deletions(-)
>
>diff --git a/js/ui/autorunManager.js b/js/ui/autorunManager.js
>index 27d89e8..d67e9e2 100644
>--- a/js/ui/autorunManager.js
>+++ b/js/ui/autorunManager.js
>@@ -198,29 +198,36 @@ const AutorunManager = new Lang.Class({
>         let drive = mount.get_drive();
>         let volume = mount.get_volume();
> 
>+        let unmountNotifier = new UnmountNotifier();
>+
>         if (drive &&
>             drive.get_start_stop_type() == Gio.DriveStartStopType.SHUTDOWN &&
>             drive.can_stop()) {
>+            unmountNotifier.show();
>             drive.stop(0, mountOp.mountOp, null,
>                        Lang.bind(this, this._onStop));
>         } else {
>             if (mount.can_eject()) {
>+                unmountNotifier.show();
>                 mount.eject_with_operation(0, mountOp.mountOp, null,
>-                                           Lang.bind(this, this._onEject));
>+                                           Lang.bind(this, this._onEject, unmountNotifier));
>             } else if (volume && volume.can_eject()) {
>+                unmountNotifier.show();
>                 volume.eject_with_operation(0, mountOp.mountOp, null,
>-                                            Lang.bind(this, this._onEject));
>+                                            Lang.bind(this, this._onEject, unmountNotifier));
>             } else if (drive && drive.can_eject()) {
>+                unmountNotifier.show();
>                 drive.eject_with_operation(0, mountOp.mountOp, null,
>-                                           Lang.bind(this, this._onEject));
>+                                           Lang.bind(this, this._onEject, unmountNotifier));
>             } else if (mount.can_unmount()) {
>+                unmountNotifier.show();
>                 mount.unmount_with_operation(0, mountOp.mountOp, null,
>-                                             Lang.bind(this, this._onUnmount));
>+                                             Lang.bind(this, this._onUnmount, unmountNotifier));
>             }
>         }
>     },
> 
>-    _onUnmount: function(mount, res) {
>+    _onUnmount: function(mount, res, unmountNotifier) {
>         try {
>             mount.unmount_with_operation_finish(res);
>         } catch (e) {
>@@ -230,9 +237,10 @@ const AutorunManager = new Lang.Class({
>             log('Unable to eject the mount ' + mount.get_name() 
>                 + ': ' + e.toString());
>         }
>+        unmountNotifier.done();
>     },
> 
>-    _onEject: function(source, res) {
>+    _onEject: function(source, res, unmountNotifier) {
>         try {
>             source.eject_with_operation_finish(res);
>         } catch (e) {
>@@ -242,9 +250,10 @@ const AutorunManager = new Lang.Class({
>             log('Unable to eject the drive ' + source.get_name() 
>                 + ': ' + e.toString());
>         }
>+        unmountNotifier.done();
>     },
> 
>-    _onStop: function(drive, res) {
>+    _onStop: function(drive, res, unmountNotifier) {
>         try {
>             drive.stop_finish(res);
>         } catch (e) {
>@@ -254,9 +263,45 @@ const AutorunManager = new Lang.Class({
>             log('Unable to stop the drive ' + drive.get_name() 
>                 + ': ' + e.toString());
>         }
>+        unmountNotifier.done();
>     },
> });
> 
>+const UnmountNotifier = new Lang.Class({
>+    Name: 'UnmountNotifier',
>+
>+    _init: function() {
>+        this._notification = null;
>+
>+        this._source = new MessageTray.SystemNotificationSource();
>+        this._source.connect('destroy', Lang.bind(this,
>+            function() {
>+                this._source = null;
>+            }));
>+            Main.messageTray.add(this._source);
>+        }
>+    },
>+
>+    show: function() {
>+        if (this._source.notifications.length == 0) {
>+            this._notification = new MessageTray.Notification(this._source, _("Writting data to device, don't unplug until finished"), null);
>+        } else {
>+            notification = this._source.notifications[0];
>+            notification.update(text, null, { clear: true });
>+        }
>+
>+        notification.setResident(true);
>+
>+        this._source.notify(notification);
>+    },
>+
>+    done: function() {
>+        this._source.destroy();
>+    }
>+
>+});
>+
>+
> const AutorunResidentSource = new Lang.Class({
>     Name: 'AutorunResidentSource',
>     Extends: MessageTray.Source,
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 819492: 582641 | 582657 | 584469 | 584470 | 584471 | 584476 | 584477 | 584478 | 584479 | 584489 | 584491 | 584696 | 584797