mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-22 13:05:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

shell_integration: Remove OwnCloud from public strings on OSX

Browse source 
Also removed it from commented out logs just in case.
This commit is contained in:
Jocelyn Turcotte 2015-02-25 12:10:36 +01:00
parent 5c7fd24ea8
commit a98ab6f51d
4 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
shell_integration/MacOSX/OwnCloudFinder/ContentManager.m
View file

@ -111,7 +111,7 @@ static ContentManager* sharedInstance = nil;
}else if( [result isEqualToString:@"NOP"]) {
// Nothing.
} else {
NSLog(@"OwnCloud: Unknown status code %@", result);
NSLog(@"SyncState: Unknown status code %@", result);
}
NSString* normalizedPath = [path decomposedStringWithCanonicalMapping];
@ -129,7 +129,7 @@ static ContentManager* sharedInstance = nil;
//NSLog(@"%@ %@", NSStringFromSelector(_cmd), path);
if (!_fileIconsEnabled)
{
NSLog(@"OwnCloud: Icons are NOT ENABLED!");
NSLog(@"SyncState: Icons are NOT ENABLED!");
// return nil;
}
@ -284,7 +284,7 @@ static ContentManager* sharedInstance = nil;
}
else
{
NSLog(@"OwnCloudFinder: refreshing icon badges failed");
NSLog(@"SyncState: refreshing icon badges failed");
return;
}
@ -333,7 +333,7 @@ static ContentManager* sharedInstance = nil;
}
else
{
NSLog(@"OwnCloudFinder: refreshing icon badges failed");
NSLog(@"SyncState: refreshing icon badges failed");
return;
}

12
shell_integration/MacOSX/OwnCloudFinder/FinderHook.m
View file

@ -44,12 +44,12 @@ static BOOL installed = NO;
{
if (installed)
{
// NSLog(@"OwnCloudFinder: already installed");
// NSLog(@"SyncStateFinder: already installed");
return;
}
// NSLog(@"OwnCloudFinder: installing ownCloud Shell extension");
// NSLog(@"SyncStateFinder: installing SyncState Shell extension");
[RequestManager sharedInstance];
@ -81,19 +81,19 @@ static BOOL installed = NO;
installed = YES;
// NSLog(@"OwnCloudFinder: installed");
// NSLog(@"SyncStateFinder: installed");
}
+ (void)uninstall
{
if (!installed)
{
// NSLog(@"OwnCloudFinder: not installed");
// NSLog(@"SyncStateFinder: not installed");
return;
}
// NSLog(@"OwnCloudFinder: uninstalling");
// NSLog(@"SyncStateFinder: uninstalling");
[[ContentManager sharedInstance] dealloc];
@ -119,7 +119,7 @@ static BOOL installed = NO;
installed = NO;
// NSLog(@"OwnCloudFinder: uninstalled");
// NSLog(@"SyncStateFinder: uninstalled");
}
@end

4
shell_integration/MacOSX/OwnCloudFinder/RequestManager.m
View file

@ -170,10 +170,10 @@ static RequestManager* sharedInstance = nil;
_shareMenuTitle = [[chunks objectAtIndex:1] copy];
// NSLog(@"Received shar menu title: %@", _shareMenuTitle);
} else {
NSLog(@"OwnCloud: Unknown command %@", [chunks objectAtIndex:0]);
NSLog(@"SyncState: Unknown command %@", [chunks objectAtIndex:0]);
}
} else if (tag != READ_TAG) {
NSLog(@"OwnCloud: Received unknown tag %ld <%@>", tag, answer);
NSLog(@"SyncState: Received unknown tag %ld <%@>", tag, answer);
}
// Read on and on
NSData* stop = [@"\n" dataUsingEncoding:NSUTF8StringEncoding];

14
shell_integration/MacOSX/OwnCloudInjector/OwnCloudInjector.m
View file

@ -7,7 +7,7 @@
#define WAIT_FOR_APPLE_EVENT_TO_ENTER_HANDLER_IN_SECONDS 1.0
#define FINDER_MIN_TESTED_VERSION @"10.7"
#define FINDER_MAX_TESTED_VERSION @"10.8.5"
#define LIFERAYNATIVITY_INJECTED_NOTIFICATION @"OwnCloudInjectedNotification"
#define LIFERAYNATIVITY_INJECTED_NOTIFICATION @"SyncStateInjectedNotification"
EXPORT OSErr HandleLoadEvent(const AppleEvent* ev, AppleEvent* reply, long refcon);
@ -78,14 +78,14 @@ static OSErr loadBundle(LNBundleType type, AppleEvent* reply, long refcon) {
minVersion = FINDER_MIN_TESTED_VERSION;
break;
default:
NSLog(@"OwnCloudInjector: Failed to load bundle for type %d", type);
NSLog(@"SyncStateInjector: Failed to load bundle for type %d", type);
return 8;
break;
}
if (isLoaded) {
// NSLog(@"OwnCloudInjector: %@ already loaded.", bundleName);
// NSLog(@"SyncStateInjector: %@ already loaded.", bundleName);
return noErr;
}
@ -149,7 +149,7 @@ static OSErr loadBundle(LNBundleType type, AppleEvent* reply, long refcon) {
}
id principalClassObject = NSClassFromString(NSStringFromClass(principalClass));
if ([principalClassObject respondsToSelector:@selector(install)]) {
// NSLog(@"OwnCloudInjector: Installing %@ ...", bundleName);
// NSLog(@"SyncStateInjector: Installing %@ ...", bundleName);
[principalClassObject install];
}
@ -186,7 +186,7 @@ EXPORT OSErr HandleLoadEvent(const AppleEvent* ev, AppleEvent* reply, long refco
NSString* injectorVersion = [injectorBundle objectForInfoDictionaryKey:@"CFBundleVersion"];
if (!injectorVersion || ![injectorVersion isKindOfClass:[NSString class]]) {
reportError(reply, [NSString stringWithFormat:@"Unable to determine OwnCloudInjector version!"]);
reportError(reply, [NSString stringWithFormat:@"Unable to determine SyncStateInjector version!"]);
return 7;
}
@ -232,7 +232,7 @@ EXPORT OSErr HandleUnloadEvent(const AppleEvent* ev, AppleEvent* reply, long ref
@autoreleasepool {
@try {
if (!liferayNativityLoaded) {
// NSLog(@"OwnCloudInjector: not loaded.");
// NSLog(@"SyncStateInjector: not loaded.");
return noErr;
}
@ -253,7 +253,7 @@ EXPORT OSErr HandleUnloadEvent(const AppleEvent* ev, AppleEvent* reply, long ref
}
id principalClassObject = NSClassFromString(NSStringFromClass(principalClass));
if ([principalClassObject respondsToSelector:@selector(uninstall)]) {
// NSLog(@"OwnCloudInjector: Uninstalling %@ ...", bundleName);
// NSLog(@"SyncStateInjector: Uninstalling %@ ...", bundleName);
[principalClassObject uninstall];
}