Author: rmottola
Date: Tue May 26 16:28:29 2015
New Revision: 38562
URL: http://svn.gna.org/viewcvs/gnustep?rev=38562&view=rev
Log:
minor cleanup
Modified:
apps/gworkspace/trunk/GWorkspace/GWorkspace.m
Modified: apps/gworkspace/trunk/GWorkspace/GWorkspace.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/GWorkspace/GWorkspace.m?rev=38562&r1=38561&r2=38562&view=diff
==============================================================================
--- apps/gworkspace/trunk/GWorkspace/GWorkspace.m (original)
+++ apps/gworkspace/trunk/GWorkspace/GWorkspace.m Tue May 26 16:28:29 2015
@@ -1474,7 +1474,8 @@
NSArray *vpaths = [ws mountedLocalVolumePaths];
NSMutableArray *umountPaths = [NSMutableArray array];
NSMutableArray *files = [NSMutableArray array];
- int tag, i;
+ NSUInteger i;
+ int tag;
for (i = 0; i < [selectedPaths count]; i++) {
NSString *path = [selectedPaths objectAtIndex: i];
@@ -1490,23 +1491,25 @@
[ws unmountAndEjectDeviceAtPath: [umountPaths objectAtIndex: i]];
}
- if ([files count]) {
- NSString *basePath = [NSString stringWithString: [selectedPaths
objectAtIndex: 0]];
-
- basePath = [basePath stringByDeletingLastPathComponent];
-
- if ([fm isWritableFileAtPath: basePath] == NO) {
- NSString *err = NSLocalizedString(@"Error", @"");
- NSString *msg = NSLocalizedString(@"You do not have write
permission\nfor", @"");
- NSString *buttstr = NSLocalizedString(@"Continue", @"");
- NSRunAlertPanel(err, [NSString stringWithFormat: @"%@ \"%@\"!\n", msg,
basePath], buttstr, nil, nil);
- return;
- }
-
- [self performFileOperation: NSWorkspaceRecycleOperation
- source: basePath destination: trashPath
- files: files tag: &tag];
- }
+ if ([files count])
+ {
+ NSString *basePath = [NSString stringWithString: [selectedPaths
objectAtIndex: 0]];
+
+ basePath = [basePath stringByDeletingLastPathComponent];
+
+ if ([fm isWritableFileAtPath: basePath] == NO)
+ {
+ NSString *err = NSLocalizedString(@"Error", @"");
+ NSString *msg = NSLocalizedString(@"You do not have write
permission\nfor", @"");
+ NSString *buttstr = NSLocalizedString(@"Continue", @"");
+ NSRunAlertPanel(err, [NSString stringWithFormat: @"%@ \"%@\"!\n",
msg, basePath], buttstr, nil, nil);
+ return;
+ }
+
+ [self performFileOperation: NSWorkspaceRecycleOperation
+ source: basePath destination: trashPath
+ files: files tag: &tag];
+ }
}
- (BOOL)verifyFileAtPath:(NSString *)path
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
