Attachment 584478 Details for Bug 819492 – fixed patch

[patch] fixed patch

diff (text/plain), 4.04 KB, created by Bill Nottingham on 2012-05-14 21:11:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Nottingham

Created: 2012-05-14 21:11:07 UTC

Size: 4.04 KB

patch

obsolete

>--- autorunManager.js	2012-04-20 13:17:21.000000000 -0400
>+++ /home/notting/autorunManager.js	2012-05-14 17:05:55.058749877 -0400
>@@ -198,29 +198,36 @@
>         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 @@
>             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 @@
>             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,44 @@
>             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, _("Writing data to device, don't unplug until finished"), null);
>+        } else {
>+            this._notification = this._source.notifications[0];
>+            this._notification.update(text, null, { clear: true });
>+        }
>+
>+        this._notification.setResident(true);
>+
>+        this._source.notify(this._notification);
>+    },
>+
>+    done: function() {
>+        this._source.destroy();
>+    }
>+
>+});
>+
>+
> const AutorunResidentSource = new Lang.Class({
>     Name: 'AutorunResidentSource',
>     Extends: MessageTray.Source,

Actions: View | Diff

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