[Pkg-owncloud-commits] [owncloud-client] 237/498: Merge pull request #3347 from jturcotte/shell_integration_findersync
Sandro Knauß
hefee-guest at moszumanska.debian.org
Tue Aug 11 14:48:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 0610d3ea8d27e8ab5d1bf629ce443092cbdd0fbd
Merge: ba613a1 360a0ee
Author: Daniel Molkentin <daniel at molkentin.de>
Date: Thu Jul 2 14:20:24 2015 +0200
Merge pull request #3347 from jturcotte/shell_integration_findersync
shell_i: Add a FinderSync-based implementation #2340
CMakeLists.txt | 4 +
admin/osx/sign_app.sh | 10 +-
config.h.in | 3 +-
shell_integration/MacOSX/CMakeLists.txt | 25 +-
.../OwnCloud.xcworkspace/contents.xcworkspacedata | 3 +
.../xcshareddata/OwnCloud.xccheckout | 10 +-
.../MacOSX/OwnCloudFinder/ContentManager.h | 6 +-
.../MacOSX/OwnCloudFinder/ContentManager.m | 41 +-
.../MacOSX/OwnCloudFinder/FinderHook.m | 6 +-
.../MacOSX/OwnCloudFinder/GCDAsyncSocket.h | 1094 ---
.../MacOSX/OwnCloudFinder/GCDAsyncSocket.m | 7952 --------------------
.../MacOSX/OwnCloudFinder/IconCache.h | 4 +-
.../MacOSX/OwnCloudFinder/IconCache.m | 50 +-
.../MacOSX/OwnCloudFinder/IconOverlayHandlers.m | 6 +-
shell_integration/MacOSX/OwnCloudFinder/Info.plist | 2 +
.../MacOSX/OwnCloudFinder/MenuManager.m | 4 +-
.../OwnCloudFinder.xcodeproj/project.pbxproj | 71 +-
.../MacOSX/OwnCloudFinder/RequestManager.h | 12 +-
.../MacOSX/OwnCloudFinder/RequestManager.m | 236 +-
.../OwnCloudFinderSync/FinderSyncExt/FinderSync.h | 28 +
.../OwnCloudFinderSync/FinderSyncExt/FinderSync.m | 170 +
.../FinderSyncExt/FinderSyncExt.entitlements | 12 +
.../OwnCloudFinderSync/FinderSyncExt/Info.plist | 43 +
.../OwnCloudFinderSync.xcodeproj/project.pbxproj | 520 ++
.../xcshareddata/xcschemes/FinderSyncExt.xcscheme | 105 +
.../OwnCloudFinderSync/desktopclient/Info.plist | 30 +
.../MacOSX/OwnCloudFinderSync/desktopclient/main.m | 16 +
shell_integration/MacOSX/common/SyncClientProxy.h | 43 +
shell_integration/MacOSX/common/SyncClientProxy.m | 147 +
shell_integration/MacOSX/deploy.sh | 6 +
shell_integration/icons/128x128/.DS_Store | Bin 6148 -> 0 bytes
shell_integration/icons/32x32/.DS_Store | Bin 6148 -> 0 bytes
shell_integration/icons/512x512/.DS_Store | Bin 6148 -> 0 bytes
shell_integration/icons/CMakeLists.txt | 12 -
.../icons/nopadding/SVG/attention.svg | 32 +
shell_integration/icons/nopadding/SVG/error.svg | 36 +
shell_integration/icons/nopadding/SVG/ok.svg | 23 +
shell_integration/icons/nopadding/SVG/shared.svg | 62 +
shell_integration/icons/nopadding/SVG/sync.svg | 55 +
.../icons/nopadding/error.iconset/icon_128x128.png | Bin 0 -> 5541 bytes
.../nopadding/error.iconset/icon_128x128 at 2x.png | Bin 0 -> 11767 bytes
.../icons/nopadding/error.iconset/icon_16x16.png | Bin 0 -> 603 bytes
.../nopadding/error.iconset/icon_16x16 at 2x.png | Bin 0 -> 1257 bytes
.../icons/nopadding/error.iconset/icon_256x256.png | Bin 0 -> 11689 bytes
.../nopadding/error.iconset/icon_256x256 at 2x.png | Bin 0 -> 25593 bytes
.../icons/nopadding/error.iconset/icon_32x32.png | Bin 0 -> 1255 bytes
.../nopadding/error.iconset/icon_32x32 at 2x.png | Bin 0 -> 2506 bytes
.../icons/nopadding/ok.iconset/icon_128x128.png | Bin 0 -> 6666 bytes
.../icons/nopadding/ok.iconset/icon_128x128 at 2x.png | Bin 0 -> 14441 bytes
.../icons/nopadding/ok.iconset/icon_16x16.png | Bin 0 -> 615 bytes
.../icons/nopadding/ok.iconset/icon_16x16 at 2x.png | Bin 0 -> 1243 bytes
.../icons/nopadding/ok.iconset/icon_256x256.png | Bin 0 -> 14634 bytes
.../icons/nopadding/ok.iconset/icon_256x256 at 2x.png | Bin 0 -> 31427 bytes
.../icons/nopadding/ok.iconset/icon_32x32.png | Bin 0 -> 1243 bytes
.../icons/nopadding/ok.iconset/icon_32x32 at 2x.png | Bin 0 -> 2722 bytes
.../nopadding/ok_swm.iconset/icon_128x128.png | Bin 0 -> 7492 bytes
.../nopadding/ok_swm.iconset/icon_128x128 at 2x.png | Bin 0 -> 16248 bytes
.../icons/nopadding/ok_swm.iconset/icon_16x16.png | Bin 0 -> 647 bytes
.../nopadding/ok_swm.iconset/icon_16x16 at 2x.png | Bin 0 -> 1452 bytes
.../nopadding/ok_swm.iconset/icon_256x256.png | Bin 0 -> 16286 bytes
.../nopadding/ok_swm.iconset/icon_256x256 at 2x.png | Bin 0 -> 35262 bytes
.../icons/nopadding/ok_swm.iconset/icon_32x32.png | Bin 0 -> 1462 bytes
.../nopadding/ok_swm.iconset/icon_32x32 at 2x.png | Bin 0 -> 3267 bytes
.../icons/nopadding/sync.iconset/icon_128x128.png | Bin 0 -> 7701 bytes
.../nopadding/sync.iconset/icon_128x128 at 2x.png | Bin 0 -> 16662 bytes
.../icons/nopadding/sync.iconset/icon_16x16.png | Bin 0 -> 694 bytes
.../icons/nopadding/sync.iconset/icon_16x16 at 2x.png | Bin 0 -> 1522 bytes
.../icons/nopadding/sync.iconset/icon_256x256.png | Bin 0 -> 16662 bytes
.../nopadding/sync.iconset/icon_256x256 at 2x.png | Bin 0 -> 35628 bytes
.../icons/nopadding/sync.iconset/icon_32x32.png | Bin 0 -> 1563 bytes
.../icons/nopadding/sync.iconset/icon_32x32 at 2x.png | Bin 0 -> 3459 bytes
.../nopadding/warning.iconset/icon_128x128.png | Bin 0 -> 6039 bytes
.../nopadding/warning.iconset/icon_128x128 at 2x.png | Bin 0 -> 12859 bytes
.../icons/nopadding/warning.iconset/icon_16x16.png | Bin 0 -> 523 bytes
.../nopadding/warning.iconset/icon_16x16 at 2x.png | Bin 0 -> 1082 bytes
.../nopadding/warning.iconset/icon_256x256.png | Bin 0 -> 12859 bytes
.../nopadding/warning.iconset/icon_256x256 at 2x.png | Bin 0 -> 27637 bytes
.../icons/nopadding/warning.iconset/icon_32x32.png | Bin 0 -> 1082 bytes
.../nopadding/warning.iconset/icon_32x32 at 2x.png | Bin 0 -> 2582 bytes
src/cmd/cmd.cpp | 1 -
src/gui/CMakeLists.txt | 1 +
src/gui/folder.cpp | 1 +
src/gui/folderwatcher_mac.cpp | 6 +-
src/gui/owncloudgui.cpp | 50 +-
src/gui/socketapi.cpp | 52 +-
src/gui/socketapi.h | 30 +-
src/gui/socketapisocket_mac.h | 69 +
src/gui/socketapisocket_mac.mm | 225 +
src/gui/updater/ocupdater.cpp | 1 -
src/libsync/utility.cpp | 1 +
src/libsync/utility_mac.cpp | 1 +
src/libsync/version.h.in | 2 +
92 files changed, 1873 insertions(+), 9446 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list