Author: rmottola
Date: Fri Feb 26 23:25:54 2016
New Revision: 39420
URL: http://svn.gna.org/viewcvs/gnustep?rev=39420&view=rev
Log:
Implement unlock methods and use them when unmounting fails
Modified:
apps/gworkspace/trunk/ChangeLog
apps/gworkspace/trunk/GWorkspace/Desktop/Dock/DockIcon.m
apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopManager.h
apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopManager.m
apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopView.h
apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopView.m
Modified: apps/gworkspace/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/ChangeLog?rev=39420&r1=39419&r2=39420&view=diff
==============================================================================
--- apps/gworkspace/trunk/ChangeLog (original)
+++ apps/gworkspace/trunk/ChangeLog Fri Feb 26 23:25:54 2016
@@ -1,3 +1,12 @@
+2016-02-26 Riccardo Mottola <[email protected]>
+
+ * GWorkspace/Desktop/Dock/DockIcon.m
+ * GWorkspace/Desktop/GWDesktopManager.h
+ * GWorkspace/Desktop/GWDesktopManager.m
+ * GWorkspace/Desktop/GWDesktopView.h
+ * GWorkspace/Desktop/GWDesktopView.m
+ Implement unlock methods and use them when unmounting fails.
+
2016-02-23 Riccardo Mottola <[email protected]>
* GWorkspace/GWorkspace.m
Modified: apps/gworkspace/trunk/GWorkspace/Desktop/Dock/DockIcon.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/GWorkspace/Desktop/Dock/DockIcon.m?rev=39420&r1=39419&r2=39420&view=diff
==============================================================================
--- apps/gworkspace/trunk/GWorkspace/Desktop/Dock/DockIcon.m (original)
+++ apps/gworkspace/trunk/GWorkspace/Desktop/Dock/DockIcon.m Fri Feb 26
23:25:54 2016
@@ -593,7 +593,8 @@
NSString *err = NSLocalizedString(@"Error", @"");
NSString *msg = NSLocalizedString(@"You are not allowed to
umount\n", @"");
NSString *buttstr = NSLocalizedString(@"Continue", @"");
- NSRunAlertPanel(err, [NSString stringWithFormat: @"%@ \"%@\"!\n",
msg, umpath], buttstr, nil, nil);
+ NSRunAlertPanel(err, [NSString stringWithFormat: @"%@ \"%@\"!\n",
msg, umpath], buttstr, nil, nil);
+ [[GWDesktopManager desktopManager] unlockVolumeAtPath:umpath];
}
}
Modified: apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopManager.h
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopManager.h?rev=39420&r1=39419&r2=39420&view=diff
==============================================================================
--- apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopManager.h (original)
+++ apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopManager.h Fri Feb 26
23:25:54 2016
@@ -1,6 +1,6 @@
/* GWDesktopManager.h
*
- * Copyright (C) 2005-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2005-2016 Free Software Foundation, Inc.
*
* Author: Enrico Sersale <[email protected]>
* Date: January 2005
@@ -149,6 +149,8 @@
- (void)mountedVolumesDidChange;
+- (void)unlockVolumeAtPath:(NSString *)volpath;
+
- (void)updateDefaults;
- (void)setContextHelp;
Modified: apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopManager.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopManager.m?rev=39420&r1=39419&r2=39420&view=diff
==============================================================================
--- apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopManager.m (original)
+++ apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopManager.m Fri Feb 26
23:25:54 2016
@@ -558,6 +558,12 @@
[fsnodeRep unlockPaths: [NSArray arrayWithObject: volpath]];
[[self desktopView] workspaceDidUnmountVolumeAtPath: volpath];
}
+}
+
+- (void)unlockVolumeAtPath:(NSString *)volpath
+{
+ [fsnodeRep unlockPaths: [NSArray arrayWithObject: volpath]];
+ [[self desktopView] unlockVolumeAtPath: volpath];
}
- (void)mountedVolumesDidChange
Modified: apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopView.h
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopView.h?rev=39420&r1=39419&r2=39420&view=diff
==============================================================================
--- apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopView.h (original)
+++ apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopView.h Fri Feb 26
23:25:54 2016
@@ -1,6 +1,6 @@
/* GWDesktopView.h
*
- * Copyright (C) 2005-2012 Free Software Foundation, Inc.
+ * Copyright (C) 2005-2016 Free Software Foundation, Inc.
*
* Author: Enrico Sersale <[email protected]>
* Date: January 2005
@@ -65,6 +65,8 @@
- (void)workspaceWillUnmountVolumeAtPath:(NSString *)vpath;
- (void)workspaceDidUnmountVolumeAtPath:(NSString *)vpath;
+
+- (void)unlockVolumeAtPath:(NSString *)path;
- (void)showMountedVolumes;
Modified: apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopView.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopView.m?rev=39420&r1=39419&r2=39420&view=diff
==============================================================================
--- apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopView.m (original)
+++ apps/gworkspace/trunk/GWorkspace/Desktop/GWDesktopView.m Fri Feb 26
23:25:54 2016
@@ -147,6 +147,11 @@
}
}
+- (void)unlockVolumeAtPath:(NSString *)path
+{
+ [self checkLockedReps];
+}
+
- (void)showMountedVolumes
{
NSArray *rvpaths = [[NSWorkspace sharedWorkspace] mountedRemovableMedia];
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
