tags 667874 + patch
thanks
Patch attached.
--- gworkspace-0.8.8.orig/GWorkspace/GWorkspace.m
+++ gworkspace-0.8.8/GWorkspace/GWorkspace.m
@@ -1054,29 +1054,29 @@
{
SEL action = [anItem action];
- if (sel_eq(action, @selector(showRecycler:))) {
+ if (sel_isEqual(action, @selector(showRecycler:))) {
return (([dtopManager isActive] == NO) || ([dtopManager dockActive] == NO));
- } else if (sel_eq(action, @selector(emptyRecycler:))) {
+ } else if (sel_isEqual(action, @selector(emptyRecycler:))) {
return ([trashContents count] != 0);
- } else if (sel_eq(action, @selector(checkRemovableMedia:))) {
+ } else if (sel_isEqual(action, @selector(checkRemovableMedia:))) {
return [dtopManager isActive];
- } else if (sel_eq(action, @selector(removeTShelfTab:))
- || sel_eq(action, @selector(renameTShelfTab:))
- || sel_eq(action, @selector(addTShelfTab:))) {
+ } else if (sel_isEqual(action, @selector(removeTShelfTab:))
+ || sel_isEqual(action, @selector(renameTShelfTab:))
+ || sel_isEqual(action, @selector(addTShelfTab:))) {
return [tshelfWin isVisible];
- } else if (sel_eq(action, @selector(activateContextHelp:))) {
+ } else if (sel_isEqual(action, @selector(activateContextHelp:))) {
return ([NSHelpManager isContextHelpModeActive] == NO);
- } else if (sel_eq(action, @selector(logout:))) {
+ } else if (sel_isEqual(action, @selector(logout:))) {
return !loggingout;
- } else if (sel_eq(action, @selector(cut:))
- || sel_eq(action, @selector(copy:))
- || sel_eq(action, @selector(paste:))) {
+ } else if (sel_isEqual(action, @selector(cut:))
+ || sel_isEqual(action, @selector(copy:))
+ || sel_isEqual(action, @selector(paste:))) {
NSWindow *kwin = [NSApp keyWindow];
if (kwin && [kwin isKindOfClass: [TShelfWin class]]) {
@@ -1086,7 +1086,7 @@
TShelfIconsView *iview = (TShelfIconsView *)[item view];
if ([iview iconsType] == DATA_TAB) {
- if (sel_eq(action, @selector(paste:))) {
+ if (sel_isEqual(action, @selector(paste:))) {
return YES;
} else {
return [iview hasSelectedIcon];
--- gworkspace-0.8.8.orig/GWorkspace/Desktop/GWDesktopManager.m
+++ gworkspace-0.8.8/GWorkspace/Desktop/GWDesktopManager.m
@@ -599,18 +599,18 @@
if ([self isActive]) {
SEL action = [menuItem action];
- if (sel_eq(action, @selector(duplicateFiles:))
- || sel_eq(action, @selector(recycleFiles:))
- || sel_eq(action, @selector(deleteFiles:))) {
+ if (sel_isEqual(action, @selector(duplicateFiles:))
+ || sel_isEqual(action, @selector(recycleFiles:))
+ || sel_isEqual(action, @selector(deleteFiles:))) {
return ([[desktopView selectedNodes] count] > 0);
- } else if (sel_eq(action, @selector(openSelection:))) {
+ } else if (sel_isEqual(action, @selector(openSelection:))) {
NSArray *selection = [desktopView selectedNodes];
return (selection && [selection count]
&& ([selection isEqual: [NSArray arrayWithObject: dskNode]] == NO));
- } else if (sel_eq(action, @selector(openWith:))) {
+ } else if (sel_isEqual(action, @selector(openWith:))) {
NSArray *selection = [desktopView selectedNodes];
BOOL canopen = YES;
int i;
@@ -632,7 +632,7 @@
return canopen;
- } else if (sel_eq(action, @selector(openSelectionAsFolder:))) {
+ } else if (sel_isEqual(action, @selector(openSelectionAsFolder:))) {
NSArray *selection = [desktopView selectedNodes];
if (selection && ([selection count] == 1)) {
--- gworkspace-0.8.8.orig/GWorkspace/FileViewer/GWViewer.m
+++ gworkspace-0.8.8/GWorkspace/FileViewer/GWViewer.m
@@ -1467,9 +1467,9 @@
} else if ([itemTitle isEqual: NSLocalizedString(@"Background Color...", @"")]) {
return [nodeView respondsToSelector: @selector(setBackgroundColor:)];
- } else if (sel_eq(action, @selector(duplicateFiles:))
- || sel_eq(action, @selector(recycleFiles:))
- || sel_eq(action, @selector(deleteFiles:))) {
+ } else if (sel_isEqual(action, @selector(duplicateFiles:))
+ || sel_isEqual(action, @selector(recycleFiles:))
+ || sel_isEqual(action, @selector(deleteFiles:))) {
if (lastSelection && [lastSelection count]
&& ([lastSelection isEqual: baseNodeArray] == NO)) {
return ([[baseNode path] isEqual: [gworkspace trashPath]] == NO);
@@ -1477,7 +1477,7 @@
return NO;
- } else if (sel_eq(action, @selector(openSelection:))) {
+ } else if (sel_isEqual(action, @selector(openSelection:))) {
if ([[baseNode path] isEqual: [gworkspace trashPath]] == NO) {
BOOL canopen = YES;
int i;
@@ -1501,14 +1501,14 @@
return NO;
- } else if (sel_eq(action, @selector(openSelectionAsFolder:))) {
+ } else if (sel_isEqual(action, @selector(openSelectionAsFolder:))) {
if (lastSelection && ([lastSelection count] == 1)) {
return [[lastSelection objectAtIndex: 0] isPackage];
}
return NO;
- } else if (sel_eq(action, @selector(openWith:))) {
+ } else if (sel_isEqual(action, @selector(openWith:))) {
BOOL canopen = YES;
int i;
@@ -1529,8 +1529,8 @@
return canopen;
- } else if (sel_eq(action, @selector(newFolder:))
- || sel_eq(action, @selector(newFile:))) {
+ } else if (sel_isEqual(action, @selector(newFolder:))
+ || sel_isEqual(action, @selector(newFile:))) {
if ([[baseNode path] isEqual: [gworkspace trashPath]] == NO) {
return [[nodeView shownNode] isWritable];
}
--- gworkspace-0.8.8.orig/GWorkspace/FileViewer/GWSpatialViewer.m
+++ gworkspace-0.8.8/GWorkspace/FileViewer/GWSpatialViewer.m
@@ -1158,9 +1158,9 @@
} else if ([itemTitle isEqual: NSLocalizedString(@"Background Color...", @"")]) {
return [nodeView respondsToSelector: @selector(setBackgroundColor:)];
- } else if (sel_eq(action, @selector(duplicateFiles:))
- || sel_eq(action, @selector(recycleFiles:))
- || sel_eq(action, @selector(deleteFiles:))) {
+ } else if (sel_isEqual(action, @selector(duplicateFiles:))
+ || sel_isEqual(action, @selector(recycleFiles:))
+ || sel_isEqual(action, @selector(deleteFiles:))) {
if (lastSelection && [lastSelection count]
&& ([lastSelection isEqual: baseNodeArray] == NO)) {
return ([[baseNode path] isEqual: [gworkspace trashPath]] == NO);
@@ -1168,7 +1168,7 @@
return NO;
- } else if (sel_eq(action, @selector(openSelection:))) {
+ } else if (sel_isEqual(action, @selector(openSelection:))) {
if ([[baseNode path] isEqual: [gworkspace trashPath]] == NO) {
return (lastSelection && [lastSelection count]
&& ([lastSelection isEqual: baseNodeArray] == NO));
@@ -1176,14 +1176,14 @@
return NO;
- } else if (sel_eq(action, @selector(openSelectionAsFolder:))) {
+ } else if (sel_isEqual(action, @selector(openSelectionAsFolder:))) {
if (lastSelection && ([lastSelection count] == 1)) {
return [[lastSelection objectAtIndex: 0] isPackage];
}
return NO;
- } else if (sel_eq(action, @selector(openWith:))) {
+ } else if (sel_isEqual(action, @selector(openWith:))) {
BOOL canopen = YES;
int i;
@@ -1204,8 +1204,8 @@
return canopen;
- } else if (sel_eq(action, @selector(newFolder:))
- || sel_eq(action, @selector(newFile:))) {
+ } else if (sel_isEqual(action, @selector(newFolder:))
+ || sel_isEqual(action, @selector(newFile:))) {
if ([[baseNode path] isEqual: [gworkspace trashPath]] == NO) {
return [[nodeView shownNode] isWritable];
}
