diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2015-01-05 16:40:53 +0300 |
|---|---|---|
| committer | Olivier Goffart <ogoffart@woboq.com> | 2015-01-05 16:40:53 +0300 |
| commit | 414ac5433d3dc81ad530be4902723c02e549155b (patch) | |
| tree | 7b4e647a6e113f0bb761f2ed86b4e8e2f8509337 /shell_integration/MacOSX | |
| parent | 1dd4fecffba87ab2e4e180ec66cd854a634fbb14 (diff) | |
| parent | b2c01ffe21fbf1fc06ef91274fa3ebf5752bac34 (diff) | |
Merge branch '1.7'
Conflicts:
binary
doc/accountsetup.rst
doc/architecture.rst
doc/navigating.rst
doc/owncloudcmd.rst
doc/troubleshooting.rst
Diffstat (limited to 'shell_integration/MacOSX')
| -rw-r--r-- | shell_integration/MacOSX/OwnCloudFinder/ContentManager.m | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/shell_integration/MacOSX/OwnCloudFinder/ContentManager.m b/shell_integration/MacOSX/OwnCloudFinder/ContentManager.m index ee850bfb2..30d1be47e 100644 --- a/shell_integration/MacOSX/OwnCloudFinder/ContentManager.m +++ b/shell_integration/MacOSX/OwnCloudFinder/ContentManager.m @@ -63,14 +63,14 @@ static ContentManager* sharedInstance = nil; { NSString *base = path; - _icnOk = [[IconCache sharedInstance] registerIcon:[base stringByAppendingString:@"ok.icns"]]; - _icnSync = [[IconCache sharedInstance] registerIcon:[base stringByAppendingString:@"sync.icns"]]; - _icnWarn = [[IconCache sharedInstance] registerIcon:[base stringByAppendingString:@"warning.icns"]]; - _icnErr = [[IconCache sharedInstance] registerIcon:[base stringByAppendingString:@"error.icns"]]; - _icnOkSwm = [[IconCache sharedInstance] registerIcon:[base stringByAppendingString:@"ok_swm.icns"]]; - _icnSyncSwm = [[IconCache sharedInstance] registerIcon:[base stringByAppendingString:@"sync_swm.icns"]]; - _icnWarnSwm = [[IconCache sharedInstance] registerIcon:[base stringByAppendingString:@"warning_swm.icns"]]; - _icnErrSwm = [[IconCache sharedInstance] registerIcon:[base stringByAppendingString:@"error_swm.icns"]]; + _icnOk = [[IconCache sharedInstance] registerIcon:[base stringByAppendingPathComponent:@"ok.icns"]]; + _icnSync = [[IconCache sharedInstance] registerIcon:[base stringByAppendingPathComponent:@"sync.icns"]]; + _icnWarn = [[IconCache sharedInstance] registerIcon:[base stringByAppendingPathComponent:@"warning.icns"]]; + _icnErr = [[IconCache sharedInstance] registerIcon:[base stringByAppendingPathComponent:@"error.icns"]]; + _icnOkSwm = [[IconCache sharedInstance] registerIcon:[base stringByAppendingPathComponent:@"ok_swm.icns"]]; + _icnSyncSwm = [[IconCache sharedInstance] registerIcon:[base stringByAppendingPathComponent:@"sync_swm.icns"]]; + _icnWarnSwm = [[IconCache sharedInstance] registerIcon:[base stringByAppendingPathComponent:@"warning_swm.icns"]]; + _icnErrSwm = [[IconCache sharedInstance] registerIcon:[base stringByAppendingPathComponent:@"error_swm.icns"]]; NSLog(@"Icon ok identifier: %d from %@", [_icnOk intValue], [base stringByAppendingString:@"ok.icns"]); } |