Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJocelyn Turcotte <jturcotte@woboq.com>2015-06-17 17:08:57 +0300
committerJocelyn Turcotte <jturcotte@woboq.com>2015-06-17 18:15:50 +0300
commit85938ab1f15c78d86aa80ba1853674810a3afe9e (patch)
treea72e5d550e1f80b1304ecf1e7d388dfda67faa81 /shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt
parente111e11dabc965215591e498648610776983047e (diff)
shell_i: Remove the ICON_PATH socket API message #2340
It was only used on OS X and couldn't be used by the FinderSync extension since that one runs in a sandbox. So use the same system to load images in the legacy extension by shipping them in the extension bundle instead of the owncloud.app bundle. This is also given that the legacy extension needs padded icons while the FinderSync one needs unpadded icons.
Diffstat (limited to 'shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt')
-rw-r--r--shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/FinderSync.m7
1 files changed, 1 insertions, 6 deletions
diff --git a/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/FinderSync.m b/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/FinderSync.m
index fc4a687cc..0ffc7c550 100644
--- a/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/FinderSync.m
+++ b/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/FinderSync.m
@@ -44,7 +44,7 @@
[syncController setBadgeImage:warning label:@"Ignored" forBadgeIdentifier:@"IGNORE+SWM"];
[syncController setBadgeImage:error label:@"Error" forBadgeIdentifier:@"ERROR+SWM"];
- // The Mach post name needs to be prefixed with the code signing Team ID
+ // The Mach port name needs to be prefixed with the code signing Team ID
// https://developer.apple.com/library/mac/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html#//apple_ref/doc/uid/TP40011183-CH3-SW24
NSString *serverName = [[teamIdentifierPrefix stringByAppendingString:[extBundle bundleIdentifier]]
stringByReplacingOccurrencesOfString:@".FinderSyncExt" withString:@".socketApi"];
@@ -148,11 +148,6 @@
_shareMenuTitle = title;
}
-- (void)loadIconResourcePath:(NSString*)path
-{
-#pragma unused(path)
-}
-
- (void)connectionDidDie
{
_shareMenuTitle = nil;