Add travis file

Fix tests
[tx-robot] updated from transifex
2014-08-27 14:01:35 +02:00 · 2014-08-27 10:27:29 +02:00 · 2014-08-27 01:25:26 -04:00 · 2014-08-26 14:33:21 +02:00 · 2014-08-26 11:29:42 +02:00 · 2014-08-12 21:08:44 +02:00
@@ -2,4 +2,4 @@
 .gitignore              export-ignore
 .gitattributes          export-ignore
 .commit-template        export-ignore
-binary/                 export-ignore
+/binary                 export-ignore
@@ -3,7 +3,7 @@
 	url = https://github.com/owncloud/documentation
 [submodule "src/3rdparty/qtmacgoodies"]
 	path = src/3rdparty/qtmacgoodies
-	url = git://github.com/shadone/qtmacgoodies.git
+	url = git://github.com/guruz/qtmacgoodies.git
 [submodule "binary"]
 	path = binary
 	url = git://github.com/owncloud/owncloud-client-binary.git
@@ -0,0 +1,35 @@
+language: cpp
+
+compiler: 
+  - gcc
+  - clang
+
+env:
+  - QT=qt4
+  - QT=qt5 PATH=/opt/Qt/5.3/gcc_64/bin:/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin
+
+os:
+  - linux
+  - osx
+
+before_install:
+  - sh -c "if [ '$QT' = 'qt4' ]; then wget http://download.opensuse.org/repositories/isv:ownCloud:desktop/xUbuntu_12.04/Release.key; sudo apt-key add - < Release.key; fi"
+  - sudo sh -c "if [ '$QT' = 'qt4' ]; then echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/xUbuntu_12.04/ /' > /etc/apt/sources.list.d/qtkeychain.list; fi"
+  - sh -c "if [ '$QT' = 'qt4' ]; then sudo apt-get update -qq; sudo apt-get install -qq libqt4-dev qt4-dev-tools libqtkeychain-dev; fi"
+  - sh -c "if [ '$QT' = 'qt5' ]; then sudo apt-add-repository -y ppa:canonical-qt5-edgers/qt5-daily; sudo apt-get update -qq; sudo apt-get install -qq qtdeclarative5-dev libqt5webkit5-dev qttools5-dev; fi"
+  - sh -c "if [ '$QT' = 'qt5' ]; then wget http://download.opensuse.org/repositories/home:/DeepDiver1975:/branches:/isv:/ownCloud:/desktop/xUbuntu_13.10/Release.key; sudo apt-key add - < Release.key; fi"
+  - sudo sh -c "if [ '$QT' = 'qt5' ]; then echo 'deb http://download.opensuse.org/repositories/home:/DeepDiver1975:/branches:/isv:/ownCloud:/desktop/xUbuntu_13.10/ /' > /etc/apt/sources.list.d/qt5keychain.list; fi"
+  - sh -c "if [ '$QT' = 'qt5' ]; then wget http://download.owncloud.com/download/qt-5.3-travis.tar.xz; fi"
+  - sh -c "if [ '$QT' = 'qt5' ]; then sudo tar xif -C /opt ~/qt-5.3-travis.tar.xz; fi"
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq cmake sqlite3 libneon27-gnutls-dev
+
+before_script:
+  - mkdir build
+  - cd build
+  - cmake -DUNIT_TESTING=1 ..
+
+script: 
+  - make
+  - ctest --output-on-failure
+
@@ -14,20 +14,12 @@ if ( EXISTS ${OEM_THEME_DIR}/OEM.cmake )
 else ()
     include ( ${CMAKE_SOURCE_DIR}/OWNCLOUD.cmake )
 endif()
-# need this logic to not mess with re/uninstallations via macosx.pkgproj
-if(${APPLICATION_REV_DOMAIN} STREQUAL "com.owncloud.desktopclient")
-    set(APPLICATION_REV_DOMAIN_INSTALLER "com.ownCloud.client")
-else()
-    set(APPLICATION_REV_DOMAIN_INSTALLER ${APPLICATION_REV_DOMAIN})
-endif()
-

 if (NOT DEFINED APPLICATION_SHORTNAME)
     set ( APPLICATION_SHORTNAME ${APPLICATION_NAME} )
 endif()

 include(${CMAKE_SOURCE_DIR}/VERSION.cmake)
-configure_file( ${CMAKE_SOURCE_DIR}/src/mirall/version.h.in "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/version.h" )
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_CURRENT_BINARY_DIR}/src/mirall/")

 #####
@@ -59,7 +51,6 @@ if (${GIT_SHA1} STREQUAL "GITDIR-NOTFOUND")
        set (GIT_SHA1 "${sha1_candidate}")
    endif()
 endif()
-message(STATUS "GIT_SHA1 ${GIT_SHA1}")
 endif()

 set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
@@ -70,9 +61,9 @@ set(DATADIR ${DATA_INSTALL_DIR})
 # BUILD_OWNCLOUD_OSX_BUNDLE was not initialized OR set to true on OSX
 if(APPLE AND (NOT DEFINED BUILD_OWNCLOUD_OSX_BUNDLE OR BUILD_OWNCLOUD_OSX_BUNDLE))
    set(BUILD_OWNCLOUD_OSX_BUNDLE ON)
-    set(OWNCLOUD_OSX_BUNDLE "${APPLICATION_EXECUTABLE}.app")
-    set(LIB_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS")
-    set(BIN_INSTALL_DIR "${APPLICATION_EXECUTABLE}.app/Contents/MacOS")
+    set(OWNCLOUD_OSX_BUNDLE "bin/${APPLICATION_EXECUTABLE}.app")
+    set(LIB_INSTALL_DIR "bin/${APPLICATION_EXECUTABLE}.app/Contents/MacOS")
+    set(BIN_INSTALL_DIR "bin/${APPLICATION_EXECUTABLE}.app/Contents/MacOS")

 # BUILD_OWNCLOUD_OSX_BUNDLE was disabled on OSX
 elseif(APPLE AND NOT BUILD_OWNCLOUD_OSX_BUNDLE)
@@ -131,22 +122,11 @@ find_package(Sphinx)
 find_package(PdfLatex)


-find_package(SQLite3 3.8.0 REQUIRED)
-# On some OS, we want to use our own, not the system sqlite
-if (USE_OUR_OWN_SQLITE3)
-    include_directories(BEFORE ${SQLITE3_INCLUDE_DIR})
-endif()
-

 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)

 configure_file(test/test_journal.db "${CMAKE_BINARY_DIR}/test/test_journal.db" COPYONLY)

-# Copy that logo, the installer uses it later
-if(BUILD_OWNCLOUD_OSX_BUNDLE)
-    install(FILES resources/owncloud_logo_blue.png DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
-endif()
-
 include(OwnCloudCPack.cmake)

 add_definitions(-DUNICODE)
@@ -163,7 +143,6 @@ add_subdirectory(csync)
 add_subdirectory(src)
 add_subdirectory(shell_integration)
 add_subdirectory(doc)
-add_subdirectory(admin)

 if(UNIT_TESTING)
    include(CTest)
@@ -175,5 +154,4 @@ if(BUILD_OWNCLOUD_OSX_BUNDLE)
    configure_file(sync-exclude.lst ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/sync-exclude.lst COPYONLY)
 else()
    install( FILES sync-exclude.lst DESTINATION ${SYSCONFDIR}/${APPLICATION_SHORTNAME} )
-    configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY)
 endif()
@@ -1,61 +1,6 @@
 ChangeLog
 =========
-version 1.7.0 (release 2014-10-xx)
-
- * oC7 Sharing: Handle new sharing options of ownCloud 7 correctly.
- * Added Selective sync: Ability to unselect server folders which are
-   excluded from syncing, plus GUI and setup GUI
- * Added overlay icons for Windows Explorer, Mac OS Finder and GNOME Nautilus.
-   Information is provided by the client via a local socket / named pipe API
-   which provides information about the sync status of files.
- * Improved local change detection: consider file size, detect files
-   with ongoing changes and do not upload immediately
- * Improved HTTP request timeout handler: all successful requests reset
-   the timeout counter
- * Improvements for syncing command line tool: netrc support, improved
-   SSL support, non interactive mode
- * Permission system: ownCloud 7 delivers file and folder permissions,
-   added ability to deal with it for shared folders and more.
- * Ignore handling: Do not recurse into ignored or excluded directories
- * Major sync journal database improvements for more stability and performance
- * New library interface to sqlite3
- * Improve "resync handling" if errors occur
- * Blacklist improvements
- * Improved logging: more useful meta info, removed noise
- * Updated to latest Qt5 versions on Windows and OS X
- * Fixed data loss when renaming a download temporary fails and there was
-   a conflict at the same time.
- * Fixed missing warnings about reusing a sync folder when the back button
-   was used in the advanced folder setup wizard.
- * The 'Retry Sync' button now also restarts all downloads.
- * Clean up temporary downloads and some extra database files when wiping a
-   folder.
- * OS X: Sparkle update to provide pkg format properly
- * OS X: Change distribution format from dmg to pkg with new installer.
- * Windows: Fix handling of filenames with trailing dot or space
- * Windows: Don't use the wrong way to get file mtimes in the legacy propagator.
-
-version 1.6.4 (release 2014-10-22)
- * Fix startup logic, fixes bug #1989
- * Fix raise dialog on X11
- * Win32: fix overflow when computing the size of file > 4GiB
- * Use a fixed function to get files modification time, the
-   original one was broken for certain timezone issues, see
-   core bug #9781 for details
- * Added some missing copyright headers
- * Avoid data corruption due to wrong error handling, bug #2280
- * Do improved request timeout handling to reduce the number of
-   timed out jobs, bug #2155
-   version 1.6.3 (release 2014-09-03)
- * Fixed updater on OS X
- * Fixed memory leak in SSL button that could lead to quick memory draining
- * Fixed upload problem with files >4 GB
- * MacOSX, Linux: Bring Settings window to front properly
- * Branded clients: If no configuration is detected, try to import the data
-    from a previously configured community edition.
-
-version 1.6.2 (release 2014-07-28 )
- * Limit the HTTP buffer size when downloading to limit memory consumption.
+version 1.6.2 (release 2014-07-x )
 * Another small mem leak fixed in HTTP Credentials.
 * Fix local file name clash detection for MacOSX.
 * Limit maximum wait time to ten seconds in network limiting.
@@ -10,4 +10,3 @@ set( APPLICATION_REV_DOMAIN "com.owncloud.desktopclient" )
 set( WIN_SETUP_BITMAP_PATH  "${CMAKE_SOURCE_DIR}/admin/win/nsi" )
 # set( THEME_INCLUDE          "${OEM_THEME_DIR}/mytheme.h" )
 # set( APPLICATION_LICENSE    "${OEM_THEME_DIR}/license.txt )
-
@@ -4,7 +4,7 @@ set( MIRALL_VERSION_PATCH 0 )
 set( MIRALL_SOVERSION 0 )

 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "") #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "beta1") #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )

 if( NOT DEFINED MIRALL_VERSION_BUILD )
@@ -1,2 +0,0 @@
-# traverse into osx subdirectory to install and patch the create-pack script
-add_subdirectory(osx)
@@ -1,3 +0,0 @@
-
-configure_file(create_mac_pkg.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
-configure_file(macosx.pkgproj ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# Script to create the Mac installer using the packages tool from
+# http://s.sudre.free.fr/Software/Packages/about.html
+#
+
+# the path of installation must be given as parameter
+if [ -z "$1" ]; then
+  echo "ERROR: Provide the CMAKE_INSTALL_DIR to this script."
+  exit 1
+fi
+
+prjfile="admin/osx/macosx.pkgproj"
+if [ ! -f $prjfile ]; then
+  echo "ERROR: macosx.pkgproj not in admin dir, start from CMAKE_SOURCE_DIR!"
+  exit 2
+fi
+
+pack="admin/ownCloud Installer.pkg"
+rm -f $pack
+
+install_path=$1
+
+# The name of the installer package
+installer=ownCloud\ Installer.pkg
+
+# The command line tool of the "Packages" tool, see link above.
+pkgbuild=/usr/local/bin/packagesbuild
+
+$pkgbuild -F $install_path $prjfile
+rc=$?
+
+if [ $rc == 0 ]; then
+  echo "Successfully created $pack"
+else
+  echo "Failed to create $pack"
+  exit 3
+fi
+
+# FIXME: Sign the finished package.
+# See http://s.sudre.free.fr/Software/documentation/Packages/en/Project_Configuration.html#5
+# certname=gdbsign
+# productsign --cert $certname admin/$installer ./$installer
+
+
@@ -1,74 +0,0 @@
-#!/bin/bash
-
-# Script to create the Mac installer using the packages tool from
-# http://s.sudre.free.fr/Software/Packages/about.html
-#
-
-[ "$#" -lt 2 ] && echo "Usage: create_mac_pkg.sh <CMAKE_INSTALL_DIR> <build dir> <installer sign identity>" && exit
-
-# the path of installation must be given as parameter
-if [ -z "$1" ]; then
-  echo "ERROR: Provide the path to CMAKE_INSTALL_DIR to this script as first parameter."
-  exit 1
-fi
-
-if [ -z "$2" ]; then
-  echo "ERROR: Provide the path to build directory as second parameter."
-  exit 1
-fi
-
-install_path="$1"
-build_path="$2"
-identity="$3"
-prjfile=$build_path/admin/osx/macosx.pkgproj
-
-# The name of the installer package
-installer="@APPLICATION_NAME@-@MIRALL_VERSION_FULL@@MIRALL_VERSION_SUFFIX@"
-installer_file="$installer.pkg"
-installer_file_tar="$installer.pkg.tar"
-installer_file_tar_bz2="$installer.pkg.tar.bz2"
-installer_file_tbz="$installer.pkg.tbz"
-
-# set the installer name to the copied prj config file
-/usr/local/bin/packagesutil --file $prjfile set project name "$installer"
-
-# The command line tool of the "Packages" tool, see link above.
-pkgbuild=/usr/local/bin/packagesbuild
-
-$pkgbuild -F $install_path $prjfile
-rc=$?
-
-if [ $rc == 0 ]; then
-  echo "Successfully created $installer_file"
-else
-  echo "Failed to create $installer_file"
-  exit 3
-fi
-
-# Sign the finished package if desired.
-if [ ! -z "$identity" ]; then
-	echo "Will try to sign the installer"
-	pushd $install_path
-	productsign --sign "$identity" "$installer_file" "$installer_file.new"
-	mv "$installer_file".new $installer_file
-	popd
-else
-	echo "No certificate given, will not sign the pkg"
-fi
-
-# FIXME: OEMs?
-# they will need to do their own signing..
-
-
-# Sparkle wants a tbz, it cannot install raw pkg
-cd $install_path
-tar cf "$installer_file_tar" "$installer_file"
-bzip2 -9 "$installer_file_tar"
-mv "$installer_file_tar_bz2" "$installer_file_tbz"
-rc=$?
-if [ $rc == 0 ]; then
-  echo "Successfully created $installer_file"
-else
-  echo "Failed to create $installer_file"
-  exit 3
-fi
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   enable-background="new 0 0 595.275 311.111"
-   xml:space="preserve"
-   height="200"
-   width="320"
-   version="1.1"
-   y="0px"
-   x="0px"
-   viewBox="0 0 35 0"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="installer-background.svg"><metadata
-     id="metadata12"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs10" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1002"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="0.734375"
-     inkscape:cx="-49.141255"
-     inkscape:cy="236.17459"
-     inkscape:window-x="0"
-     inkscape:window-y="34"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" /><path
-     style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#ffffff;fill-opacity:1;enable-background:accumulate"
-     d="m 75.63384,28.421489 c -29.36582,0 -53.09172,23.724901 -53.09172,53.091701 0,12.1047 4.03087,23.2455 10.82647,32.1667 14.74225,-17.0631 36.50138,-27.8988 60.79508,-27.8988 11.88546,0 23.15644,2.6467 33.31219,7.2871 0.82221,-3.7185 1.24924,-7.5856 1.24924,-11.555 0,-29.3658 -23.72491,-53.091701 -53.09172,-53.091701 z M 6.30358,52.98809 c -15.29297,0 -27.58645,12.3977 -27.58645,27.6906 0,4.9515 1.27738,9.6301 3.53933,13.6373 9.22826,-5.206 19.89756,-8.2239 31.23002,-8.2239 1.09366,0 2.14708,0.039 3.22713,0.1052 -0.12231,-1.5502 -0.20806,-3.103 -0.20806,-4.6844 0,-8.5178 1.85002,-16.6223 5.10106,-23.9429 -4.37708,-2.9351 -9.62115,-4.5803 -15.30284,-4.5803 z m 130.95716,19.0502 c -1.12983,0 -2.21885,0.1381 -3.33122,0.2078 0.48121,3.0338 0.83274,6.097 0.83274,9.2651 0,4.9298 -0.62692,9.6869 -1.7697,14.2616 13.39754,7.4144 24.52385,18.5084 31.8547,31.9586 7.60342,-3.9586 16.08566,-6.4754 25.08804,-7.0787 -2.32015,-27.2093 -24.86184,-48.6137 -52.67416,-48.6137 z m -43.09675,19.7789 c -41.09117,0 -74.32775,33.2333 -74.32775,74.3278 0,41.0911 33.23329,74.3277 74.32775,74.3277 41.09447,0 74.32775,-33.2366 74.32775,-74.3277 0,-41.0945 -33.23657,-74.3278 -74.32775,-74.3278 z m -80.67652,0.3117 c -31.87937,0 -57.67166,25.792 -57.67166,57.6717 0,18.7668 8.94156,35.3802 22.79774,45.9078 5.84147,-11.2667 17.57406,-18.9461 31.1258,-18.9461 1.63789,0 3.21,0.1986 4.78871,0.4169 -0.49554,-3.6054 -0.72871,-7.2937 -0.72871,-11.0346 0,-17.8847 5.82174,-34.4234 15.71907,-47.7819 -5.92466,-7.4133 -10.1643,-16.321 -11.97162,-26.025 -1.33935,-0.092 -2.69673,-0.2078 -4.05979,-0.2078 z m 180.71831,34.3544 c -9.68,0 -18.74781,2.4714 -26.75364,6.6625 4.54607,10.0696 7.07867,21.2422 7.07867,32.9998 0,22.0146 -8.85114,42.0052 -23.21431,56.5275 10.5516,11.7145 25.861,19.0503 42.88961,19.0503 31.87937,0 57.67165,-25.7916 57.67165,-57.6717 0,-31.8793 -25.79195,-57.5664 -57.67165,-57.5664 z m -244.00885,7.5998 c -29.3701,0 -53.19693,23.6164 -53.19693,52.9832 0,29.3669 23.82815,53.1937 53.19364,53.1937 11.17727,0 21.53161,-3.4825 30.08487,-9.369 -3.5344,-5.492 -5.62151,-12.0581 -5.62151,-19.0503 0,-3.6291 0.53552,-7.1158 1.56148,-10.4099 -16.01267,-11.5721 -26.44131,-30.4034 -26.44131,-51.6319 0,-5.394 0.71083,-10.6098 1.97792,-15.6152 -0.52591,-0.013 -1.03171,-0.1052 -1.56152,-0.1052 z m 312.19495,45.5955 c -1.56661,0 -3.08252,0.1789 -4.58026,0.4169 0.0829,1.3242 0.1039,2.6108 0.1039,3.9559 0,16.9326 -6.68118,32.3015 -17.4889,43.7214 5.31706,6.1831 13.12695,10.0976 21.96526,10.0976 16.09849,0 29.14785,-12.9451 29.14785,-29.0439 0,-16.0985 -13.04936,-29.1479 -29.14785,-29.1479 z m -252.64924,3.1229 c -16.09783,0 -29.04395,12.9461 -29.04395,29.044 0,16.0978 12.94612,29.1478 29.04395,29.1478 12.33919,0 22.81287,-7.6994 27.06599,-18.5298 -10.378,-10.57 -17.83675,-24.0544 -21.13213,-39.0363 -1.92854,-0.3985 -3.88588,-0.6247 -5.93386,-0.6247 z"
-     id="path6"
-     inkscape:connector-curvature="0" /></svg>
@@ -1,337 +0,0 @@
-#!/usr/bin/python
-#  This file is part of ownCloud.
-#  It was inspired in large part by the macdeploy script in Clementine
-#  and Tomahawk
-#
-#  ownCloud is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; version 2 of the License.
-#
-#  ownCLoud is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with ownCloud.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-import re
-import subprocess
-import commands
-import sys
-from glob import glob
-
-def QueryQMake(attrib):
-    return subprocess.check_output([qmake_path, '-query', attrib]).rstrip('\n')
-
-FRAMEWORK_SEARCH_PATH=[
-    '/Library/Frameworks',
-    os.path.join(os.environ['HOME'], 'Library/Frameworks')
-]
-
-LIBRARY_SEARCH_PATH=['/usr/local/lib', '.']
-
-QT_PLUGINS = [
-    'accessible/libqtaccessiblewidgets.dylib',
-    'sqldrivers/libqsqlite.dylib',
-    'platforms/libqcocoa.dylib',
-    'imageformats/libqgif.dylib',
-    'imageformats/libqico.dylib',
-    'imageformats/libqjpeg.dylib',
-    'imageformats/libqsvg.dylib',
-    'imageformats/libqmng.dylib',
-]
-
-QT_PLUGINS_SEARCH_PATH=[
-#    os.path.join(os.environ['QTDIR'], 'plugins'),
-    '/usr/local/Cellar/qt/5.2.1/plugins',
-]
-
-
-class Error(Exception):
-  pass
-
-
-class CouldNotFindQtPluginErrorFindFrameworkError(Error):
-  pass
-
-
-class InstallNameToolError(Error):
-  pass
-
-
-class CouldNotFindQtPluginError(Error):
-  pass
-
-
-class CouldNotFindScriptPluginError(Error):
-  pass
-
-class CouldNotFindFrameworkError(Error):
-  pass
-
-if len(sys.argv) < 3:
-  print 'Usage: %s <bundle.app> <path-to-qmake>' % sys.argv[0]
-  exit()
-
-def is_exe(fpath):
-  return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
-
-bundle_dir = sys.argv[1]
-qmake_path = sys.argv[2]
-
-bundle_name = os.path.basename(bundle_dir).split('.')[0]
-
-commands = []
-
-binary_dir = os.path.join(bundle_dir, 'Contents', 'MacOS')
-frameworks_dir = os.path.join(bundle_dir, 'Contents', 'Frameworks')
-commands.append(['mkdir', '-p', frameworks_dir])
-resources_dir = os.path.join(bundle_dir, 'Contents', 'Resources')
-commands.append(['mkdir', '-p', resources_dir])
-plugins_dir = os.path.join(bundle_dir, 'Contents', 'PlugIns')
-binaries = [i for i in glob(os.path.join(bundle_dir, 'Contents', 'MacOS', "*")) if is_exe(i)];
-
-
-fixed_libraries = []
-fixed_frameworks = []
-
-def WriteQtConf():
-  print "Writing qt.conf..."
-  with open(os.path.join(resources_dir, 'qt.conf'), 'w') as f:
-    f.write("[Paths]\nPlugins = PlugIns\n");
-    f.close()
-
-def GetBrokenLibraries(binary):
-  #print "Checking libs for binary: %s" % binary
-  output = subprocess.Popen(['otool', '-L', binary], stdout=subprocess.PIPE).communicate()[0]
-  broken_libs = {
-      'frameworks': [],
-      'libs': []}
-  for line in [x.split(' ')[0].lstrip() for x in output.split('\n')[1:]]:
-    #print "Checking line: %s" % line
-    if not line:  # skip empty lines
-      continue
-    if os.path.basename(binary) == os.path.basename(line):
-      #print "mnope %s-%s" % (os.path.basename(binary), os.path.basename(line))
-      continue
-    if re.match(r'^\s*/System/', line):
-      continue  # System framework
-    elif re.match(r'^\s*/usr/lib/', line):
-      #print "unix style system lib"
-      continue  # unix style system library
-    elif re.match(r'Breakpad', line):
-      continue  # Manually added by cmake.
-    elif re.match(r'^\s*@executable_path', line) or re.match(r'^\s*@loader_path', line):
-      # Potentially already fixed library
-      if '.framework' in line:
-        relative_path = os.path.join(*line.split('/')[3:])
-        if not os.path.exists(os.path.join(frameworks_dir, relative_path)):
-          broken_libs['frameworks'].append(relative_path)
-      else:
-        relative_path = os.path.join(*line.split('/')[1:])
-        #print "RELPATH %s %s" % (relative_path, os.path.join(binary_dir, relative_path))
-        if not os.path.exists(os.path.join(binary_dir, relative_path)):
-          broken_libs['libs'].append(relative_path)
-    elif re.search(r'\w+\.framework', line):
-      broken_libs['frameworks'].append(line)
-    else:
-      broken_libs['libs'].append(line)
-
-  return broken_libs
-
-def FindFramework(path):
-  search_pathes = FRAMEWORK_SEARCH_PATH
-  search_pathes.insert(0, QueryQMake('QT_INSTALL_LIBS'))
-  for search_path in search_pathes:
-    abs_path = os.path.join(search_path, path)
-    if os.path.exists(abs_path):
-      return abs_path
-
-  raise CouldNotFindFrameworkError(path)
-
-def FindLibrary(path):
-  if os.path.exists(path):
-    return path
-  search_pathes = LIBRARY_SEARCH_PATH
-  search_pathes.insert(0, QueryQMake('QT_INSTALL_LIBS'))
-  for search_path in search_pathes:
-    abs_path = os.path.join(search_path, path)
-    if os.path.exists(abs_path):
-      return abs_path
-    else: # try harder---look for lib name in library folders
-      newpath = os.path.join(search_path,os.path.basename(path))
-      if os.path.exists(newpath):
-        return newpath
-
-  return ""
-  #raise CouldNotFindFrameworkError(path)
-
-def FixAllLibraries(broken_libs):
-  for framework in broken_libs['frameworks']:
-    FixFramework(framework)
-  for lib in broken_libs['libs']:
-    FixLibrary(lib)
-
-def FixFramework(path):
-  if path in fixed_libraries:
-    return
-  else:
-    fixed_libraries.append(path)
-  abs_path = FindFramework(path)
-  broken_libs = GetBrokenLibraries(abs_path)
-  FixAllLibraries(broken_libs)
-
-  new_path = CopyFramework(abs_path)
-  id = os.sep.join(new_path.split(os.sep)[3:])
-  FixFrameworkId(new_path, id)
-  for framework in broken_libs['frameworks']:
-    FixFrameworkInstallPath(framework, new_path)
-  for library in broken_libs['libs']:
-    FixLibraryInstallPath(library, new_path)
-
-def FixLibrary(path):
-  if path in fixed_libraries or FindSystemLibrary(os.path.basename(path)) is not None:
-    return
-  else:
-    fixed_libraries.append(path)
-  abs_path = FindLibrary(path)
-  if abs_path == "":
-    print "Could not resolve %s, not fixing!" % path
-    return
-  broken_libs = GetBrokenLibraries(abs_path)
-  FixAllLibraries(broken_libs)
-
-  new_path = CopyLibrary(abs_path)
-  FixLibraryId(new_path)
-  for framework in broken_libs['frameworks']:
-    FixFrameworkInstallPath(framework, new_path)
-  for library in broken_libs['libs']:
-    FixLibraryInstallPath(library, new_path)
-
-def FixPlugin(abs_path, subdir):
-  broken_libs = GetBrokenLibraries(abs_path)
-  FixAllLibraries(broken_libs)
-
-  new_path = CopyPlugin(abs_path, subdir)
-  for framework in broken_libs['frameworks']:
-    FixFrameworkInstallPath(framework, new_path)
-  for library in broken_libs['libs']:
-    FixLibraryInstallPath(library, new_path)
-
-def FixBinary(path):
-  broken_libs = GetBrokenLibraries(path)
-  FixAllLibraries(broken_libs)
-  for framework in broken_libs['frameworks']:
-    FixFrameworkInstallPath(framework, path)
-  for library in broken_libs['libs']:
-    FixLibraryInstallPath(library, path)
-
-def CopyLibrary(path):
-  new_path = os.path.join(binary_dir, os.path.basename(path))
-  args = ['ditto', '--arch=x86_64', path, new_path]
-  commands.append(args)
-  args = ['chmod', 'u+w', new_path]
-  commands.append(args)
-  return new_path
-
-def CopyPlugin(path, subdir):
-  new_path = os.path.join(plugins_dir, subdir, os.path.basename(path))
-  args = ['mkdir', '-p', os.path.dirname(new_path)]
-  commands.append(args)
-  args = ['ditto', '--arch=x86_64', path, new_path]
-  commands.append(args)
-  args = ['chmod', 'u+w', new_path]
-  commands.append(args)
-  return new_path
-
-def CopyFramework(path):
-  parts = path.split(os.sep)
-  print "CopyFramework:", path
-  for i, part in enumerate(parts):
-    matchObj = re.match(r'(\w+\.framework)', part)
-    if matchObj:
-      full_path = os.path.join(frameworks_dir, *parts[i:-1])
-      framework = matchObj.group(1)
-      break
-  args = ['mkdir', '-p', full_path]
-  commands.append(args)
-  args = ['ditto', '--arch=x86_64', path, full_path]
-  commands.append(args)
-  args = ['chmod', 'u+w', os.path.join(full_path, parts[-1])]
-  commands.append(args)
-  args = ['chmod', 'u+w', os.path.join(frameworks_dir, framework, "Resources")]
-  commands.append(args)
-
-  info_plist = os.path.join(os.path.split(path)[0], '..', '..', 'Contents', 'Info.plist')
-  if os.path.exists(info_plist):
-    args = ['cp', '-r', info_plist, os.path.join(frameworks_dir, framework, "Resources")]
-    commands.append(args)
-  return os.path.join(full_path, parts[-1])
-
-def FixId(path, library_name):
-  id = '@executable_path/../Frameworks/%s' % library_name
-  args = ['install_name_tool', '-id', id, path]
-  commands.append(args)
-
-def FixLibraryId(path):
-  library_name = os.path.basename(path)
-  FixId(path, library_name)
-
-def FixFrameworkId(path, id):
-  FixId(path, id)
-
-def FixInstallPath(library_path, library, new_path):
-  args = ['install_name_tool', '-change', library_path, new_path, library]
-  commands.append(args)
-
-def FindSystemLibrary(library_name):
-  for path in ['/lib', '/usr/lib']:
-    full_path = os.path.join(path, library_name)
-    if os.path.exists(full_path):
-      return full_path
-  return None
-
-def FixLibraryInstallPath(library_path, library):
-  system_library = FindSystemLibrary(os.path.basename(library_path))
-  if system_library is None:
-    new_path = '@executable_path/../MacOS/%s' % os.path.basename(library_path)
-    FixInstallPath(library_path, library, new_path)
-  else:
-    FixInstallPath(library_path, library, system_library)
-
-def FixFrameworkInstallPath(library_path, library):
-  parts = library_path.split(os.sep)
-  for i, part in enumerate(parts):
-    if re.match(r'\w+\.framework', part):
-      full_path = os.path.join(*parts[i:])
-      break
-  new_path = '@executable_path/../Frameworks/%s' % full_path
-  FixInstallPath(library_path, library, new_path)
-
-def FindQtPlugin(name):
-  search_path = QT_PLUGINS_SEARCH_PATH
-  search_path.insert(0, QueryQMake('QT_INSTALL_PLUGINS'))
-  for path in search_path:
-    if os.path.exists(path):
-      if os.path.exists(os.path.join(path, name)):
-        return os.path.join(path, name)
-  raise CouldNotFindQtPluginError(name)
-
-for binary in binaries:
-  FixBinary(binary)
-
-for plugin in QT_PLUGINS:
-  FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
-
-if len(sys.argv) <= 2:
-  print 'Will run %d commands:' % len(commands)
-  for command in commands:
-    print ' '.join(command)
-
-for command in commands:
-  p = subprocess.Popen(command)
-  os.waitpid(p.pid, 0)
-
-WriteQtConf()
@@ -22,7 +22,7 @@
 									<key>GID</key>
 									<integer>80</integer>
 									<key>PATH</key>
-									<string>@APPLICATION_EXECUTABLE@.app</string>
+									<string>owncloud.app</string>
 									<key>PATH_TYPE</key>
 									<integer>3</integer>
 									<key>PERMISSIONS</key>
@@ -485,13 +485,13 @@
 				<key>CONCLUSION_ACTION</key>
 				<integer>0</integer>
 				<key>IDENTIFIER</key>
-				<string>@APPLICATION_REV_DOMAIN_INSTALLER@</string>
+				<string>com.ownCloud.client</string>
 				<key>NAME</key>
-				<string>@APPLICATION_NAME@</string>
+				<string>ownCloud Client</string>
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>@MIRALL_VERSION_FULL@</string>
+				<string>1.6.2</string>
 			</dict>
 			<key>UUID</key>
 			<string>7D7219B7-1897-48C3-8533-842BDEC46F71</string>
@@ -793,7 +793,7 @@
 													<key>GID</key>
 													<integer>0</integer>
 													<key>PATH</key>
-													<string>Library/ScriptingAdditions/SyncStateFinder.osax/Contents</string>
+													<string>Library/ScriptingAdditions/OwnCloudFinder.osax/Contents</string>
 													<key>PATH_TYPE</key>
 													<integer>3</integer>
 													<key>PERMISSIONS</key>
@@ -807,7 +807,7 @@
 											<key>GID</key>
 											<integer>0</integer>
 											<key>PATH</key>
-											<string>SyncStateFinder.osax</string>
+											<string>OwnCloudFinder.osax</string>
 											<key>PATH_TYPE</key>
 											<integer>0</integer>
 											<key>PERMISSIONS</key>
@@ -1019,7 +1019,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>@MIRALL_VERSION_FULL@</string>
+				<string>1.6.2</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
@@ -1041,7 +1041,7 @@
 			ZW50LVN0eWxlLVR5cGUiIGNvbnRlbnQ9InRleHQvY3NzIj4KPHRp
 			dGxlPjwvdGl0bGU+CjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29u
 			dGVudD0iQ29jb2EgSFRNTCBXcml0ZXIiPgo8bWV0YSBuYW1lPSJD
-			b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjEzNDMuMTQiPgo8c3R5bGUg
+			b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjExMzguNTEiPgo8c3R5bGUg
 			dHlwZT0idGV4dC9jc3MiPgo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5
 			Pgo8L2JvZHk+CjwvaHRtbD4K
 			</data>
@@ -1055,7 +1055,7 @@
 				<key>BACKGROUND_PATH</key>
 				<dict>
 					<key>PATH</key>
-					<string>@CMAKE_SOURCE_DIR@/admin/osx/installer-background.png</string>
+					<string>/Users/mackie/owncloud.com/mirall/resources/owncloud_logo_blue.png</string>
 					<key>PATH_TYPE</key>
 					<integer>0</integer>
 				</dict>
@@ -1213,7 +1213,7 @@
 						<key>LANGUAGE</key>
 						<string>English</string>
 						<key>VALUE</key>
-						<string>@APPLICATION_NAME@ Client</string>
+						<string>ownCloud Client</string>
 					</dict>
 				</array>
 			</dict>
@@ -1240,9 +1240,9 @@
 			<key>BUILD_PATH</key>
 			<dict>
 				<key>PATH</key>
-				<string>../install/.</string>
+				<string>/Users/mackie/owncloud.com/mirall/admin</string>
 				<key>PATH_TYPE</key>
-				<integer>3</integer>
+				<integer>0</integer>
 			</dict>
 			<key>EXCLUDED_FILES</key>
 			<array>
@@ -1413,9 +1413,9 @@
 				</dict>
 			</array>
 			<key>NAME</key>
-			<string>@APPLICATION_NAME@ Installer</string>
+			<string>ownCloud Installer</string>
 			<key>REFERENCE_FOLDER_PATH</key>
-			<string>@CMAKE_INSTALL_DIR@</string>
+			<string>/Users/mackie/install</string>
 		</dict>
 	</dict>
 	<key>TYPE</key>
@@ -1,32 +0,0 @@
-#!/bin/sh -x
-
-[ "$#" -lt 2 ] && echo "Usage: sign_app.sh <app> <identity>" && exit
-
-src_app="$1"
-identity="$2"
-
-QT_FMWK_VERSION="5"
-
-fix_frameworks() {
-    TMP_APP=$1
-    QT_FMWK_PATH=$2
-    QT_FMWKS=$3/Qt*.framework
-
-    echo "Patching Qt frameworks..."
-    for FMWK in $QT_FMWKS; do
-        FMWK_NAME=`basename -s .framework $FMWK`
-        FMWK=`basename $FMWK`
-        FMWK_PATH="${TMP_APP}/Contents/Frameworks/${FMWK}"
-        mkdir -p "${FMWK_PATH}/Versions/${QT_FMWK_VERSION}/Resources/"
-        cp -avf "${QT_FMWK_PATH}/${FMWK}/Contents/Info.plist" "${FMWK_PATH}/Versions/${QT_FMWK_VERSION}/Resources"
-        (cd "${FMWK_PATH}" && ln -sf "Versions/${QT_FMWK_VERSION}/Resources" "Resources")
-        perl -pi -e "s/${FMWK_NAME}_debug/${FMWK_NAME}/" "${FMWK_PATH}/Resources/Info.plist"
-    done
-}
-
-fix_frameworks "$src_app" `qmake -query QT_INSTALL_LIBS` "$src_app"/Contents/Frameworks
-codesign -s "$identity" --force --verbose=4 --deep "$src_app"
-
-# Just for our debug purposes:
-spctl -a -t exec -vv $src_app
-codesign -dv $src_app
@@ -1,7 +1,3 @@
-# (c) 2014 Copyright ownCloud, Inc.
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING* file.
-
 # Always include srcdir and builddir in include path
 # This saves typing ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY} in
 # about every subdir
@@ -1,7 +1,3 @@
-# (c) 2014 Copyright ownCloud, Inc.
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING* file.
-
 # define system dependent compiler flags

 include(CheckCCompilerFlag)
@@ -14,8 +10,7 @@ if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")

    # add -Wconversion ?
    # cannot be pedantic with sqlite3 directly linked
-    # FIXME Can we somehow not use those flags for sqlite3.* but use them for the rest of csync?
-    if (NOT USE_OUR_OWN_SQLITE3)
+    if (NOT CSYNC_STATIC_COMPILE_DIR)
        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic -pedantic-errors")
    endif()
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes")
@@ -1,7 +1,3 @@
-# (c) 2014 Copyright ownCloud, Inc.
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING* file.
-
 if (UNIX)
  # Suffix for Linux
  SET(LIB_SUFFIX
@@ -1,7 +1,3 @@
-# (c) 2014 Copyright ownCloud, Inc.
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING* file.
-
 # Set system vars

 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -1,7 +1,3 @@
-# (c) 2014 Copyright ownCloud, Inc.
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING* file.
-
 # This module defines
 #  INOTIFY_INCLUDE_DIR, where to find inotify.h, etc.
 #  INOTIFY_FOUND, If false, do not try to use inotify.
@@ -1,7 +1,3 @@
-# (c) 2014 Copyright ownCloud, Inc.
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING* file.
-
 # FIND_PACKAGE_VERSION_CHECK(NAME (DEFAULT_MSG|"Custom failure message"))
 #    This function is intended to be used in FindXXX.cmake modules files.
 #    It handles NAME_FIND_VERSION and NAME_VERSION variables in a Module.
@@ -1,7 +1,3 @@
-# (c) 2014 Copyright ownCloud, Inc.
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING* file.
-
 find_program(PDFLATEX_EXECUTABLE NAMES pdflatex
  HINTS
  $ENV{PDFLATEX_DIR}
@@ -1,7 +1,3 @@
-# (c) 2014 Copyright ownCloud, Inc.
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING* file.
-
 # - Try to find QtKeychain
 # Once done this will define
 #  QTKEYCHAIN_FOUND - System has QtKeychain
@@ -1,7 +1,3 @@
-# (c) 2014 Copyright ownCloud, Inc.
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING* file.
-
 # - Try to find QtKeychain
 # Once done this will define
 #  QTKEYCHAIN_FOUND - System has QtKeychain
@@ -50,18 +50,8 @@ if (SQLite3_FIND_VERSION AND _SQLITE3_VERSION)
    set(SQLite3_VERSION _SQLITE3_VERSION)
 endif (SQLite3_FIND_VERSION AND _SQLITE3_VERSION)

-if (APPLE OR WIN32)
-    set(USE_OUR_OWN_SQLITE3 TRUE)
-    set(SQLITE3_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/3rdparty/sqlite3)
-    set(SQLITE3_LIBRARIES "")
-    set(SQLITE3_SOURCE ${SQLITE3_INCLUDE_DIR}/sqlite3.c)
-    MESSAGE(STATUS "Using own sqlite3 from " ${SQLITE3_INCLUDE_DIR})
-else()
-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(SQLite3 DEFAULT_MSG SQLITE3_LIBRARIES SQLITE3_INCLUDE_DIRS)
-endif()
-
-
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SQLite3 DEFAULT_MSG SQLITE3_LIBRARIES SQLITE3_INCLUDE_DIRS)

 # show the SQLITE3_INCLUDE_DIRS and SQLITE3_LIBRARIES variables only in the advanced view
 mark_as_advanced(SQLITE3_INCLUDE_DIRS SQLITE3_LIBRARIES)
@@ -1,7 +1,3 @@
-# (c) 2014 Copyright ownCloud, Inc.
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING* file.
-
 find_program(SPHINX_EXECUTABLE NAMES sphinx-build
  HINTS
  $ENV{SPHINX_DIR}
@@ -30,8 +30,6 @@
        <string>(C) 2014 @APPLICATION_VENDOR@</string>
        <key>SUShowReleaseNotes</key>
        <false/>
-        <key>LSMinimumBundleVersion</key>
-        <string>10.7.0</string>
        <key>SUPublicDSAKeyFile</key>
        <string>dsa_pub.pem</string>
 </dict>
@@ -1,7 +1,3 @@
-# (c) 2014 Copyright ownCloud, Inc.
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING* file.
-
 # - macro_copy_file(_src _dst)
 # Copies a file to ${_dst} only if ${_src} is different (newer) than ${_dst}
 #
@@ -384,14 +384,13 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
   File "${BUILD_PATH}\bin\${APPLICATION_EXECUTABLE}"
   File "${BUILD_PATH}\bin\${APPLICATION_CMD_EXECUTABLE}"
   File "${BUILD_PATH}\bin\socketapiclient.exe"
-   File "${BUILD_PATH}\src\lib${APPLICATION_SHORTNAME}sync.dll"
+   File "${BUILD_PATH}\src\libsync\lib${APPLICATION_SHORTNAME}sync.dll"
   File "${BUILD_PATH}\csync\src\libocsync.dll"

-   File "${BUILD_PATH}\src\mirall_*.qm"
+   File "${BUILD_PATH}\src\gui\mirall_*.qm"
   ; Make sure only to copy qt, not qt_help, etc
   File "${MING_SHARE}\qt5\translations\qt_??.qm"
   File "${MING_SHARE}\qt5\translations\qt_??_??.qm"
-   File "${MING_SHARE}\qt5\translations\qtbase_*.qm"
   File "${MING_SHARE}\qt5\translations\qtkeychain_*.qm"

   SetOutPath "$INSTDIR\platforms"
@@ -1,7 +1,3 @@
-# (c) 2014 Copyright ownCloud, Inc.
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING* file.
-
 include (MacroOptionalFindPackage)
 include (MacroLogFeature)

@@ -153,18 +149,7 @@ if(NOT Qt5Core_FOUND)
        include( ${QT_USE_FILE} )
    endmacro()

-    if (CMAKE_COMPILER_IS_GNUCC)
-        execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-                OUTPUT_VARIABLE GCC_VERSION)
-        if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
-            add_definitions("-DQ_DECL_OVERRIDE=override")
-        else()
-            add_definitions("-DQ_DECL_OVERRIDE=")
-        endif()
-    else() #clang or others
-        add_definitions("-DQ_DECL_OVERRIDE=override")
-    endif()
-
+    add_definitions("-DQ_DECL_OVERRIDE=override")
 endif()

 if( Qt5Core_DIR )
@@ -1,7 +1,3 @@
-# (c) 2014 Copyright ownCloud, Inc.
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING* file.
-
 # -helper macro to add a "doc" target with CMake build system. 
 # and configure doxy.config.in to doxy.config
 #
@@ -1,7 +1,3 @@
-# (c) 2014 Copyright ownCloud, Inc.
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING* file.
-
 if(CMAKE_COMPILER_IS_GNUCXX)
    execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
                    OUTPUT_VARIABLE GCC_VERSION)
@@ -4,6 +4,13 @@ add_subdirectory(std)
 add_subdirectory(httpbf)

 # Statically include sqlite
+if (CSYNC_STATIC_COMPILE_DIR)
+    set(SQLITE3_INCLUDE_DIRS "")
+    set(SQLITE3_LIBRARIES "")
+    include_directories(${CSYNC_STATIC_COMPILE_DIR})
+else (CSYNC_STATIC_COMPILE_DIR)
+    find_package(SQLite3 3.3.9 REQUIRED)
+endif()

 set(CSYNC_PUBLIC_INCLUDE_DIRS
  ${CMAKE_CURRENT_BINARY_DIR}
@@ -79,8 +86,8 @@ set(csync_HDRS
 )

 # Statically include sqlite
-if (USE_OUR_OWN_SQLITE3)
-    list(APPEND csync_SRCS ${SQLITE3_SOURCE})
+if (CSYNC_STATIC_COMPILE_DIR)
+    list(APPEND csync_SRCS ${CSYNC_STATIC_COMPILE_DIR}/dictionary.c  ${CSYNC_STATIC_COMPILE_DIR}/sqlite3.c)
 endif()

 include_directories(
@@ -228,10 +228,9 @@ int csync_update(CSYNC *ctx) {

  rc = csync_ftw(ctx, ctx->local.uri, csync_walker, MAX_DEPTH);
  if (rc < 0) {
-    if(ctx->status_code == CSYNC_STATUS_OK) {
+    if(ctx->status_code == CSYNC_STATUS_OK)
        ctx->status_code = csync_errno_to_status(errno, CSYNC_STATUS_UPDATE_ERROR);
-    }
-    goto out;
+    return -1;
  }

  csync_gettime(&finish);
@@ -248,10 +247,9 @@ int csync_update(CSYNC *ctx) {

  rc = csync_ftw(ctx, ctx->remote.uri, csync_walker, MAX_DEPTH);
  if (rc < 0) {
-      if(ctx->status_code == CSYNC_STATUS_OK) {
+      if(ctx->status_code == CSYNC_STATUS_OK)
          ctx->status_code = csync_errno_to_status(errno, CSYNC_STATUS_UPDATE_ERROR);
-      }
-      goto out;
+      return -1;
  }

  csync_gettime(&finish);
@@ -264,11 +262,7 @@ int csync_update(CSYNC *ctx) {

  ctx->status |= CSYNC_STATUS_UPDATE;

-  rc = 0;
-
-out:
-  csync_statedb_close(ctx);
-  return rc;
+  return 0;
 }

 int csync_reconcile(CSYNC *ctx) {
@@ -284,12 +278,6 @@ int csync_reconcile(CSYNC *ctx) {
  /* Reconciliation for local replica */
  csync_gettime(&start);

-  if (csync_statedb_load(ctx, ctx->statedb.file, &ctx->statedb.db) < 0) {
-    ctx->status_code = CSYNC_STATUS_STATEDB_LOAD_ERROR;
-    rc = -1;
-    return rc;
-  }
-
  ctx->current = LOCAL_REPLICA;
  ctx->replica = ctx->local.type;

@@ -305,7 +293,7 @@ int csync_reconcile(CSYNC *ctx) {
      if (!CSYNC_STATUS_IS_OK(ctx->status_code)) {
          ctx->status_code = csync_errno_to_status( errno, CSYNC_STATUS_RECONCILE_ERROR );
      }
-      goto out;
+      return -1;
  }

  /* Reconciliation for remote replica */
@@ -326,15 +314,11 @@ int csync_reconcile(CSYNC *ctx) {
      if (!CSYNC_STATUS_IS_OK(ctx->status_code)) {
          ctx->status_code = csync_errno_to_status(errno,  CSYNC_STATUS_RECONCILE_ERROR );
      }
-      goto out;
+      return -1;
  }

  ctx->status |= CSYNC_STATUS_RECONCILE;

-  rc = 0;
-
-out:
-  csync_statedb_close(ctx);
  return 0;
 }

@@ -538,6 +522,8 @@ static void _tree_destructor(void *data) {
 * used by csync_commit and csync_destroy */
 static void _csync_clean_ctx(CSYNC *ctx)
 {
+    c_list_t * walk;
+
    /* destroy the rbtrees */
    if (c_rbtree_size(ctx->local.tree) > 0) {
        c_rbtree_destroy(ctx->local.tree, _tree_destructor);
@@ -549,14 +535,25 @@ static void _csync_clean_ctx(CSYNC *ctx)

    csync_rename_destroy(ctx);

+    for (walk = c_list_last(ctx->local.ignored_cleanup); walk != NULL; walk = c_list_prev(walk)) {
+        SAFE_FREE(walk->data);
+    }
+    for (walk = c_list_last(ctx->remote.ignored_cleanup); walk != NULL; walk = c_list_prev(walk)) {
+        SAFE_FREE(walk->data);
+    }
+
    /* free memory */
    c_rbtree_free(ctx->local.tree);
    c_list_free(ctx->local.list);
+    c_list_free(ctx->local.ignored_cleanup);
    c_rbtree_free(ctx->remote.tree);
    c_list_free(ctx->remote.list);
+    c_list_free(ctx->remote.ignored_cleanup);

    ctx->remote.list = 0;
    ctx->local.list = 0;
+    ctx->remote.ignored_cleanup = 0;
+    ctx->local.ignored_cleanup = 0;

    SAFE_FREE(ctx->statedb.file);
 }
@@ -94,7 +94,6 @@ enum csync_status_codes_e {
  CSYNC_STATUS_ABORTED,
    /* Codes for file individual status: */
    CSYNC_STATUS_INDIVIDUAL_IS_SYMLINK,
-    CSYNC_STATUS_INDIVIDUAL_IS_HARDLINK,
    CSYNC_STATUS_INDIVIDUAL_IGNORE_LIST,
    CSYNC_STATUS_INDIVIDUAL_IS_INVALID_CHARS,
    CYSNC_STATUS_FILE_LOCKED_OR_OPEN
@@ -40,10 +40,7 @@
 #define CSYNC_LOG_CATEGORY_NAME "csync.exclude"
 #include "csync_log.h"

-#ifndef NDEBUG
-static
-#endif
-int _csync_exclude_add(c_strlist_t **inList, const char *string) {
+static int _csync_exclude_add(c_strlist_t **inList, const char *string) {
    c_strlist_t *list;

    if (*inList == NULL) {
@@ -153,43 +150,15 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype) {

    match = csync_excluded_no_ctx( ctx->excludes, path, filetype );

+    if (match == CSYNC_NOT_EXCLUDED && ctx->checkBlackListHook) {
+        if (ctx->checkBlackListHook(ctx->checkBlackListData, path)) {
+            match = CSYNC_FILE_EXCLUDE_LIST;
+        }
+    }
+
    return match;
 }

-// See http://support.microsoft.com/kb/74496
-static const char *win_reserved_words[] = {"CON","PRN","AUX", "NUL",
-                                           "COM1", "COM2", "COM3", "COM4",
-                                           "LPT1", "LPT2", "LPT3", "CLOCK$" };
-
-
-bool csync_is_windows_reserved_word(const char* filename) {
-
-  size_t win_reserve_words_len = sizeof(win_reserved_words) / sizeof(char*);
-  size_t j;
-
-  for (j = 0; j < win_reserve_words_len; j++) {
-    int len_reserved_word = strlen(win_reserved_words[j]);
-    int len_filename = strlen(filename);
-    if (len_filename == 2 && filename[1] == ':') {
-        if (filename[0] >= 'a' && filename[0] <= 'z') {
-            return true;
-        }
-        if (filename[0] >= 'A' && filename[0] <= 'Z') {
-            return true;
-        }
-    }
-    if (c_strncasecmp(filename, win_reserved_words[j], len_reserved_word) == 0) {
-        if (len_filename == len_reserved_word) {
-            return true;
-        }
-        if ((len_filename > len_reserved_word) && (filename[len_reserved_word] == '.')) {
-            return true;
-        }
-    }
-  }
-  return false;
-}
-
 CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path, int filetype) {
  size_t i = 0;
  const char *p = NULL;
@@ -236,27 +205,6 @@ CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path
      goto out;
  }

-#ifdef _WIN32
-  // Windows cannot sync files ending in spaces (#2176). It also cannot
-  // distinguish files ending in '.' from files without an ending,
-  // as '.' is a separator that is not stored internally, so let's
-  // not allow to sync those to avoid file loss/ambiguities (#416)
-  size_t blen = strlen(bname);
-  if (blen > 1 && (bname[blen-1]== ' ' || bname[blen-1]== '.' )) {
-      match = CSYNC_FILE_EXCLUDE_INVALID_CHAR;
-      SAFE_FREE(bname);
-      SAFE_FREE(dname);
-      goto out;
-  }
-
-  if (csync_is_windows_reserved_word(bname)) {
-    match = CSYNC_FILE_EXCLUDE_INVALID_CHAR;
-    SAFE_FREE(bname);
-    SAFE_FREE(dname);
-    goto out;
-  }
-#endif
-
  rc = csync_fnmatch(".owncloudsync.log*", bname, 0);
  if (rc == 0) {
      match = CSYNC_FILE_SILENTLY_EXCLUDED;
@@ -29,11 +29,6 @@ enum csync_exclude_type_e {
  CSYNC_FILE_EXCLUDE_INVALID_CHAR
 };
 typedef enum csync_exclude_type_e CSYNC_EXCLUDE_TYPE;
-
-#ifdef NDEBUG
-int _csync_exclude_add(c_strlist_t **inList, const char *string);
-#endif
-
 /**
 * @brief Load exclude list
 *
@@ -80,12 +75,4 @@ CSYNC_EXCLUDE_TYPE csync_excluded(CSYNC *ctx, const char *path, int filetype);
 CSYNC_EXCLUDE_TYPE csync_excluded_no_ctx(c_strlist_t *excludes, const char *path, int filetype);
 #endif /* _CSYNC_EXCLUDE_H */

-/**
- * @brief Checks if filename is considered reserved by Windows
- * @param file_name filename
- * @return true if file is reserved, false otherwise
- */
-bool csync_is_windows_reserved_word(const char *file_name);
-
-
 /* vim: set ft=c.doxygen ts=8 sw=2 et cindent: */
@@ -110,7 +110,7 @@ static int ssl_callback_by_neon(void *userdata, int failures,
        }
    }
    DEBUG_WEBDAV("## VERIFY_SSL CERT: %d", ret  );
-    return ret;
+      return ret;
 }

 /*
@@ -761,7 +761,6 @@ int owncloud_commit(CSYNC* ctx) {
    }

    ctx->owncloud_context->is_first_propfind = true;
-    ctx->owncloud_context->dav_session.no_recursive_propfind = true;
  /* DEBUG_WEBDAV( "********** vio_module_shutdown" ); */

  ctx->owncloud_context->dav_session.ctx = 0;
@@ -339,8 +339,6 @@ void fill_webdav_properties_into_resource(struct resource* newres, const ne_prop
    file_id      = ne_propset_value( set, &ls_props[4] );
    directDownloadUrl = ne_propset_value( set, &ls_props[5] );
    directDownloadCookies = ne_propset_value( set, &ls_props[6] );
-
-    // permission flags: Defined in https://github.com/owncloud/core/issues/8322
    perm = ne_propset_value( set, &ls_props[7] );

    if( resourcetype && strncmp( resourcetype, "<DAV:collection>", 16 ) == 0) {
@@ -100,8 +100,6 @@ struct csync_s {
    sqlite3_stmt* by_hash_stmt;
    sqlite3_stmt* by_fileid_stmt;
    sqlite3_stmt* by_inode_stmt;
-
-    int lastReturnValue;
  } statedb;

  struct {
@@ -109,6 +107,7 @@ struct csync_s {
    c_rbtree_t *tree;
    c_list_t *list;
    enum csync_replica_e type;
+    c_list_t *ignored_cleanup;
  } local;

  struct {
@@ -117,6 +116,7 @@ struct csync_s {
    c_list_t *list;
    enum csync_replica_e type;
    int  read_from_db;
+    c_list_t *ignored_cleanup;
  } remote;

 #if defined(HAVE_ICONV) && defined(WITH_ICONV)
@@ -148,8 +148,8 @@ struct csync_s {
  struct csync_owncloud_ctx_s *owncloud_context;

  /* hooks for checking the white list */
-  void *checkSelectiveSyncBlackListData;
-  int (*checkSelectiveSyncBlackListHook)(void*, const char*);
+  void *checkBlackListData;
+  int (*checkBlackListHook)(void*, const char*);
 };


@@ -167,7 +167,6 @@ struct csync_file_stat_s {
  int type;         /* u32 */
  int child_modified;/*bool*/
  int should_update_etag; /*bool */
-  int has_ignored_files; /*bool: specify that a directory, or child directory contains ignored files */

  char *destpath;   /* for renames */
  const char *etag;
@@ -134,15 +134,6 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
            break;
            /* file has been removed on the opposite replica */
        case CSYNC_INSTRUCTION_NONE:
-            if (cur->has_ignored_files) {
-                /* Do not remove a directory that has ignored files */
-                break;
-            }
-            if (cur->child_modified) {
-                /* re-create directory that has modified contents */
-                cur->instruction = CSYNC_INSTRUCTION_NEW;
-                break;
-            }
            cur->instruction = CSYNC_INSTRUCTION_REMOVE;
            break;
        case CSYNC_INSTRUCTION_EVAL_RENAME:
@@ -50,22 +50,6 @@

 #define BUF_SIZE 16

-#define sqlite_open(A, B) sqlite3_open_v2(A,B, SQLITE_OPEN_READONLY+SQLITE_OPEN_NOMUTEX, NULL)
-
-#define SQLTM_TIME 150000
-#define SQLTM_COUNT 10
-
-#define SQLITE_BUSY_HANDLED(F) if(1) { \
-    int n = 0; \
-    do { rc = F ; \
-      if( (rc == SQLITE_BUSY) || (rc == SQLITE_LOCKED) ) { \
-         n++; \
-         usleep(SQLTM_TIME); \
-      } \
-    }while( (n < SQLTM_COUNT) && ((rc == SQLITE_BUSY) || (rc == SQLITE_LOCKED))); \
-  }
-
-
 void csync_set_statedb_exists(CSYNC *ctx, int val) {
  ctx->statedb.exists = val;
 }
@@ -89,12 +73,85 @@ static int _csync_check_db_integrity(sqlite3 *db) {
        c_strlist_destroy(result);
    }

-    if( sqlite3_threadsafe() == 0 ) {
-        CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "* WARNING: SQLite module is not threadsafe!");
-        rc = -1;
+    return rc;
+
+}
+
+static int _csync_statedb_check(const char *statedb) {
+  int fd = -1, rc;
+  ssize_t r;
+  char buf[BUF_SIZE] = {0};
+  sqlite3 *db = NULL;
+  csync_stat_t sb;
+
+  mbchar_t *wstatedb = c_utf8_to_locale(statedb);
+
+  if (wstatedb == NULL) {
+    return -1;
+  }
+
+  /* check db version */
+#ifdef _WIN32
+    _fmode = _O_BINARY;
+#endif
+
+    fd = _topen(wstatedb, O_RDONLY);
+
+    if (fd >= 0) {
+        /* Check size. Size of zero is a valid database actually. */
+        rc = _tfstat(fd, &sb);
+
+        if (rc == 0) {
+            if (sb.st_size == 0) {
+                CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "Database size is zero byte!");
+                close(fd);
+            } else {
+                r = read(fd, (void *) buf, sizeof(buf) - 1);
+                close(fd);
+                if (r >= 0) {
+                    buf[BUF_SIZE - 1] = '\0';
+                    if (c_streq(buf, "SQLite format 3")) {
+                        if (sqlite3_open(statedb, &db ) == SQLITE_OK) {
+                            rc = _csync_check_db_integrity(db);
+                            if( sqlite3_close(db) != 0 ) {
+                                CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "WARN: sqlite3_close error!");
+                            }
+
+                            if( rc >= 0 ) {
+                                /* everything is fine */
+                                c_free_locale_string(wstatedb);
+                                return 0;
+                            }
+                            CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "Integrity check failed!");
+                        } else {
+                            /* resources need to be freed even when open failed */
+                            sqlite3_close(db);
+                            CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "database corrupted, removing!");
+                        }
+                    } else {
+                        CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "sqlite version mismatch");
+                    }
+                }
+            }
+        } else {
+            close(fd);
+        }
+        /* if it comes here, the database is broken and should be recreated. */
+        _tunlink(wstatedb);
    }

-    return rc;
+  c_free_locale_string(wstatedb);
+
+  /* create database */
+  rc = sqlite3_open(statedb, &db);
+  if (rc == SQLITE_OK) {
+    sqlite3_close(db);
+    csync_win32_set_file_hidden(statedb, true);
+    return 1;
+  }
+  sqlite3_close(db);
+   CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "sqlite3_open failed: %s %s", sqlite3_errmsg(db), statedb);
+   return -1;
 }

 static int _csync_statedb_is_empty(sqlite3 *db) {
@@ -122,6 +179,7 @@ static void sqlite_profile( void *x, const char* sql, sqlite3_uint64 time)

 int csync_statedb_load(CSYNC *ctx, const char *statedb, sqlite3 **pdb) {
  int rc = -1;
+  int check_rc = -1;
  c_strlist_t *result = NULL;
  sqlite3 *db = NULL;

@@ -129,15 +187,19 @@ int csync_statedb_load(CSYNC *ctx, const char *statedb, sqlite3 **pdb) {
      return -1;
  }

-  if (ctx->statedb.db) {
-      CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "ERR: DB already open");
-      return -1;
+  /* csync_statedb_check tries to open the statedb and creates it in case
+   * its not there.
+   */
+  check_rc = _csync_statedb_check(statedb);
+  if (check_rc < 0) {
+    CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "ERR: checking csync database failed - bail out.");
+
+    rc = -1;
+    goto out;
  }

-  ctx->statedb.lastReturnValue = SQLITE_OK;
-
-  /* Openthe database */
-  if (sqlite_open(statedb, &db) != SQLITE_OK) {
+  /* Open or create the temporary database */
+  if (sqlite3_open(statedb, &db) != SQLITE_OK) {
    const char *errmsg= sqlite3_errmsg(ctx->statedb.db);
    CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "ERR: Failed to sqlite3 open statedb - bail out: %s.",
              errmsg ? errmsg : "<no sqlite3 errormsg>");
@@ -146,31 +208,16 @@ int csync_statedb_load(CSYNC *ctx, const char *statedb, sqlite3 **pdb) {
    goto out;
  }

-  if (_csync_check_db_integrity(db) != 0) {
-      const char *errmsg= sqlite3_errmsg(db);
-      CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "ERR: sqlite3 integrity check failed - bail out: %s.",
-                errmsg ? errmsg : "<no sqlite3 errormsg>");
-      rc = -1;
-      goto out;
-  }
-
-  if (_csync_statedb_is_empty(db)) {
-    CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "statedb contents doesn't exist");
+  /* If check_rc == 1 the database is new and empty as a result. */
+  if ((check_rc == 1) || _csync_statedb_is_empty(db)) {
+    CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "statedb doesn't exist");
    csync_set_statedb_exists(ctx, 0);
  } else {
    csync_set_statedb_exists(ctx, 1);
  }

-  /* Print out the version */
-  //
-  result = csync_statedb_query(db, "SELECT sqlite_version();");
-  if (result && result->count >= 1) {
-      CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "sqlite3 version \"%s\"", *result->vector);
-  }
-  c_strlist_destroy(result);
-
  /* optimization for speeding up SQLite */
-  result = csync_statedb_query(db, "PRAGMA synchronous = NORMAL;");
+  result = csync_statedb_query(db, "PRAGMA synchronous = FULL;");
  c_strlist_destroy(result);
  result = csync_statedb_query(db, "PRAGMA case_sensitive_like = ON;");
  c_strlist_destroy(result);
@@ -183,8 +230,6 @@ int csync_statedb_load(CSYNC *ctx, const char *statedb, sqlite3 **pdb) {
 #endif
  *pdb = db;

-   CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "Success");
-
  return 0;
 out:
  sqlite3_close(db);
@@ -199,25 +244,22 @@ int csync_statedb_close(CSYNC *ctx) {
  }

  /* deallocate query resources */
-  if( ctx->statedb.by_fileid_stmt ) {
-      sqlite3_finalize(ctx->statedb.by_fileid_stmt);
-      ctx->statedb.by_fileid_stmt = NULL;
-  }
  if( ctx->statedb.by_hash_stmt ) {
-      sqlite3_finalize(ctx->statedb.by_hash_stmt);
+      rc = sqlite3_finalize(ctx->statedb.by_hash_stmt);
      ctx->statedb.by_hash_stmt = NULL;
  }
-  if( ctx->statedb.by_inode_stmt) {
-      sqlite3_finalize(ctx->statedb.by_inode_stmt);
+
+  if( ctx->statedb.by_fileid_stmt ) {
+      rc = sqlite3_finalize(ctx->statedb.by_fileid_stmt);
+      ctx->statedb.by_fileid_stmt = NULL;
+  }
+
+  if( ctx->statedb.by_inode_stmt ) {
+      rc = sqlite3_finalize(ctx->statedb.by_inode_stmt);
      ctx->statedb.by_inode_stmt = NULL;
  }

-  ctx->statedb.lastReturnValue = SQLITE_OK;
-
-  int sr = sqlite3_close(ctx->statedb.db);
-  CSYNC_LOG(CSYNC_LOG_PRIORITY_NOTICE, "sqlite3_close=%d", sr);
-
-  ctx->statedb.db = 0;
+  sqlite3_close(ctx->statedb.db);

  return rc;
 }
@@ -239,7 +281,7 @@ static int _csync_file_stat_from_metadata_table( csync_file_stat_t **st, sqlite3

    column_count = sqlite3_column_count(stmt);

-    SQLITE_BUSY_HANDLED( sqlite3_step(stmt) );
+    rc = sqlite3_step(stmt);

    if( rc == SQLITE_ROW ) {
        if(column_count > 7) {
@@ -302,8 +344,7 @@ csync_file_stat_t *csync_statedb_get_stat_by_hash(CSYNC *ctx,
  if( ctx->statedb.by_hash_stmt == NULL ) {
      const char *hash_query = "SELECT * FROM metadata WHERE phash=?1";

-      SQLITE_BUSY_HANDLED(sqlite3_prepare_v2(ctx->statedb.db, hash_query, strlen(hash_query), &ctx->statedb.by_hash_stmt, NULL));
-      ctx->statedb.lastReturnValue = rc;
+      rc = sqlite3_prepare_v2(ctx->statedb.db, hash_query, strlen(hash_query), &ctx->statedb.by_hash_stmt, NULL);
      if( rc != SQLITE_OK ) {
          CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Unable to create stmt for hash query.");
          return NULL;
@@ -317,7 +358,6 @@ csync_file_stat_t *csync_statedb_get_stat_by_hash(CSYNC *ctx,
  sqlite3_bind_int64(ctx->statedb.by_hash_stmt, 1, (long long signed int)phash);

  rc = _csync_file_stat_from_metadata_table(&st, ctx->statedb.by_hash_stmt);
-  ctx->statedb.lastReturnValue = rc;
  if( !(rc == SQLITE_ROW || rc == SQLITE_DONE) )  {
      CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata: %d!", rc);
  }
@@ -345,8 +385,7 @@ csync_file_stat_t *csync_statedb_get_stat_by_file_id(CSYNC *ctx,
    if( ctx->statedb.by_fileid_stmt == NULL ) {
        const char *query = "SELECT * FROM metadata WHERE fileid=?1";

-        SQLITE_BUSY_HANDLED(sqlite3_prepare_v2(ctx->statedb.db, query, strlen(query), &ctx->statedb.by_fileid_stmt, NULL));
-        ctx->statedb.lastReturnValue = rc;
+        rc = sqlite3_prepare_v2(ctx->statedb.db, query, strlen(query), &ctx->statedb.by_fileid_stmt, NULL);
        if( rc != SQLITE_OK ) {
            CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Unable to create stmt for file id query.");
            return NULL;
@@ -357,7 +396,6 @@ csync_file_stat_t *csync_statedb_get_stat_by_file_id(CSYNC *ctx,
    sqlite3_bind_text(ctx->statedb.by_fileid_stmt, 1, file_id, -1, SQLITE_STATIC);

    rc = _csync_file_stat_from_metadata_table(&st, ctx->statedb.by_fileid_stmt);
-    ctx->statedb.lastReturnValue = rc;
    if( !(rc == SQLITE_ROW || rc == SQLITE_DONE) ) {
        CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata: %d!", rc);
    }
@@ -385,8 +423,7 @@ csync_file_stat_t *csync_statedb_get_stat_by_inode(CSYNC *ctx,
  if( ctx->statedb.by_inode_stmt == NULL ) {
      const char *inode_query = "SELECT * FROM metadata WHERE inode=?1";

-      SQLITE_BUSY_HANDLED(sqlite3_prepare_v2(ctx->statedb.db, inode_query, strlen(inode_query), &ctx->statedb.by_inode_stmt, NULL));
-      ctx->statedb.lastReturnValue = rc;
+      rc = sqlite3_prepare_v2(ctx->statedb.db, inode_query, strlen(inode_query), &ctx->statedb.by_inode_stmt, NULL);
      if( rc != SQLITE_OK ) {
          CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Unable to create stmt for inode query.");
          return NULL;
@@ -400,7 +437,6 @@ csync_file_stat_t *csync_statedb_get_stat_by_inode(CSYNC *ctx,
  sqlite3_bind_int64(ctx->statedb.by_inode_stmt, 1, (long long signed int)inode);

  rc = _csync_file_stat_from_metadata_table(&st, ctx->statedb.by_inode_stmt);
-  ctx->statedb.lastReturnValue = rc;
  if( !(rc == SQLITE_ROW || rc == SQLITE_DONE) ) {
      CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Could not get line from metadata by inode: %d!", rc);
  }
@@ -449,8 +485,7 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {
        return -1;
    }

-    SQLITE_BUSY_HANDLED(sqlite3_prepare_v2(ctx->statedb.db, BELOW_PATH_QUERY, -1, &stmt, NULL));
-    ctx->statedb.lastReturnValue = rc;
+    rc = sqlite3_prepare_v2(ctx->statedb.db, BELOW_PATH_QUERY, -1, &stmt, NULL);
    if( rc != SQLITE_OK ) {
      CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "WRN: Unable to create stmt for below path query.");
      return -1;
@@ -472,7 +507,6 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {

    cnt = 0;

-    ctx->statedb.lastReturnValue = rc;
    do {
        csync_file_stat_t *st = NULL;

@@ -488,7 +522,6 @@ int csync_statedb_get_below_path( CSYNC *ctx, const char *path ) {
        }
    } while( rc == SQLITE_ROW );

-    ctx->statedb.lastReturnValue = rc;
    if( rc != SQLITE_DONE ) {
        ctx->status_code = CSYNC_STATUS_TREE_ERROR;
    } else {
@@ -98,6 +98,27 @@ int csync_statedb_get_below_path(CSYNC *ctx, const char *path);
 */
 c_strlist_t *csync_statedb_query(sqlite3 *db, const char *statement);

+/**
+ * @brief Insert function for the statedb.
+ *
+ * @param ctx        The csync context.
+ * @param statement  The SQL statement to insert into the statedb.
+ *
+ * @return  The rowid of the most recent INSERT on success, 0 if the query
+ *          wasn't successful.
+ */
+typedef struct csync_progressinfo_s {
+  struct csync_progressinfo_s *next;
+  uint64_t phash;
+  uint64_t modtime;
+  char *md5;
+  int error;
+  int chunk;
+  int transferId;
+  char *tmpfile;
+  char *error_string;
+} csync_progressinfo_t;
+
 #ifdef __cplusplus
 }
 #endif
@@ -100,10 +100,6 @@ static bool _csync_sameextension(const char *p1, const char *p2) {
 }
 #endif

-static bool _last_db_return_error(CSYNC* ctx) {
-    return ctx->statedb.lastReturnValue != SQLITE_OK && ctx->statedb.lastReturnValue != SQLITE_DONE && ctx->statedb.lastReturnValue != SQLITE_ROW;
-}
-
 static int _csync_detect_update(CSYNC *ctx, const char *file,
    const csync_vio_file_stat_t *fs, const int type) {
  uint64_t h = 0;
@@ -150,21 +146,21 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
  if (excluded != CSYNC_NOT_EXCLUDED) {
    CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "%s excluded  (%d)", path, excluded);
    if (excluded == CSYNC_FILE_EXCLUDE_AND_REMOVE) {
-        return 1;
+      switch (ctx->current) {
+        case LOCAL_REPLICA:
+          ctx->local.ignored_cleanup = c_list_append(ctx->local.ignored_cleanup, c_strdup(path));
+          break;
+        case REMOTE_REPLICA:
+          ctx->remote.ignored_cleanup = c_list_append(ctx->remote.ignored_cleanup, c_strdup(path));
+          break;
+        default:
+          break;
+      }
+      return 0;
    }
    if (excluded == CSYNC_FILE_SILENTLY_EXCLUDED) {
-        return 1;
+        return 0;
    }
-
-    if (ctx->current_fs) {
-        ctx->current_fs->has_ignored_files = true;
-    }
-  }
-
-  if (ctx->current == REMOTE_REPLICA && ctx->checkSelectiveSyncBlackListHook) {
-      if (ctx->checkSelectiveSyncBlackListHook(ctx->checkSelectiveSyncBlackListData, path)) {
-          return 1;
-      }
  }

  h = _hash_of_file(ctx, file );
@@ -183,26 +179,17 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
  st->instruction = CSYNC_INSTRUCTION_NONE;
  st->etag = NULL;
  st->child_modified = 0;
-  st->has_ignored_files = 0;

  /* check hardlink count */
  if (type == CSYNC_FTW_TYPE_FILE ) {
    if( fs->nlink > 1) {
      st->instruction = CSYNC_INSTRUCTION_IGNORE;
-      st->error_status = CSYNC_STATUS_INDIVIDUAL_IS_HARDLINK;
      goto out;
    }

    if (fs->mtime == 0) {
-      CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "file: %s - mtime is zero!", path);
-
      tmp = csync_statedb_get_stat_by_hash(ctx, h);
-      if(_last_db_return_error(ctx)) {
-          SAFE_FREE(st);
-          ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
-          return -1;
-      }
-
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "file: %s - mtime is zero!", path);
      if (tmp == NULL) {
        CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "file: %s - not found in db, IGNORE!", path);
        st->instruction = CSYNC_INSTRUCTION_IGNORE;
@@ -239,28 +226,16 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
  if (csync_get_statedb_exists(ctx)) {
    tmp = csync_statedb_get_stat_by_hash(ctx, h);

-    if(_last_db_return_error(ctx)) {
-        SAFE_FREE(st);
-        ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
-        return -1;
-    }
-
    if(tmp && tmp->phash == h ) { /* there is an entry in the database */
        /* we have an update! */
-        CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Database entry found, compare: %" PRId64 " <-> %" PRId64
-                                            ", etag: %s <-> %s, inode: %" PRId64 " <-> %" PRId64
-                                            ", size: %" PRId64 " <-> %" PRId64 ", perms: %s <-> %s",
-                  ((int64_t) fs->mtime), ((int64_t) tmp->modtime),
-                  fs->etag, tmp->etag, (uint64_t) fs->inode, (uint64_t) tmp->inode,
-                  (uint64_t) fs->size, (uint64_t) tmp->size, fs->remotePerm, tmp->remotePerm );
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Database entry found, compare: %" PRId64 " <-> %" PRId64 ", etag: %s <-> %s, inode: %" PRId64 " <-> %" PRId64,
+                  ((int64_t) fs->mtime), ((int64_t) tmp->modtime), fs->etag, tmp->etag, (uint64_t) fs->inode, (uint64_t) tmp->inode);
        if( !fs->etag) {
            st->instruction = CSYNC_INSTRUCTION_EVAL;
            goto out;
        }
        if((ctx->current == REMOTE_REPLICA && !c_streq(fs->etag, tmp->etag ))
            || (ctx->current == LOCAL_REPLICA && (fs->mtime != tmp->modtime
-                                                  // zero size in statedb can happen during migration
-                                                  || (tmp->size != 0 && fs->size != tmp->size)
 #if 0
                                                  || fs->inode != tmp->inode
 #endif
@@ -310,12 +285,6 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,

            tmp = csync_statedb_get_stat_by_inode(ctx, fs->inode);

-            if(_last_db_return_error(ctx)) {
-                SAFE_FREE(st);
-                ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
-                return -1;
-            }
-
            /* translate the file type between the two stat types csync has. */
            if( tmp && tmp->type == 0 ) {
                tmp_vio_type = CSYNC_VIO_FILE_TYPE_REGULAR;
@@ -346,12 +315,6 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
        } else {
            /* Remote Replica Rename check */
            tmp = csync_statedb_get_stat_by_file_id(ctx, fs->file_id);
-
-            if(_last_db_return_error(ctx)) {
-                SAFE_FREE(st);
-                ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
-                return -1;
-            }
            if(tmp ) {                           /* tmp existing at all */
                if ((tmp->type == CSYNC_FTW_TYPE_DIR && fs->type != CSYNC_VIO_FILE_TYPE_DIRECTORY) ||
                        (tmp->type == CSYNC_FTW_TYPE_FILE && fs->type != CSYNC_VIO_FILE_TYPE_REGULAR)) {
@@ -379,9 +342,8 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
        }
    }
  } else  {
-      CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Unable to open statedb" );
-      ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
-      return -1;
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Unable to open statedb, setting inst to NEW" );
+      st->instruction = CSYNC_INSTRUCTION_NEW;
  }

 out:
@@ -469,19 +431,11 @@ int csync_walker(CSYNC *ctx, const char *file, const csync_vio_file_stat_t *fs,

  switch (flag) {
    case CSYNC_FTW_FLAG_FILE:
-      if (ctx->current == REMOTE_REPLICA) {
-        CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "file: %s [file_id=%s size=%" PRIu64 "]", file, fs->file_id, fs->size);
-      } else {
-          CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "file: %s [inode=%" PRIu64 " size=%" PRIu64 "]", file, fs->inode, fs->size);
-      }
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "file: %s [file_id=%s]", file, fs->file_id);
      type = CSYNC_FTW_TYPE_FILE;
      break;
  case CSYNC_FTW_FLAG_DIR: /* enter directory */
-      if (ctx->current == REMOTE_REPLICA) {
-        CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "directory: %s [file_id=%s]", file, fs->file_id);
-      } else {
-          CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "directory: %s [inode=%" PRIu64 "]", file, fs->inode);
-      }
+    CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "directory: %s [file_id=%s]", file, fs->file_id);
      type = CSYNC_FTW_TYPE_DIR;
      break;
  case CSYNC_FTW_FLAG_NSTAT: /* not statable file */
@@ -581,17 +535,6 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
          if (asp < 0) {
              CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "asprintf failed!");
          }
-      } else if(errno == ERRNO_SERVICE_UNAVAILABLE) {
-          CSYNC_LOG(CSYNC_LOG_PRIORITY_WARN, "Service was not available!");
-          if (ctx->current_fs) {
-              ctx->current_fs->instruction = CSYNC_INSTRUCTION_IGNORE;
-              ctx->current_fs->error_status = CSYNC_STATUS_SERVICE_UNAVAILABLE;
-              /* If a directory has ignored files, put the flag on the parent directory as well */
-              if( previous_fs ) {
-                  previous_fs->has_ignored_files = true;
-              }
-              goto done;
-          }
      } else {
          CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "opendir failed for %s - errno %d", uri, errno);
      }
@@ -648,13 +591,10 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
    path = filename + ulen;

    /* skip ".csync_journal.db" and ".csync_journal.db.ctmp" */
-    /* Isn't this done via csync_exclude already? */
    if (c_streq(path, ".csync_journal.db")
            || c_streq(path, ".csync_journal.db.ctmp")
            || c_streq(path, ".csync_journal.db.ctmp-journal")
-            || c_streq(path, ".csync-progressdatabase")
-            || c_streq(path, ".csync_journal.db-shm")
-            || c_streq(path, ".csync_journal.db-wal")) {
+            || c_streq(path, ".csync-progressdatabase")) {
        csync_vio_file_stat_destroy(dirent);
        dirent = NULL;
        SAFE_FREE(filename);
@@ -700,11 +640,6 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
        uint64_t h = c_jhash64((uint8_t *) path, len, 0);
        etag = csync_statedb_get_etag( ctx, h );

-        if(_last_db_return_error(ctx)) {
-            ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
-            goto error;
-        }
-
        if( etag ) {
            SAFE_FREE(fs->etag);
            fs->etag = etag;
@@ -724,6 +659,10 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
    rc = fn(ctx, filename, fs, flag);
    /* this function may update ctx->current and ctx->read_from_db */

+    if (ctx->current_fs && previous_fs && ctx->current_fs->child_modified) {
+        previous_fs->child_modified = ctx->current_fs->child_modified;
+    }
+
    /* Only for the local replica we have to destroy stat(), for the remote one it is a pointer to dirent */
    if (ctx->replica == LOCAL_REPLICA) {
        csync_vio_file_stat_destroy(fs);
@@ -738,7 +677,7 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
      goto error;
    }

-    if (flag == CSYNC_FTW_FLAG_DIR && depth && rc == 0
+    if (flag == CSYNC_FTW_FLAG_DIR && depth
        && (!ctx->current_fs || ctx->current_fs->instruction != CSYNC_INSTRUCTION_IGNORE)) {
      rc = csync_ftw(ctx, filename, fn, depth - 1);
      if (rc < 0) {
@@ -751,16 +690,6 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
        ctx->current_fs->instruction = CSYNC_INSTRUCTION_NONE;
        ctx->current_fs->should_update_etag = true;
      }
-
-      if (ctx->current_fs && previous_fs && ctx->current_fs->has_ignored_files) {
-          /* If a directory has ignored files, put the flag on the parent directory as well */
-          previous_fs->has_ignored_files = ctx->current_fs->has_ignored_files;
-      }
-    }
-
-    if (ctx->current_fs && previous_fs && ctx->current_fs->child_modified) {
-        /* If a directory has modified files, put the flag on the parent directory as well */
-        previous_fs->child_modified = ctx->current_fs->child_modified;
    }

    if (flag == CSYNC_FTW_FLAG_DIR && ctx->current_fs
@@ -96,7 +96,6 @@ hbf_transfer_t *hbf_init_transfer( const char *dest_uri ) {
    transfer->block_size = DEFAULT_BLOCK_SIZE;
    transfer->threshold = transfer->block_size;
    transfer->modtime_accepted = 0;
-    transfer->oc_header_modtime = 0;

    return transfer;
 }
@@ -492,8 +491,8 @@ Hbf_State hbf_transfer( ne_session *session, hbf_transfer_t *transfer, const cha

                snprintf(buf, sizeof(buf), "%"PRId64, transfer->stat_size);
                ne_add_request_header(req, "OC-Total-Length", buf);
-                if( transfer->oc_header_modtime > 0 ) {
-                    snprintf(buf, sizeof(buf), "%"PRId64, transfer->oc_header_modtime);
+                if( transfer->modtime > 0 ) {
+                    snprintf(buf, sizeof(buf), "%"PRId64, transfer->modtime);
                    ne_add_request_header(req, "X-OC-Mtime", buf);
                }

@@ -92,7 +92,6 @@ struct hbf_transfer_s {

    int64_t stat_size;
    time_t modtime;
-    time_t oc_header_modtime;
    int64_t block_size;
    int64_t threshold;

@@ -134,14 +134,6 @@ static char *c_iconv(const char* str, enum iconv_direction dir)
 }
 #endif /* defined(HAVE_ICONV) && defined(WITH_ICONV) */

-int c_strncasecmp(const char *a, const char *b, size_t n) {
-#ifdef _WIN32
-    return _strnicmp(a, b, n);
-#else
-    return strncasecmp(a, b, n);
-#endif
-}
-
 int c_streq(const char *a, const char *b) {
  register const char *s1 = a;
  register const char *s2 = b;
@@ -59,17 +59,6 @@ struct c_strlist_s {
  size_t size;
 };

-/**
- * @brief Compare to strings case insensitively.
- *
- * @param a  First string to compare.
- * @param b  Second string to compare.
- * @param n  Max comparison length.
- *
- * @return see strncasecmp
- */
-int c_strncasecmp(const char *a, const char *b, size_t n);
-
 /**
 * @brief Compare to strings if they are equal.
 *
@@ -237,7 +237,7 @@ int csync_vio_local_stat(const char *uri, csync_vio_file_stat_t *buf) {
    /* printf("Index: %I64i\n", FileIndex.QuadPart); */
    buf->inode = FileIndex.QuadPart;

-    buf->size = (fileInfo.nFileSizeHigh * ((int64_t)(MAXDWORD)+1)) + fileInfo.nFileSizeLow;
+    buf->size = (fileInfo.nFileSizeHigh * (int64_t)(MAXDWORD+1)) + fileInfo.nFileSizeLow;
    buf->fields |= CSYNC_VIO_FILE_STAT_FIELDS_SIZE;

    /* Get the file time with a win32 call rather than through stat. See
@@ -141,57 +141,6 @@ static void check_csync_excluded(void **state)

 }

-static void check_csync_pathes(void **state)
-{
-    CSYNC *csync = *state;
-    int rc;
-
-    _csync_exclude_add( &(csync->excludes), "/exclude" );
-
-    /* Check toplevel dir, the pattern only works for toplevel dir. */
-    rc = csync_excluded(csync, "/exclude", CSYNC_FTW_TYPE_DIR);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-    rc = csync_excluded(csync, "/foo/exclude", CSYNC_FTW_TYPE_DIR);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
-    /* check for a file called exclude. Must still work */
-    rc = csync_excluded(csync, "/exclude", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-    rc = csync_excluded(csync, "/foo/exclude", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-
-    /* Add an exclude for directories only: excl/ */
-    _csync_exclude_add( &(csync->excludes), "excl/" );
-    rc = csync_excluded(csync, "/excl", CSYNC_FTW_TYPE_DIR);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-    rc = csync_excluded(csync, "meep/excl", CSYNC_FTW_TYPE_DIR);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-    rc = csync_excluded(csync, "/excl", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_NOT_EXCLUDED);
-}
-
-static void check_csync_is_windows_reserved_word() {
-    assert_true(csync_is_windows_reserved_word("CON"));
-    assert_true(csync_is_windows_reserved_word("con"));
-    assert_true(csync_is_windows_reserved_word("CON."));
-    assert_true(csync_is_windows_reserved_word("con."));
-    assert_true(csync_is_windows_reserved_word("CON.ference"));
-    assert_false(csync_is_windows_reserved_word("CONference"));
-    assert_false(csync_is_windows_reserved_word("conference"));
-    assert_false(csync_is_windows_reserved_word("conf.erence"));
-    assert_false(csync_is_windows_reserved_word("co"));
-    assert_true(csync_is_windows_reserved_word("A:"));
-    assert_true(csync_is_windows_reserved_word("a:"));
-    assert_true(csync_is_windows_reserved_word("z:"));
-    assert_true(csync_is_windows_reserved_word("Z:"));
-    assert_true(csync_is_windows_reserved_word("M:"));
-    assert_true(csync_is_windows_reserved_word("m:"));
-
-}

 int torture_run_tests(void)
 {
@@ -199,8 +148,6 @@ int torture_run_tests(void)
        unit_test_setup_teardown(check_csync_exclude_add, setup, teardown),
        unit_test_setup_teardown(check_csync_exclude_load, setup, teardown),
        unit_test_setup_teardown(check_csync_excluded, setup_init, teardown),
-        unit_test_setup_teardown(check_csync_pathes, setup_init, teardown),
-        unit_test_setup_teardown(check_csync_is_windows_reserved_word, setup_init, teardown),
    };

    return run_tests(tests);
@@ -42,13 +42,6 @@ static void setup(void **state) {

    csync->statedb.file = c_strdup( TESTDB );
    *state = csync;
-
-    sqlite3 *db = NULL;
-    rc = sqlite3_open_v2(TESTDB, &db, SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE, NULL);
-    assert_int_equal(rc, SQLITE_OK);
-
-    rc = sqlite3_close(db);
-    assert_int_equal(rc, SQLITE_OK);
 }

 static void teardown(void **state) {
@@ -64,6 +57,37 @@ static void teardown(void **state) {
    *state = NULL;
 }

+static void check_csync_statedb_check(void **state)
+{
+    int rc;
+
+    (void) state; /* unused */
+
+    rc = system("mkdir -p /tmp/check_csync1");
+
+    /* old db */
+    rc = system("echo \"SQLite format 2\" > /tmp/check_csync1/test.db");
+    assert_int_equal(rc, 0);
+    rc = _csync_statedb_check(TESTDB);
+    assert_int_equal(rc, 1);
+
+    /* db already exists */
+    rc = _csync_statedb_check(TESTDB);
+    assert_int_equal(rc, 1);
+
+    /* no db exists */
+    rc = system("rm -f /tmp/check_csync1/test.db");
+    assert_int_equal(rc, 0);
+    rc = _csync_statedb_check(TESTDB);
+    assert_int_equal(rc, 1);
+
+    rc = _csync_statedb_check("/tmp/check_csync1/");
+    assert_int_equal(rc, -1);
+
+    rc = system("rm -rf /tmp/check_csync1");
+    assert_int_equal(rc, 0);
+}
+
 static void check_csync_statedb_load(void **state)
 {
    CSYNC *csync = *state;
@@ -119,6 +143,7 @@ static void check_csync_statedb_close(void **state)
 int torture_run_tests(void)
 {
    const UnitTest tests[] = {
+        unit_test_setup_teardown(check_csync_statedb_check, setup, teardown),
        unit_test_setup_teardown(check_csync_statedb_load, setup, teardown),
        unit_test_setup_teardown(check_csync_statedb_close, setup, teardown),
    };
@@ -47,12 +47,6 @@ static void setup(void **state)
    rc = csync_init(csync);
    assert_int_equal(rc, 0);

-    sqlite3 *db = NULL;
-    rc = sqlite3_open_v2(TESTDB, &db, SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE, NULL);
-    assert_int_equal(rc, SQLITE_OK);
-    rc = sqlite3_close(db);
-    assert_int_equal(rc, SQLITE_OK);
-
    rc = csync_statedb_load(csync, TESTDB, &csync->statedb.db);
    assert_int_equal(rc, 0);

@@ -61,11 +55,19 @@ static void setup(void **state)

 static void setup_db(void **state)
 {
-    char *errmsg;
+    CSYNC *csync;
+    char *stmt = NULL;
    int rc = 0;
-    sqlite3 *db = NULL;
+    c_strlist_t *result = NULL;

-    const char *sql = "CREATE TABLE IF NOT EXISTS metadata ("
+    setup(state);
+    csync = *state;
+
+    // rc = csync_statedb_create_tables(csync->statedb.db);
+    assert_int_equal(rc, 0);
+
+    result = csync_statedb_query(csync->statedb.db,
+        "CREATE TABLE IF NOT EXISTS metadata ("
        "phash INTEGER(8),"
        "pathlen INTEGER,"
        "path VARCHAR(4096),"
@@ -77,25 +79,29 @@ static void setup_db(void **state)
        "type INTEGER,"
        "md5 VARCHAR(32),"
        "PRIMARY KEY(phash)"
-        ");";
+        ");"
+        );

-        const char *sql2 = "INSERT INTO metadata"
+    assert_non_null(result);
+    c_strlist_destroy(result);
+
+
+    stmt = sqlite3_mprintf("INSERT INTO metadata"
                           "(phash, pathlen, path, inode, uid, gid, mode, modtime, type, md5) VALUES"
-                           "(42, 42, 'Its funny stuff', 23, 42, 43, 55, 66, 2, 54);";
-
-
-    setup(state);
-    rc = sqlite3_open( TESTDB, &db);
-    assert_int_equal(rc, SQLITE_OK);
-
-    rc = sqlite3_exec( db, sql, NULL, NULL, &errmsg );
-    assert_int_equal(rc, SQLITE_OK);
-
-    rc = sqlite3_exec( db, sql2, NULL, NULL, &errmsg );
-    assert_int_equal(rc, SQLITE_OK);
-
-    sqlite3_close(db);
+                           "(%lu, %d, '%q', %d, %d, %d, %d, %lu, %d, %lu);",
+                           42,
+                           42,
+                           "It's a rainy day",
+                           23,
+                           42,
+                           42,
+                           42,
+                           42,
+                           2,
+                           43);

+    // rc = csync_statedb_insert(csync->statedb.db, stmt);
+    sqlite3_free(stmt);
 }

 static void teardown(void **state) {
@@ -133,6 +139,41 @@ static void check_csync_statedb_query_statement(void **state)
    }
 }

+static void check_csync_statedb_create_error(void **state)
+{
+    CSYNC *csync = *state;
+    c_strlist_t *result;
+
+    result = csync_statedb_query(csync->statedb.db, "CREATE TABLE test(phash INTEGER, text VARCHAR(10));");
+    assert_non_null(result);
+    c_strlist_destroy(result);
+
+    result = csync_statedb_query(csync->statedb.db, "CREATE TABLE test(phash INTEGER, text VARCHAR(10));");
+    assert_null(result);
+
+    c_strlist_destroy(result);
+}
+
+static void check_csync_statedb_insert_statement(void **state)
+{
+    CSYNC *csync = *state;
+    c_strlist_t *result;
+    int rc = 0;
+
+    result = csync_statedb_query(csync->statedb.db, "CREATE TABLE test(phash INTEGER, text VARCHAR(10));");
+    assert_non_null(result);
+    c_strlist_destroy(result);
+
+    // rc = csync_statedb_insert(csync->statedb.db, "INSERT;");
+    assert_int_equal(rc, 0);
+    // rc = csync_statedb_insert(csync->statedb.db, "INSERT");
+    assert_int_equal(rc, 0);
+    // rc = csync_statedb_insert(csync->statedb.db, "");
+    assert_int_equal(rc, 0);
+}
+
+
+
 static void check_csync_statedb_drop_tables(void **state)
 {
    // CSYNC *csync = *state;
@@ -214,6 +255,8 @@ int torture_run_tests(void)
 {
    const UnitTest tests[] = {
        unit_test_setup_teardown(check_csync_statedb_query_statement, setup, teardown),
+        unit_test_setup_teardown(check_csync_statedb_create_error, setup, teardown),
+        unit_test_setup_teardown(check_csync_statedb_insert_statement, setup, teardown),
        unit_test_setup_teardown(check_csync_statedb_drop_tables, setup, teardown),
        unit_test_setup_teardown(check_csync_statedb_insert_metadata, setup, teardown),
        unit_test_setup_teardown(check_csync_statedb_write, setup, teardown),
@@ -23,64 +23,11 @@

 #define TESTDB "/tmp/check_csync/journal.db"

-static int firstrun = 1;
-
-static void statedb_create_metadata_table(sqlite3 *db)
-{
-    int rc = 0;
-
-    if( db ) {
-        const char *sql = "CREATE TABLE IF NOT EXISTS metadata("
-                          "phash INTEGER(8),"
-                          "pathlen INTEGER,"
-                          "path VARCHAR(4096),"
-                          "inode INTEGER,"
-                          "uid INTEGER,"
-                          "gid INTEGER,"
-                          "mode INTEGER,"
-                          "modtime INTEGER(8),"
-                          "type INTEGER,"
-                          "md5 VARCHAR(32),"
-                          "PRIMARY KEY(phash));";
-
-        rc = sqlite3_exec(db, sql, NULL, NULL, NULL);
-        const char *msg = sqlite3_errmsg(db);
-        assert_int_equal( rc, SQLITE_OK );
-    }
-}
-
-static void statedb_insert_metadata(sqlite3 *db)
-{
-    int rc = 0;
-
-    if( db ) {
-        char *stmt = sqlite3_mprintf("INSERT INTO metadata"
-                                     "(phash, pathlen, path, inode, uid, gid, mode, modtime,type,md5) VALUES"
-                                     "(%lld, %d, '%q', %d, %d, %d, %d, %lld, %d, '%q');",
-                                     (long long signed int)42,
-                                     42,
-                                     "I_was_wurst_before_I_became_wurstsalat",
-                                     619070,
-                                     42,
-                                     42,
-                                     42,
-                                     (long long signed int)42,
-                                     0,
-                                     "4711");
-
-        char *errmsg;
-        rc = sqlite3_exec(db, stmt, NULL, NULL, &errmsg);
-        sqlite3_free(stmt);
-        assert_int_equal( rc, SQLITE_OK );
-    }
-}
-
 static void setup(void **state)
 {
    CSYNC *csync;
    int rc;

-    unlink(TESTDB);
    rc = system("mkdir -p /tmp/check_csync");
    assert_int_equal(rc, 0);
    rc = system("mkdir -p /tmp/check_csync1");
@@ -91,21 +38,10 @@ static void setup(void **state)
    assert_int_equal(rc, 0);
    rc = csync_init(csync);
    assert_int_equal(rc, 0);
-
-    /* Create a new db with metadata */
-    sqlite3 *db;
-    csync->statedb.file = c_strdup(TESTDB);
-    rc = sqlite3_open(csync->statedb.file, &db);
-    statedb_create_metadata_table(db);
-    if( firstrun ) {
-        statedb_insert_metadata(db);
-        firstrun = 0;
-    }
-    sqlite3_close(db);
-
    rc = csync_statedb_load(csync, TESTDB, &csync->statedb.db);
    assert_int_equal(rc, 0);

+
    *state = csync;
 }

@@ -124,18 +60,9 @@ static void setup_ftw(void **state)
    assert_int_equal(rc, 0);
    rc = csync_init(csync);
    assert_int_equal(rc, 0);
-
-    sqlite3 *db = NULL;
-    rc = sqlite3_open_v2(TESTDB, &db, SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE, NULL);
-    assert_int_equal(rc, SQLITE_OK);
-    statedb_create_metadata_table(db);
-    rc = sqlite3_close(db);
-    assert_int_equal(rc, SQLITE_OK);
-
    rc = csync_statedb_load(csync, TESTDB, &csync->statedb.db);
    assert_int_equal(rc, 0);

-    csync->statedb.file = c_strdup( TESTDB );
    *state = csync;
 }

@@ -144,7 +71,6 @@ static void teardown(void **state)
    CSYNC *csync = *state;
    int rc;

-    unlink( csync->statedb.file);
    rc = csync_destroy(csync);
    assert_int_equal(rc, 0);

@@ -323,7 +249,6 @@ static void check_csync_detect_update_db_eval(void **state)
    csync_vio_file_stat_destroy(fs);
 }

-
 static void check_csync_detect_update_db_rename(void **state)
 {
    CSYNC *csync = *state;
@@ -331,6 +256,27 @@ static void check_csync_detect_update_db_rename(void **state)

    csync_vio_file_stat_t *fs;
    int rc = 0;
+    char *stmt = NULL;
+
+    // rc = csync_statedb_create_tables(csync->statedb.db);
+
+    assert_int_equal(rc, 0);
+    stmt = sqlite3_mprintf("INSERT INTO metadata"
+                           "(phash, pathlen, path, inode, uid, gid, mode, modtime,type,md5) VALUES"
+                           "(%lld, %d, '%q', %d, %d, %d, %d, %lld, %d, '%q');",
+                           (long long signed int)42,
+                           42,
+                           "I_was_wurst_before_I_became_wurstsalat",
+                           619070,
+                           42,
+                           42,
+                           42,
+                           (long long signed int)42,
+                           0,
+                           "4711");
+
+    // rc = csync_statedb_insert(csync->statedb.db, stmt);
+    sqlite3_free(stmt);

    fs = create_fstat("wurst.txt", 0, 1, 42);
    assert_non_null(fs);
@@ -1 +0,0 @@
-t1.cfg
@@ -1,7 +1,12 @@
 t1 - an integration test script for csync syncing to ownCloud.

 Note: This test script uses perl HTTP::DAV. This package needs to
-be in version 0.47 at least. Many distros deliver older versions.
+be in version 0.46 at least. Many distros deliver older versions.
+A working version is part of the github checkout.
+
+Note: This test script uses perl HTTP::DAV. This package needs to
+be in version 0.46 at least. Many distros deliver older versions.
+Update than.

 t1 uses a perl WebDAV client lib to sync to an existing instance of
 ownCloud. For that, various files are copied around, synced and the
@@ -15,6 +20,10 @@ First, configure the script. For that, create a file t1.cfg. There
 is t1.cfg.in as an example. Yeah, this test script is not secure,
 make sure to run it with a weak account and in a save environment.

+Second, unpack the test file collection with 
+tar xf testfiles.tar.xz
+in the directory where the tarball can be found.
+
 To start the script, call ./t1.pl on the commandline. A lot of 
 output is generated. If the script does not fail, everything works.

@@ -1,3 +1 @@
-*.part
-]*.directory
-
+*_conflict-*
@@ -27,6 +27,7 @@ use Exporter;
 use HTTP::DAV 0.47;
 use Data::Dumper;
 use File::Glob ':glob';
+use Carp::Assert;
 use Digest::MD5;
 use Unicode::Normalize;
 use LWP::UserAgent;
@@ -35,7 +36,6 @@ use HTTP::Request::Common qw( POST GET DELETE );
 use File::Basename;
 use IO::Handle;
 use POSIX qw/strftime/;
-use Carp;

 use Encode qw(from_to);
 use utf8;
@@ -63,22 +63,22 @@ our %config;

@ISA        = qw(Exporter);
@EXPORT     = qw( initTesting createRemoteDir removeRemoteDir createLocalDir cleanup csync
-                  assertLocalDirs assertLocalAndRemoteDir glob_put put_to_dir
+                  assertLocalDirs assertLocalAndRemoteDir glob_put put_to_dir 
                  putToDirLWP localDir remoteDir localCleanup createLocalFile md5OfFile
                  remoteCleanup server initLocalDir initRemoteDir moveRemoteFile
-                  printInfo remoteFileId createShare removeShare assert
+                  printInfo remoteFileId createShare removeShare
                  configValue testDirUrl getToFileLWP getToFileCurl);

 sub server
 {
  return $owncloud;
 }
-
+                  
 sub fromFileName($)
 {
  my ($file) = @_;
  if ( $^O eq "darwin" ) {
-    my $fromFileName = NFC( Encode::decode('utf-8', $file) );
+    my $fromFileName = NFC( Encode::decode('utf-8', $file) ); 
    return $fromFileName;
  } else {
    return $file;
@@ -89,7 +89,7 @@ sub fromFileName($)
 sub initTesting(;$)
 {
  my ($prefix) = @_;
-
+  
  my $cfgFile = "./t1.cfg";
  $cfgFile = "/etc/ownCloud/t1.cfg" if( -r "/etc/ownCloud/t1.cfg" );

@@ -115,8 +115,6 @@ sub initTesting(;$)

  $owncloud .= "/" unless( $owncloud =~ /\/$/ );

-  $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
-
  print "Connecting to ownCloud at ". $owncloud ."\n";

  # For SSL set the environment variable needed by the LWP module for SSL
@@ -131,15 +129,15 @@ sub initTesting(;$)
 		  -pass=> $passwd );
  # $d->DebugLevel(3);
  $prefix = "t1" unless( defined $prefix );
-
+  
  my $dirId = sprintf("%02d", rand(100));
  my $dateTime = strftime('%Y%m%d%H%M%S',localtime);
  my $dir = sprintf( "%s-%s-%s/", $prefix, $dateTime, $dirId );
-
+  
  $localDir = $dir;
  $localDir .= "/" unless( $localDir =~ /\/$/ );
  $remoteDir = $dir;
-
+  
  initRemoteDir();
  initLocalDir();
  printf( "Test directory name is %s\n", $dir );
@@ -168,9 +166,7 @@ sub testDirUrl()
 # the global var $remoteDir;
 sub initRemoteDir
 {
-  $d->open( $owncloud )
-       or die("Couldn't open $owncloud: " .$d->message . "\n");
-
+  $d->open( $owncloud );
  my $url = testDirUrl();

  my $re = $d->mkcol( $url );
@@ -208,7 +204,7 @@ sub removeRemoteDir($;$)
    if( $re == 0 ) {
 	print "Failed to remove directory <$url>:" . $d->message() ."\n";
    }
-
+  
    return $re;
 }

@@ -309,7 +305,7 @@ sub csync( ;$ )

    print "CSync URL: $url\n";

-    my $args = "--trust --exclude exclude.cfg"; # Trust crappy SSL certificates
+    my $args = "--trust"; # Trust crappy SSL certificates
    my $cmd = "LD_LIBRARY_PATH=$ld_libpath $csync $args $localDir $url";
    print "Starting: $cmd\n";

@@ -340,7 +336,7 @@ sub localDir()
  return $localDir;
 }

-sub remoteDir()
+sub remoteDir() 
 {
  return $remoteDir;
 }
@@ -362,8 +358,6 @@ sub assertFile($$)
  }
  my $stat_ok = stat( $localFile2 );
  print " *** STAT failed for $localFile2\n" unless( $stat_ok );
-  assert($stat_ok, "Stat failed for file $localFile");
-
  my @info = stat( $localFile2 );
  my $localModTime = $info[9];
  assert( $remoteModTime == $localModTime, "Modified-Times differ: remote: $remoteModTime <-> local: $localModTime" );
@@ -373,7 +367,7 @@ sub assertFile($$)
  my $remoteSize = $res->get_property( "getcontentlength" );
  if( $remoteSize ) { # directories do not have a contentlength
    print "Local versus Remote size: $localSize <-> $remoteSize\n";
-    # assert( $localSize == $remoteSize, "File sizes differ" ); # FIXME enable this again but it causes trouble on Jenkins all the time.
+    assert( $localSize == $remoteSize, "File sizes differ" );
  }
 }

@@ -387,7 +381,7 @@ sub traverse( $$;$ )
 {
    my ($remote, $acceptConflicts, $aurl) = @_;
    $remote .= '/' unless $remote =~ /(^|\/)$/;
-
+    
    my $url = testDirUrl() . $remote;
    if( $aurl ) {
 	$url = $aurl . $remote;
@@ -495,13 +489,13 @@ sub glob_put( $$;$ )
 	      print "   *** Putting $lfile to $puturl\n";
 	      # putToDirLWP( $lfile, $puturl );
 	      put_to_dir($lfile, $puturl, $optionsRef);
-
+	      
 	      # if( ! $d->put( -local=>$lfile, -url=> $puturl ) ) {
 	      #print "   ### FAILED to put: ". $d->message . '\n';
 	      # s}
 	    }
 	}
-
+	  
    }
 }

@@ -531,7 +525,7 @@ sub put_to_dir( $$;$ )
    }
 }

-# The HTTP DAV module often does a PROPFIND before it really PUTs. That
+# The HTTP DAV module often does a PROPFIND before it really PUTs. That 
 # is not neccessary if we know that the directory is really there.
 # Use this function in this case:
 sub putToDirLWP($$)
@@ -551,13 +545,13 @@ sub putToDirLWP($$)
    my $string = <FILE>;
    close FILE;

-    my $ua  = LWP::UserAgent->new( ssl_opts => { verify_hostname => 0 });
+    my $ua  = LWP::UserAgent->new();
    $ua->agent( "ownCloudTest_$localDir");
    my $req = PUT $puturl, Content_Type => 'application/octet-stream',
 		  Content => $string;
    $req->authorization_basic($user, $passwd);
    my $response = $ua->request($req);
-
+    
    if ($response->is_success()) {
      # print "OK: ", $response->content;
    } else {
@@ -585,7 +579,7 @@ sub getToFileLWP( $$ )
    my $geturl = testDirUrl() . $file;
    print "GETting $geturl to $localFile\n";

-    my $ua  = LWP::UserAgent->new( ssl_opts => { verify_hostname => 0 });
+    my $ua  = LWP::UserAgent->new();
    $ua->agent( "ownCloudTest_$localDir");
    $ua->credentials( server(), "foo", $user, $passwd);
    my $req = $ua->get($geturl, ":content_file" => $localFile);
@@ -600,15 +594,15 @@ sub getToFileLWP( $$ )
    }
 }

-sub createLocalFile( $$ )
+sub createLocalFile( $$ ) 
 {
  my ($fname, $size) = @_;
  $size = 1024 unless( $size );
-
+  
  my $md5 = Digest::MD5->new;

  open(FILE, ">", $fname) or die "Can't open $fname for writing ($!)";
-
+  
  my $minimum = 32;
  my $range = 96;

@@ -626,20 +620,20 @@ sub createLocalFile( $$ )
  print FILE $s;
  $md5->add($s);
  close FILE;
-  return $md5->hexdigest;
+  return $md5->hexdigest; 
 }

-sub md5OfFile( $ )
+sub md5OfFile( $ ) 
 {
  my ($file) = @_;
-
+  
  open FILE, "$file";

  my $ctx = Digest::MD5->new;
  $ctx->addfile (*FILE);
  my $hash = $ctx->hexdigest;
  close (FILE);
-
+  
  return $hash;
 }

@@ -653,27 +647,27 @@ sub moveRemoteFile($$;$)

  my $fromUrl = testDirUrl(). $from;
  my $toUrl = testDirUrl() . $to;
-
+  
  if( $no_testdir ) {
     $fromUrl = $from;
     $toUrl = $to;
  }
-
+  
  $d->move($fromUrl, $toUrl);
-
+  
 }

 sub printInfo($)
 {
  my ($info) = @_;
  my $tt = 6+length( $info );
-
+  
  print "#" x $tt;
  printf( "\n# %2d. %s", $infoCnt, $info );
  print "\n" unless $info =~ /\n$/;
  print "#" x $tt;
  print "\n";
-
+  
  $infoCnt++;
 }

@@ -724,15 +718,16 @@ sub createShare($$)
    my $re = $dd->mkcol( $url );
    if( $re == 0 ) {
 	print "Failed to create test dir $url\n";
+
    }

-    my $ua  = LWP::UserAgent->new(ssl_opts => { verify_hostname => 0 } );
+    my $ua  = LWP::UserAgent->new();
    $ua->agent( "ownCloudTest_sharing");
    # http://localhost/ocm/ocs/v1.php/apps/files_sharing/api/v1/shares
    my $puturl = $ocs_url . "apps/files_sharing/api/v1/shares";

    my $string = "path=$dir&shareType=0&shareWith=$user&publicUpload=false&permissions=$readWrite";
-    print ">>>>>>>>>> $puturl $string\n";
+    print ">>>>>>>>>> $string\n";

    my $req = POST $puturl, Content => $string;
    $req->authorization_basic($share_user, $share_passwd);
@@ -762,16 +757,17 @@ sub removeShare($$)
 		      -pass => $share_passwd );
    $dd->open( $owncloud);

-    my $ua  = LWP::UserAgent->new(ssl_opts => { verify_hostname => 0 });
+    my $ua  = LWP::UserAgent->new();
    $ua->agent( "ownCloudTest_sharing");
-
-    my $url = $ocs_url . "ocs/v1.php/apps/files_sharing/api/v1/shares/" . $shareId;
+    # http://localhost/ocm/ocs/v1.php/apps/files_sharing/api/v1/shares
+    my $url = $ocs_url . "apps/files_sharing/api/v1/shares/" . $shareId;

    my $req = DELETE $url;
    $req->authorization_basic($share_user, $share_passwd);
    my $response = $ua->request($req);

    if ($response->is_success()) {
+      # print "OK: ", $response->content;
 	print $response->decoded_content;
 	if( $response->decoded_content =~ /<status_code>(\d+)<\/status_code>/m) {
 	    my $code = $1;
@@ -787,12 +783,4 @@ sub removeShare($$)
    my $response = $ua->request($req);
 }

-sub assert($;$)
-{
-    unless( $_[0] ) {
-      print Carp::confess(@_);
-      exit(1);
-    }
-}
-
 #
@@ -1,8 +1,8 @@
  user   => "joe",
  passwd => "secret",
  url    => "http://localhost/ocm/remote.php/webdav/",
-  ld_libpath => "/home/joe/owncloud/mirall-install/lib",
-  csync => "/home/joe/owncloud/mirall-install/bin/owncloudcmd",
+  ld_libpath => "/home/joe/owncloud/csync/csync-build/modules",
+  csync => "/home/joe/owncloud/csync/csync-build/client/csync",
  ocs_url => "http://localhost/owncloud/ocs/v1.php/",
  share_user => "jenny",
  share_passwd => "also_secret"
@@ -23,6 +23,7 @@

 use lib ".";

+use Carp::Assert;
 use File::Copy;
 use ownCloud::Test;

@@ -122,24 +123,8 @@ assertLocalAndRemoteDir( '', 0);

 # The previous sync should have updated the etags, and this should NOT be a conflict
 printInfo( "Update the file again");
-
-my $f1 = localDir() . "remoteToLocal1/kernelcrash.txt";
-my $s1 = 2136;
-createLocalFile( $f1, $s1);
-
-# stat the file
-my @stat1 = stat $f1;
-print "Updating File $f1 to $s1, size is $stat1[7]\n";
-
-
-my $f2 = localDir() . "remoteToLocal1/kraft_logo.gif";
-my $s2 = 2332;
-
-createLocalFile( $f2, $s2);
-# stat the file
-my @stat2 = stat $f2;
-print "Updating File $f2 to $s2, size is $stat2[7]\n";
-
+createLocalFile( localDir() . "remoteToLocal1/kernelcrash.txt", 2136 );
+createLocalFile( localDir() . "remoteToLocal1/kraft_logo.gif", 2332 );
 system( "sleep 2 && touch " . localDir() . "remoteToLocal1/kernelcrash.txt" );
 csync( );
 assertLocalAndRemoteDir( '', 0);
@@ -185,19 +170,6 @@ assertLocalAndRemoteDir( '', 0);
 assert( -e localDir().'remoteToLocal1/rtlX' );
 assert( -e localDir().'remoteToLocal1/rtlX/rtl11/file.txt' );

-printInfo( "Remove a directory on the server with new files on the client");
-removeRemoteDir('remoteToLocal1/rtlX');
-system("echo hello > " . localDir(). "remoteToLocal1/rtlX/rtl11/hello.txt");
-csync();
-assertLocalAndRemoteDir( '', 0);
-# file.txt must be gone because the directory was removed on the server, but hello.txt must be there
-#   as it is a new file
-assert( ! -e localDir().'remoteToLocal1/rtlX/rtl11/file.txt' );
-assert( -e localDir().'remoteToLocal1/rtlX/rtl11/hello.txt' );
-
-
-
-
 # ==================================================================

 cleanup();
@@ -23,7 +23,7 @@

 use lib ".";

-
+use Carp::Assert;
 use File::Copy;
 use ownCloud::Test;

@@ -23,7 +23,7 @@

 use lib ".";

-
+use Carp::Assert;
 use File::Copy;
 use ownCloud::Test;

@@ -91,10 +91,7 @@ assertLocalAndRemoteDir( 'newdir', 0);
 assert( -e localDir().'newdir/rtl1/rtl11/newfile.dat' );
 assert( -e localDir().'newdir/rtl1/rtl11/myfile.txt' );
 assert( ! -e localDir().'newdir/rtl11/test.txt' );
-# BUG!  remoteToLocal1 is not deleted because changes were detected
-#       (even if the changed fileswere moved)
-# assert( ! -e localDir().'remoteToLocal1' );
-assert( ! -e localDir().'remoteToLocal1/rtl1' );
+assert( ! -e localDir().'remoteToLocal1' );

 printInfo("Move file and create another one with the same name.");
 move( localDir() . 'newdir/myfile.txt', localDir() . 'newdir/oldfile.txt' );
@@ -23,7 +23,7 @@

 use lib ".";

-
+use Carp::Assert;
 use File::Copy;
 use ownCloud::Test;

@@ -38,10 +38,6 @@ printInfo( "Copy some files to the remote location" );
 mkdir( localDir() . 'test_stat' );
 system( "echo foobar > " . localDir() . 'test_stat/file.txt' );

-mkdir( localDir() . 'test_ignored' );
-mkdir( localDir() . 'test_ignored/sub' );
-system( "echo foobarfoo > " . localDir() . 'test_ignored/sub/file.txt' );
-
 # call csync, sync local t1 to remote t1
 csync();

@@ -95,25 +91,15 @@ my $realMD5 = md5OfFile( '/tmp/kernelcrash.txt' );
 print "MD5 compare $localMD5 <-> $realMD5\n";
 assert( $localMD5 eq $realMD5 );

+
 printInfo("Added a file that is on the ignore list");
 # (*.directory is in the ignored list that needs cleanup)
 # (it is names with _conflict) because i want the conflicft detection of assertLocalAndRemoteDir to work
 system( "echo dir >> " . localDir() . 'test_stat/file_conflict.directory' );
-# this one should retain the directory
-system( "echo foobarfoo > " . localDir() . 'test_ignored/sub/ignored_conflict.part' );
 csync();
 # The file_conflict.directory is seen as a conflict
 assertLocalAndRemoteDir( '', 1 );
 # TODO: check that the file_conflict.directory is indeed NOT on the server
-# TODO: check that test_ignored/sub/ignored_conflict.part is NOT on the server
-assert(-e localDir() . 'test_ignored/sub/ignored_conflict.part');
-
-printInfo("Remove a directory containing an ignored file that should not be removed\n");
-remoteCleanup('test_ignored');
-csync();
-assert(-e localDir() . 'test_ignored/sub/ignored_conflict.part');
-#remove the file so next sync allow the directory to be removed
-system( "rm " . localDir() . 'test_ignored/sub/ignored_conflict.part' );

 printInfo("Remove a directory containing a local file\n");
 remoteCleanup('test_stat');
@@ -164,8 +150,6 @@ printInfo("Now remove the symlink\n");
 system( "rm -f " . localDir() . 'anotherdir' );
 csync();
 assertLocalAndRemoteDir( '', 0 );
-assert(! -e localDir(). 'anotherdir' );
-

 cleanup();

@@ -23,7 +23,7 @@

 use lib ".";

-
+use Carp::Assert;
 use File::Copy;
 use ownCloud::Test;

@@ -51,11 +51,6 @@ print "Created share with id <$shareId>\n";

 assert( $shareId > 0 );

-if( $ENV{SERVER_VERSION} eq "owncloud6" ) {
-  print "This test does not make more sense for ownCloud6, leaving for good!\n\n";
-  exit;
-} 
-
 # put a couple of files into the shared directory in the sharer account
 glob_put( 'sharing/*', $share_dir, $sharee);

@@ -67,6 +62,7 @@ moveRemoteFile( server() . $share_dir, localDir(), 1 );
 printInfo("Initial sync, sync stuff down.");
 csync();

+
 assertLocalAndRemoteDir( '', 0 );

 # Local file to a read/write share should be synced up
@@ -23,7 +23,7 @@

 use lib ".";

-
+use Carp::Assert;
 use File::Copy;
 use ownCloud::Test;

@@ -33,13 +33,11 @@ print "Hello, this is t6, a tester for csync with ownCloud.\n";

 initTesting();

-sub createPostUpdateScript($)
+sub createPostUpdateScript()
 {
-  my ($name) = @_;
-
-    my $srcFile = localDir().'BIG1.file';
+    my $srcFile = localDir()."BIG.file";
    my $cred = configValue("user") . ":" . configValue("passwd");
-    my $cmd = "curl -T $srcFile -u $cred --insecure " . testDirUrl().$name;
+    my $cmd = "curl -T $srcFile -u $cred " . testDirUrl();
    my $script = "/tmp/post_update_script.sh";
    open SC, ">$script" || die("Can not create script file");
    print SC "#!/bin/bash\n";
@@ -50,11 +48,11 @@ sub createPostUpdateScript($)
    return $script;
 }

-sub getETagFromJournal($$)
+sub getETagFromJournal($)
 {
-    my ($name,$num) = @_;
-
-    my $sql = "sqlite3 " . localDir() . ".csync_journal.db \"SELECT md5 FROM metadata WHERE path='$name';\"";
+    my ($num) = @_;
+    
+    my $sql = "sqlite3 " . localDir() . ".csync_journal.db \"SELECT md5 FROM metadata WHERE path='BIG.file';\"";
    open(my $fh, '-|', $sql) or die $!;
    my $etag  = <$fh>;
    close $fh;
@@ -63,14 +61,14 @@ sub getETagFromJournal($$)
    return $etag;
 }

-sub chunkFileTest( $$ )
+sub chunkFileTest( $$ ) 
 {
    my ($name, $size) = @_;

    # Big file chunking
    createLocalFile( localDir().$name, $size );
    assert( -e localDir().$name );
-
+    
    my $bigMd5 = md5OfFile( localDir().$name );

    csync();
@@ -91,39 +89,26 @@ sub chunkFileTest( $$ )
 }

 printInfo("Big file that needs chunking with default chunk size");
-chunkFileTest( "BIG1.file", 23251233 );
+chunkFileTest( "BIG.file", 23251233 );

 printInfo("Update the existing file and trigger reupload");
 # change the existing file again -> update
-chunkFileTest( "BIG2.file", 21762122 );
+chunkFileTest( "BIG.file", 21762122 );

 printInfo("Cause a precondition failed error");
 # Now overwrite the existing file to change it
-createLocalFile( localDir()."BIG3.file", 21832 );
-sleep(2);
-csync();
-createLocalFile( localDir().'BIG3.file', 34323 );
-sleep(2);
+createLocalFile( localDir()."BIG.file", 21832199 );
 # and create a post update script
-my $script = createPostUpdateScript('BIG3.file');
+my $script = createPostUpdateScript();
 $ENV{'OWNCLOUD_POST_UPDATE_SCRIPT'} = $script;

 # Save the etag before the sync
-my $firstETag = getETagFromJournal('BIG3.file', 'First');
-sleep(2);
-csync(); # Sync, which ends in a precondition failed error
+my $firstETag = getETagFromJournal('First');
+csync(); # Sync, which ends in a precondition failed error 
 # get the etag again. It has to be unchanged because of the error.
-my $secondETag = getETagFromJournal('BIG3.file', 'Second');
+my $secondETag = getETagFromJournal('Second');
+assert( $firstETag eq $secondETag, "Different ETags, no precondition error." );

-# Now the result is that there is a conflict file because since 1.7
-# the sync is stopped on preconditoin failed and done again.
-my $seen = 0;
-opendir(my $dh, localDir() );
-while(readdir $dh) {
-  $seen = 1 if ( /BIG3_conflict.*\.file/ );
-}
-closedir $dh;
-assert( $seen == 1, "No conflict file created on precondition failed!" );
 unlink($script);

 # Set a custom chunk size in environment.
@@ -23,7 +23,7 @@

 use lib ".";

-
+use Carp::Assert;
 use File::Copy;
 use ownCloud::Test;

@@ -176,6 +176,8 @@ system("sqlite3 " . localDir().'.csync_journal.db .dump');
 #new directory should be uploaded
 system("mv " . localDir().'readonlyDirectory_PERM_M_/subdir_PERM_CK_ ' . localDir().'normalDirectory_PERM_CKDNV_/subdir_PERM_CKDNV_'  );

+# two syncs may be necessary for now: https://github.com/owncloud/mirall/issues/2038
+csync();
 csync();
 system("sqlite3 " . localDir().'.csync_journal.db .dump');
 assertCsyncJournalOk(localDir());
@@ -207,6 +209,8 @@ system("mv " . localDir().'readonlyDirectory_PERM_M_/subdir_PERM_CK_ ' . localDi
 #2. move a directory from read to read only  (move the directory from previous step)
 system("mv " . localDir().'normalDirectory_PERM_CKDNV_/subdir_PERM_CKDNV_ ' . localDir().'readonlyDirectory_PERM_M_/moved_PERM_CK_'  );

+# two syncs may be necessary for now: https://github.com/owncloud/mirall/issues/2038
+csync();
 csync();
 assertCsyncJournalOk(localDir());

@@ -23,7 +23,7 @@

 use lib ".";

-
+use Carp::Assert;
 use File::Copy;
 use ownCloud::Test;

@@ -35,7 +35,7 @@ print "Hello, this is t8, a tester for syncing of files on a case sensitive FS\n
 # The test is run on a 'normal' file system, but we tell pwncloud that it is case preserving anyway
 $ENV{OWNCLOUD_TEST_CASE_PRESERVING} = "1";

-# No parallelism for more deterministic action.
+# FIXME!  the code does not work with parallelism
 $ENV{OWNCLOUD_MAX_PARALLEL}="1";

 initTesting();
@@ -48,7 +48,6 @@ mkdir($tmpdir);
 createLocalFile( $tmpdir . "HELLO.dat", 100 );
 createLocalFile( $tmpdir . "Hello.dat", 150 );
 createLocalFile( $tmpdir . "Normal.dat", 110 );
-createLocalFile( $tmpdir . "test.dat", 170 );

 #put them in some directories
 createRemoteDir( "dir" );
@@ -74,20 +73,14 @@ assertLocalAndRemoteDir( '', 0);

 printInfo( "Renaming one file to the same name as another one with different casing" );
 moveRemoteFile( 'dir/Hello.dat', 'dir/NORMAL.dat');
-moveRemoteFile( 'dir/test.dat', 'dir/TEST.dat');

 csync();

-# Hello -> NORMAL should not have do the move since the case conflict
+#It should not have do the move
 assert( -e localDir() . 'dir/Hello.dat' );
 assert( !-e localDir() . 'dir/NORMAL.dat' );
 assert( -e localDir() . 'dir/Normal.dat' );

-#test->TEST should have been worked.
-assert( -e localDir() . 'dir/TEST.dat' );
-assert( !-e localDir() . 'dir/test.dat' );
-
-
 printInfo( "Another directory with the same name but different casing is created" );

 createRemoteDir( "DIR" );
@@ -112,26 +105,6 @@ assert( !-e localDir() . 'dir' );

 # dir/NORMAL.dat is still on the server

-
-printInfo( "Attempt downloading two clashing files in parallel" );
-
-# Enable parallelism
-$ENV{OWNCLOUD_MAX_PARALLEL}="2";
-
-my $tmpdir2 = "/tmp/t8/parallel/";
-mkdir($tmpdir2);
-createLocalFile( $tmpdir2 . "FILE.dat", 23251233 );
-createLocalFile( $tmpdir2 . "file.dat",       33 );
-createRemoteDir( "parallel" );
-glob_put( "$tmpdir2/*", "parallel" );
-
-csync();
-
-# We assume the smaller file finished first, blocking
-# the second file from being saved.
-assert( !-e localDir() . 'parallel/FILE.dat' );
-assert( -e localDir() . 'parallel/file.dat' );
-
 cleanup();
 system("rm -r " . $tmpdir);

@@ -61,10 +61,9 @@ update check mechanism whereas the second method prevents any manual overrides.

 To prevent automatic updates, but allow manual overrides:

-1. Migrate to the following directory:
+1. Migrate to the following directory::

-    a. (32-bit) ``HKEY_LOCAL_MACHINE\Software\ownCloud\ownCloud``
-    b. (64-bit) ``HKEY_LOCAL_MACHINE\Software\Wow6432Node\ownCloud\ownCloud``
+	HKEY_LOCAL_MACHINE\Software\ownCloud\ownCloud

 2. Add the key ``skipUpdateCheck`` (of type DWORD).

@@ -8,9 +8,9 @@ major platforms. You should read this section if you want to develop for the
 desktop client.

 .. note:: Building instruction are subject to change as development proceeds.
-  Please check the version for which you want to build.
+  Please check the version for which you want to built.

-The instructions contained in this topic were updated to work with version 1.7 of the ownCloud Client.
+The instructions contained in this topic were updated to work with version 1.5 of the ownCloud Client.

 Linux
 -----
@@ -24,11 +24,6 @@ Linux

 3. Follow the `generic build instructions`_.

-4. (Optional) Call ``make install`` to install the client to the ``/usr/local/bin`` directory.
-
-.. note:: This step requires the ``mingw32-cross-nsis`` packages be installed on
-          Windows.
-
 Mac OS X
 --------

@@ -46,30 +41,17 @@ To set up your build enviroment for development using HomeBrew_:

 1. Add the ownCloud repository using the following command::

-    brew tap owncloud/owncloud
+  brew tap owncloud/owncloud

 2. Install any missing dependencies::

-    brew install $(brew deps mirall)
+  brew install $(brew deps mirall)

-3. Add Qt from brew to the path::
+To build mirall, follow the `generic build instructions`_.

-    export PATH=/usr/local/Cellar/qt5/5.x.y/bin/qmake
-
-   Where ``x.z`` is the current version of Qt 5 that brew has installed
-   on your machine.
-
-5. For compilation of mirall, follow the `generic build instructions`_.
-
-6. In the build directory, run ``admin/osx/create_mac.sh <build_dir>
-   <install_dir>``. If you have a developer signing certificate, you can specify
-   its Common Name as a third parameter (use quotes) to have the package
-   signed automatically.
-
-.. note:: Contrary to earlier versions, ownCloud 1.7 and later are packaged
-          as a ``pkg`` installer. Do not call "make package" at any time when
-          compiling for OS X, as this will build a disk image, and will not
-          work correctly.
+.. note:: Because the product from the mirall build is an app bundle, do not
+   call ``make install`` at any time.  Instead, call ``make package`` to create an
+   install-ready disk image.

 Windows (Cross-Compile)
 -----------------------
@@ -81,14 +63,15 @@ have it installed already.

 To cross-compile:

-1. Add the following repositories using YaST or ``zypper ar`` (adjust when using openSUSE 12.2 or 13.1)::
+1. Add the following repositories using YaST or ``zypper ar`` (adjust when using openSUSE 12.2 or 13.1):

-    zypper ar http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_13.1/windows:mingw:win32.repo
-    zypper ar http://download.opensuse.org/repositories/windows:/mingw/openSUSE_13.1/windows:mingw.repo
+  - ``zypper ar http://download.opensuse.org/repositories/windows:/mingw:/win32/openSUSE_13.1/windows:mingw:win32.repo``
+
+  - ``zypper ar http://download.opensuse.org/repositories/windows:/mingw/openSUSE_13.1/windows:mingw.repo``

 2. Install the cross-compiler packages and the cross-compiled dependencies::

-    zypper install cmake make mingw32-cross-binutils mingw32-cross-cpp mingw32-cross-gcc \
+  ``zypper install cmake make mingw32-cross-binutils mingw32-cross-cpp mingw32-cross-gcc \
                 mingw32-cross-gcc-c++ mingw32-cross-pkg-config mingw32-filesystem \
                 mingw32-headers mingw32-runtime site-config mingw32-libqt4-sql \
                 mingw32-libqt4-sql-sqlite mingw32-sqlite mingw32-libsqlite-devel \
@@ -99,44 +82,42 @@ To cross-compile:
                 mingw32-libpng-devel mingw32-libsqlite mingw32-qtkeychain \
                 mingw32-qtkeychain-devel mingw32-dlfcn mingw32-libintl-devel \
                 mingw32-libneon-devel mingw32-libopenssl-devel mingw32-libproxy-devel \
-                 mingw32-libxml2-devel mingw32-zlib-devel
+                 mingw32-libxml2-devel mingw32-zlib-devel``

 3. For the installer, install the NSIS installer package::

-    zypper install mingw32-cross-nsis
+  ``zypper install mingw32-cross-nsis``

 4. Install the following plugin::

-    mingw32-cross-nsis-plugin-processes mingw32-cross-nsis-plugin-uac
+    ``mingw32-cross-nsis-plugin-processes mingw32-cross-nsis-plugin-uac``

  .. note:: This plugin is typically required.  However, due to a current bug
     in ``mingw``, the plugins do not currently build properly from source.

 5. Manually download and install the following files using ``rpm -ivh <package>``:

-  .. note:: These files also work for more recent openSUSE versions!
+  ..note:: These files operate using openSUSE 12.2 and newer.

-  ::
+  - ``rpm -ihv http://download.tomahawk-player.org/packman/mingw:32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-processes-0-1.1.x86_64.rpm``

-    rpm -ivh http://download.tomahawk-player.org/packman/mingw:32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-processes-0-1.1.x86_64.rpm
-    rpm -ivh http://download.tomahawk-player.org/packman/mingw:32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-uac-0-3.1.x86_64.rpm
+  - ``rpm -ihv http://download.tomahawk-player.org/packman/mingw:32/openSUSE_12.1/x86_64/mingw32-cross-nsis-plugin-uac-0-3.1.x86_64.rpm``

 6. Follow the `generic build instructions`_

  .. note:: When building for Windows platforms, you must specify a special
     toolchain file that enables cmake to locate the platform-specific tools. To add
     this parameter to the call to cmake, enter
-     ``-DCMAKE_TOOLCHAIN_FILE=../mirall/admin/win/Toolchain-mingw32-openSUSE.cmake``.
+     ``DCMAKE_TOOLCHAIN_FILE=../mirall/admin/win/Toolchain-mingw32-openSUSE.cmake``.

 7. Build by running ``make``.

-  .. note:: Using ``make package`` produces an NSIS-based installer, provided
+  ..note:: Using ``make package`` produces an NSIS-based installer, provided
    the NSIS mingw32 packages are installed.

-.. _`generic build instructions`:
-
 Generic Build Instructions
 --------------------------
+.. _`generic build instructions`

 Compared to previous versions, building Mirall has become easier. Unlike
 earlier versions, CSync, which is the sync engine library of Mirall, is now
@@ -159,32 +140,33 @@ To build the most up to date version of the client:
  ``cd ../mirall-build``
  ``cmake -DCMAKE_BUILD_TYPE="Debug" ../mirall``

-  ..note:: You must use absolute paths for the ``include`` and ``library``
-           directories.
-
-  ..note:: On Mac OS X, you need to specify ``-DCMAKE_INSTALL_PREFIX=target``,
-           where ``target`` is a private location, i.e. in parallel to your build
-           dir by specifying ``../install``.
+  ..note:: You must use absolute pathes for the ``include`` and ``library`` directories.

 4. Call ``make``.

  The owncloud binary appear in the ``bin`` directory.

+5. (Optional) Call ``make install`` to install the client to the ``/usr/local/bin`` directory.
+
+6. (Optional) Call ``make package`` to build an installer/app bundle
+
+  ..note:: This step requires the ``mingw32-cross-nsis`` packages be installed on Windows.
+
 The following are known cmake parameters:

 * ``QTKEYCHAIN_LIBRARY=/path/to/qtkeychain.dylib -DQTKEYCHAIN_INCLUDE_DIR=/path/to/qtkeychain/``:
   Used for stored credentials.  When compiling with Qt5, the library is called ``qt5keychain.dylib.``
   You need to compile QtKeychain with the same Qt version.
-* ``WITH_DOC=TRUE``: Creates doc and manpages through running ``make``; also adds install statements,
-  providing the ability to install using ``make install``.
+* ``WITH_DOC=TRUE``: Creates doc and manpages through running ``make``; also
+* adds install statements, providing the ability to install using ``make
+* install``.
 * ``CMAKE_PREFIX_PATH=/path/to/Qt5.2.0/5.2.0/yourarch/lib/cmake/``: Builds using Qt5.
 * ``BUILD_WITH_QT4=ON``: Builds using Qt4 (even if Qt5 is found).
-* ``CMAKE_INSTALL_PREFIX=path``: Set an install prefix. This is mandatory on Mac OS

-.. _`ownCloud repository from OBS`: http://software.opensuse.org/download/package?project=isv:ownCloud:desktop&package=owncloud-client
+.. _`ownCloud repository from OBS`: http://software.opensuse.org/download/package?project=isv:ownCloud:devel&package=owncloud-client
 .. _CSync: http://www.csync.org
 .. _`Client Download Page`: http://owncloud.org/sync-clients/
 .. _Git: http://git-scm.com
 .. _MacPorts: http://www.macports.org
 .. _Homebrew: http://mxcl.github.com/homebrew/
-.. _QtKeychain: https://github.com/frankosterfeld/qtkeychain
+.. _QtKeychain https://github.com/frankosterfeld/qtkeychain
@@ -1,12 +1,12 @@
 The ownCloud Client reads a configuration file.  You can locate this configuration files as follows:

-On Linux distributions:
+- On Linux distributions:
        ``$HOME/.local/share/data/ownCloud/owncloud.cfg``

-On Microsoft Windows systems:
+- In Microsoft Windows systems:
        ``%LOCALAPPDATA%\ownCloud\owncloud.cfg``

-On MAC OS X systems:
+- In MAC OS X systems:
        ``$HOME/Library/Application Support/ownCloud``


@@ -29,24 +29,12 @@ the server URL.

 OPTIONS
 =======
-``--user``, ``-u`` ``[user]``
-       Use ``user`` as the login name.
+``--confdir`` `PATH`
+       Specifies the configuration directory where `csync.conf` is located.

-``--password``, ``-p`` ``[password]``
-       Use ``password`` as the password.
-
-``-n``
-       Use ``netrc (5)`` for login.
-
-``--non-interactive``
-       Do not prompt for questions.
-
-``--silent``, ``--s``
+``--silent``
       Inhibits verbose log output.

-``--trust``
-       Trust any SSL certificate, including invalid ones.
-
 ``--httpproxy  http://[user@pass:]<server>:<port>``
      Uses ``server`` as HTTP proxy.

@@ -60,8 +48,6 @@ the command line would be::
                $HOME/media/music \
                https://server/owncloud/remote.php/webdav/Music

-``owncloudcmd`` will enquire user name and password, unless they have
-been specified on the command line or ``-n`` (see `netrc(5)`) has been passed.

 Using the legacy scheme, it would be::

@@ -22,25 +22,13 @@ the server URL.

 Other comand line switches supported by owncloudcmd include the following:

-``--user``, ``-u`` ``[user]``
-       Use ``user`` as the login name.
+- ``--silent``
+      Supresses verbose log output.

-``--password``, ``-p`` ``[password]``
-       Use ``password`` as the password.
+- ``--confdir`` `PATH`
+      Fetches or stores configuration in the specified configuration directory.

-``-n``
-       Use ``netrc (5)`` for login.
-
-``--non-interactive``
-       Do not prompt for questions.
-
-``--silent``, ``-s``
-       Inhibits verbose log output.
-
-``--trust``
-       Trust any SSL certificate, including invalid ones.
-
-``--httpproxy  http://[user@pass:]<server>:<port>``
+- ``--httpproxy  http://[user@pass:]<server>:<port>``
      Uses the specified ``server`` as the HTTP proxy.

 Credential Handling
@@ -53,19 +41,18 @@ setting with the usual URL pattern.  For example::

  https://user:secret@192.168.178.2/remote.php/webdav

+
 Example
 ~~~~~~~

 To synchronize the ownCloud directory ``Music`` to the local directory
-``media/music``, through a proxy listening on port ``8080``, and on a gateway
+``media/music`, through a proxy listening on port ``8080``, and on a gateway
 machine using IP address ``192.168.178.1``, the command line would be::

  $ owncloudcmd --httpproxy http://192.168.178.1:8080 \
                $HOME/media/music \
                https://server/owncloud/remote.php/webdav/Music

-``owncloudcmd`` will enquire user name and password, unless they have
-been specified on the command line or ``-n`` has been passed.

 Using the legacy scheme, the command line would be::

@@ -3,7 +3,6 @@ Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@
 Name=@APPLICATION_NAME@ desktop sync client 
-Comment=@APPLICATION_NAME@ desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_EXECUTABLE@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;
@@ -2,10 +2,10 @@
 if(APPLE)
 add_custom_target( mac_overlayplugin ALL 
                   xcodebuild -workspace ${CMAKE_SOURCE_DIR}/shell_integration/MacOSX/OwnCloud.xcworkspace 
-                            -scheme SyncStateFinder.osax SYMROOT=${CMAKE_CURRENT_BINARY_DIR} archive
-                   COMMENT building Mac Overlay icons)
+                            -scheme OwnCloudFinder.osax SYMROOT=${CMAKE_CURRENT_BINARY_DIR} archive
+                   COMMENT building Mac Overlay iccons)

-INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Release/SyncStateFinder.osax/Contents
-         DESTINATION ${CMAKE_INSTALL_PREFIX}/Library/ScriptingAdditions/SyncStateFinder.osax/ )
+INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Release/OwnCloudFinder.osax/Contents
+         DESTINATION ${CMAKE_INSTALL_PREFIX}/Library/ScriptingAdditions/OwnCloudFinder.osax/ )
 endif(APPLE)

@@ -18,7 +18,6 @@
 {
 	NSMutableDictionary* _fileNamesCache;
 	BOOL _fileIconsEnabled;
-	BOOL _hasChangedContent;
 	
 	NSNumber *_icnOk;
 	NSNumber *_icnSync;
@@ -39,9 +38,6 @@
 - (void)setIcons:(NSDictionary*)iconDictionary filterByFolder:(NSString*)filterFolder;
 - (void)setResultForPath:(NSString*)path result:(NSString*)result;
 - (void)clearFileNameCacheForPath:(NSString*)path;
- (void)reFetchFileNameCacheForPath:(NSString*)path;
 - (void)repaintAllWindows;

- (void)loadIconResourcePath:(NSString*)path;
-
@end
@@ -31,7 +31,19 @@ static ContentManager* sharedInstance = nil;
 	{
 		_fileNamesCache = [[NSMutableDictionary alloc] init];
 		_fileIconsEnabled = TRUE;
-		_hasChangedContent = TRUE;
+
+		NSString *base = @"/Applications/owncloud.app/Contents/Resources/icons/";
+		
+		_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"]];
+		
+		NSLog(@"Icon ok identifier: %d", [_icnOk intValue]);
 	}

 	return self;
@@ -59,22 +71,6 @@ static ContentManager* sharedInstance = nil;
 	return sharedInstance;
 }

- (void)loadIconResourcePath:(NSString*)path
-{
-	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"]];
-
-	NSLog(@"Icon ok identifier: %d from %@", [_icnOk intValue], [base stringByAppendingString:@"ok.icns"]);
-}
-
 - (void)enableFileIcons:(BOOL)enable
 {
 	_fileIconsEnabled = enable;
@@ -84,10 +80,6 @@ static ContentManager* sharedInstance = nil;

 - (void)setResultForPath:(NSString*)path result:(NSString*)result
 {
-	if (_icnOk == nil) {
-		// no icon resource path registered yet
-		return;
-	}

 	NSNumber *res;
 	res = [NSNumber numberWithInt:0];
@@ -115,18 +107,14 @@ static ContentManager* sharedInstance = nil;
 	}
 	
 	NSString* normalizedPath = [path decomposedStringWithCanonicalMapping];
-
-    if (![_fileNamesCache objectForKey:normalizedPath] || ![[_fileNamesCache objectForKey:normalizedPath] isEqualTo:res]) {
-		[_fileNamesCache setObject:res forKey:normalizedPath];
-		//NSLog(@"SET value %d %@", [res intValue], normalizedPath);
-		_hasChangedContent = YES;
-		[self performSelector:@selector(repaintAllWindowsIfNeeded) withObject:0 afterDelay:1.0]; // 1 sec
-	}
+	[_fileNamesCache setObject:res forKey:normalizedPath];
+	// NSLog(@"SET value %d", [res intValue]);
+	
+	[self repaintAllWindows];
 }

 - (NSNumber*)iconByPath:(NSString*)path isDirectory:(BOOL)isDir
 {
-	//NSLog(@"%@ %@", NSStringFromSelector(_cmd), path);
 	if (!_fileIconsEnabled)
 	{
 		NSLog(@"Icons are NOT ENABLED!");
@@ -138,13 +126,9 @@ static ContentManager* sharedInstance = nil;
 		return res;
 	}
 	NSString* normalizedPath = [path decomposedStringWithCanonicalMapping];
-
-	if (![[RequestManager sharedInstance] isRegisteredPath:normalizedPath isDirectory:isDir]) {
-		return [NSNumber numberWithInt:0];
-	}
 	
 	NSNumber* result = [_fileNamesCache objectForKey:normalizedPath];
-	// NSLog(@"XXXXXXX Asking for icon for path %@ = %d",normalizedPath, [result intValue]);
+	// NSLog(@"XXXXXXX Asking for icon for path %@ = %d",path, [result intValue]);
 	
 	if( result == nil ) {
 		// start the async call
@@ -167,7 +151,6 @@ static ContentManager* sharedInstance = nil;
 // it clears the entries from the hash to make it call again home to mirall.
 - (void)clearFileNameCacheForPath:(NSString*)path
 {
-	NSLog(@"%@", NSStringFromSelector(_cmd));
 	NSMutableArray *keysToDelete = [NSMutableArray array];
 	
 	if( path != nil ) {
@@ -185,32 +168,14 @@ static ContentManager* sharedInstance = nil;
 	}
 	
 	if( [keysToDelete count] > 0 ) {
-		NSLog( @"Entries to delete: %lu", (unsigned long)[keysToDelete count]);
+		NSLog( @"Entries to delete: %d", [keysToDelete count]);
 		[_fileNamesCache removeObjectsForKeys:keysToDelete];
+	
+		[self repaintAllWindows];
+
 	}
 }

- (void)reFetchFileNameCacheForPath:(NSString*)path
-{
-	 NSLog(@"%@", NSStringFromSelector(_cmd));
-
-	for (id p in [_fileNamesCache keyEnumerator]) {
-		if ( path && [p hasPrefix:path] ) {
-			[[RequestManager sharedInstance] askForIcon:p isDirectory:false]; // FIXME isDirectory parameter
-			//[_fileNamesCache setObject:askState forKey:p]; We don't do this since we want to keep the old icon meanwhile
-			//NSLog(@"%@ %@", NSStringFromSelector(_cmd), p);
-		}
-	}
-
-	// Ask for directory itself
-	if ([path hasSuffix:@"/"]) {
-		path = [path substringToIndex:path.length - 1];
-	}
-	[[RequestManager sharedInstance] askForIcon:path isDirectory:true];
-	//NSLog(@"%@ %@", NSStringFromSelector(_cmd), path);
-}
-
-
 - (void)removeAllIcons
 {
 	[_fileNamesCache removeAllObjects];
@@ -230,20 +195,8 @@ static ContentManager* sharedInstance = nil;
 	[self repaintAllWindows];
 }

- (void)repaintAllWindowsIfNeeded
-{
-	if (!_hasChangedContent) {
-		//NSLog(@"%@ Repaint scheduled but not needed", NSStringFromSelector(_cmd));
-		return;
-	}
-
-	_hasChangedContent = NO;
-	[self repaintAllWindows];
-}
-
 - (void)repaintAllWindows
 {
-	NSLog(@"%@", NSStringFromSelector(_cmd));
 	NSArray* windows = [[NSApplication sharedApplication] windows];

 	for (int i = 0; i < [windows count]; i++)
@@ -333,7 +286,7 @@ static ContentManager* sharedInstance = nil;
 				}
 				else
 				{
-					NSLog(@"OwnCloudFinder: refreshing icon badges failed");
+					NSLog(@"LiferayNativityFinder: refreshing icon badges failed");

 					return;
 				}
@@ -344,7 +297,6 @@ static ContentManager* sharedInstance = nil;

 - (void)setIcons:(NSDictionary*)iconDictionary filterByFolder:(NSString*)filterFolder
 {
-	NSLog(@"%@", NSStringFromSelector(_cmd));
 	for (NSString* path in iconDictionary)
 	{
 		if (filterFolder && ![path hasPrefix:filterFolder])
@@ -1,24 +0,0 @@
-//
-//  FinishedIconCache.h
-//  OwnCloudFinder
-//
-//  Created by Markus Goetz on 01/10/14.
-//
-//
-
-#import <Foundation/Foundation.h>
-#import <Cocoa/Cocoa.h>
-
-@interface FinishedIconCache : NSObject {
-	NSCache *_cache;
-	long long _hits;
-	long long _misses;
-}
-
-+ (FinishedIconCache*)sharedInstance;
-
- (NSImage*)getIcon:(NSString*)fileName overlayIconIndex:(int)idx width:(float)w height:(float)h;
- (void)registerIcon:(NSImage*)icon withFileName:(NSString*)fileName overlayIconIndex:(int)idx width:(float)w height:(float)h;
-
-
-@end
@@ -1,91 +0,0 @@
-//
-//  FinishedIconCache.m
-//  OwnCloudFinder
-//
-//  Created by Markus Goetz on 01/10/14.
-//
-//
-
-#import "FinishedIconCache.h"
-
-
-@interface FinishedIconCacheItem : NSObject
-@property (nonatomic, strong) NSImage *icon;
-@property (nonatomic) NSTimeInterval maxAge;
-@end
-
-@implementation FinishedIconCacheItem
-@synthesize icon;
-@synthesize maxAge;
- (void)dealloc {
-	//NSLog(@"RELEASE %@ %@", self, self.icon);
-	if (self.icon) {
-		[self->icon release];
-	}
-	[super dealloc];
-}
-@end
-
-@implementation FinishedIconCache
-
-static FinishedIconCache* sharedInstance = nil;
-
- init
-{
-	self = [super init];
-	if (self)
-	{
-		_cache = [[NSCache alloc] init];
-		_cache.totalCostLimit = (2880 * 1800); // mbp15 screen size
-		_hits = 0;
-		_misses = 0;
-	}
-	return self;
-}
-
- (void)dealloc
-{
-	[_cache dealloc];
-	[super dealloc];
-}
-
-+ (FinishedIconCache*)sharedInstance
-{
-	@synchronized(self)
-	{
-		if (sharedInstance == nil)
-		{
-			sharedInstance = [[self alloc] init];
-		}
-	}
-	return sharedInstance;
-}
-
-
- (NSImage*)getIcon:(NSString*)fileName overlayIconIndex:(int)idx width:(float)w height:(float)h
-{
-	NSString *cacheKey = [NSString stringWithFormat:@"%@--%d--%f%f", fileName, idx, w,h];
-	FinishedIconCacheItem *item = [_cache objectForKey:cacheKey];
-	if (item) {
-		if (item.maxAge > [[NSDate date] timeIntervalSinceReferenceDate]) {
-			_hits++;
-			return item.icon;
-		}
-	}
-	_misses++;
-	return NULL;
-}
-
- (void)registerIcon:(NSImage*)icon withFileName:(NSString*)fileName overlayIconIndex:(int)idx width:(float)w height:(float)h
-{
-	NSString *cacheKey = [NSString stringWithFormat:@"%@--%d--%f%f", fileName, idx, w, h];
-	FinishedIconCacheItem *item = [[FinishedIconCacheItem alloc] init];
-	item.icon = icon;
-	// max age between 1 sec and 5 sec
-	item.maxAge = [[NSDate date] timeIntervalSinceReferenceDate] + 1.0 + 4.0*((double)arc4random() / 0x100000000);
-	[_cache setObject:item forKey:cacheKey cost:w*h];
-	[item release];
-	//NSLog(@"CACHE hit/miss ratio: %f", (float)_hits/(float)_misses);
-}
-
-@end
@@ -3,77 +3,25 @@
 //  
 //  This class is in the public domain.
 //  Originally created by Robbie Hanson in Q3 2010.
-//  Updated and maintained by Deusty LLC and the Apple development community.
+//  Updated and maintained by Deusty LLC and the Mac development community.
 //  
-//  https://github.com/robbiehanson/CocoaAsyncSocket
+//  http://code.google.com/p/cocoaasyncsocket/
 //

 #import <Foundation/Foundation.h>
 #import <Security/Security.h>
-#import <Security/SecureTransport.h>
 #import <dispatch/dispatch.h>

@class GCDAsyncReadPacket;
@class GCDAsyncWritePacket;
-@class GCDAsyncSocketPreBuffer;
-
-#if TARGET_OS_IPHONE
-
-  // Compiling for iOS
-
-  #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 50000 // iOS 5.0 supported
-  
-    #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 50000 // iOS 5.0 supported and required
-
-      #define IS_SECURE_TRANSPORT_AVAILABLE      YES
-      #define SECURE_TRANSPORT_MAYBE_AVAILABLE   1
-      #define SECURE_TRANSPORT_MAYBE_UNAVAILABLE 0
-
-    #else                                         // iOS 5.0 supported but not required
-
-      #ifndef NSFoundationVersionNumber_iPhoneOS_5_0
-        #define NSFoundationVersionNumber_iPhoneOS_5_0 881.00
-      #endif
-
-      #define IS_SECURE_TRANSPORT_AVAILABLE     (NSFoundationVersionNumber >= NSFoundationVersionNumber_iPhoneOS_5_0)
-      #define SECURE_TRANSPORT_MAYBE_AVAILABLE   1
-      #define SECURE_TRANSPORT_MAYBE_UNAVAILABLE 1
-
-    #endif
-
-  #else                                        // iOS 5.0 not supported
-
-    #define IS_SECURE_TRANSPORT_AVAILABLE      NO
-    #define SECURE_TRANSPORT_MAYBE_AVAILABLE   0
-    #define SECURE_TRANSPORT_MAYBE_UNAVAILABLE 1
-
-  #endif
-
-#else
-
-  // Compiling for Mac OS X
-
-  #define IS_SECURE_TRANSPORT_AVAILABLE      YES
-  #define SECURE_TRANSPORT_MAYBE_AVAILABLE   1
-  #define SECURE_TRANSPORT_MAYBE_UNAVAILABLE 0
-
-#endif

 extern NSString *const GCDAsyncSocketException;
 extern NSString *const GCDAsyncSocketErrorDomain;

-extern NSString *const GCDAsyncSocketQueueName;
-extern NSString *const GCDAsyncSocketThreadName;
-
-#if SECURE_TRANSPORT_MAYBE_AVAILABLE
+#if !TARGET_OS_IPHONE
 extern NSString *const GCDAsyncSocketSSLCipherSuites;
-#if TARGET_OS_IPHONE
-extern NSString *const GCDAsyncSocketSSLProtocolVersionMin;
-extern NSString *const GCDAsyncSocketSSLProtocolVersionMax;
-#else
 extern NSString *const GCDAsyncSocketSSLDiffieHellmanParameters;
 #endif
-#endif

 enum GCDAsyncSocketError
 {
@@ -94,6 +42,51 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

@interface GCDAsyncSocket : NSObject
+{
+	uint32_t flags;
+	uint16_t config;
+	
+	id delegate;
+	dispatch_queue_t delegateQueue;
+	
+	int socket4FD;
+	int socket6FD;
+	int connectIndex;
+	NSData * connectInterface4;
+	NSData * connectInterface6;
+	
+	dispatch_queue_t socketQueue;
+	
+	dispatch_source_t accept4Source;
+	dispatch_source_t accept6Source;
+	dispatch_source_t connectTimer;
+	dispatch_source_t readSource;
+	dispatch_source_t writeSource;
+	dispatch_source_t readTimer;
+	dispatch_source_t writeTimer;
+	
+	NSMutableArray *readQueue;
+	NSMutableArray *writeQueue;
+	
+	GCDAsyncReadPacket *currentRead;
+	GCDAsyncWritePacket *currentWrite;
+	
+	unsigned long socketFDBytesAvailable;
+	
+	NSMutableData *partialReadBuffer;
+		
+#if TARGET_OS_IPHONE
+	CFStreamClientContext streamContext;
+	CFReadStreamRef readStream;
+	CFWriteStreamRef writeStream;
+#else
+	SSLContextRef sslContext;
+	NSMutableData *sslReadBuffer;
+	size_t sslWriteCachedLength;
+#endif
+	
+	id userData;
+}

 /**
 * GCDAsyncSocket uses the standard delegate paradigm,
@@ -106,8 +99,6 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
 * The socket queue is optional.
 * If you pass NULL, GCDAsyncSocket will automatically create it's own socket queue.
 * If you choose to provide a socket queue, the socket queue must not be a concurrent queue.
- * If you choose to provide a socket queue, and the socket queue has a configured target queue,
- * then please see the discussion for the method markSocketQueueTargetQueue.
 * 
 * The delegate queue and socket queue can optionally be the same.
 **/
@@ -130,6 +121,39 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
 - (void)setDelegate:(id)delegate delegateQueue:(dispatch_queue_t)delegateQueue;
 - (void)synchronouslySetDelegate:(id)delegate delegateQueue:(dispatch_queue_t)delegateQueue;

+/**
+ * Traditionally sockets are not closed until the conversation is over.
+ * However, it is technically possible for the remote enpoint to close its write stream.
+ * Our socket would then be notified that there is no more data to be read,
+ * but our socket would still be writeable and the remote endpoint could continue to receive our data.
+ * 
+ * The argument for this confusing functionality stems from the idea that a client could shut down its
+ * write stream after sending a request to the server, thus notifying the server there are to be no further requests.
+ * In practice, however, this technique did little to help server developers.
+ * 
+ * To make matters worse, from a TCP perspective there is no way to tell the difference from a read stream close
+ * and a full socket close. They both result in the TCP stack receiving a FIN packet. The only way to tell
+ * is by continuing to write to the socket. If it was only a read stream close, then writes will continue to work.
+ * Otherwise an error will be occur shortly (when the remote end sends us a RST packet).
+ * 
+ * In addition to the technical challenges and confusion, many high level socket/stream API's provide
+ * no support for dealing with the problem. If the read stream is closed, the API immediately declares the
+ * socket to be closed, and shuts down the write stream as well. In fact, this is what Apple's CFStream API does.
+ * It might sound like poor design at first, but in fact it simplifies development.
+ * 
+ * The vast majority of the time if the read stream is closed it's because the remote endpoint closed its socket.
+ * Thus it actually makes sense to close the socket at this point.
+ * And in fact this is what most networking developers want and expect to happen.
+ * However, if you are writing a server that interacts with a plethora of clients,
+ * you might encounter a client that uses the discouraged technique of shutting down its write stream.
+ * If this is the case, you can set this property to NO,
+ * and make use of the socketDidCloseReadStream delegate method.
+ * 
+ * The default value is YES.
+**/
+- (BOOL)autoDisconnectOnClosedReadStream;
+- (void)setAutoDisconnectOnClosedReadStream:(BOOL)flag;
+
 /**
 * By default, both IPv4 and IPv6 are enabled.
 * 
@@ -187,15 +211,6 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
 **/
 - (BOOL)acceptOnInterface:(NSString *)interface port:(uint16_t)port error:(NSError **)errPtr;

-/**
- * Tells the socket to begin listening and accepting connections on the unix domain at the given url.
- * When a connection is accepted, a new instance of GCDAsyncSocket will be spawned to handle it,
- * and the socket:didAcceptNewSocket: delegate method will be invoked.
- *
- * The socket will listen on all available interfaces (e.g. wifi, ethernet, etc)
- **/
- (BOOL)acceptOnUrl:(NSURL *)url error:(NSError **)errPtr;
-
 #pragma mark Connecting

 /**
@@ -311,10 +326,6 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
            viaInterface:(NSString *)interface
             withTimeout:(NSTimeInterval)timeout
                   error:(NSError **)errPtr;
-/**
- * Connects to the unix domain socket at the given url, using the specified timeout.
- */
- (BOOL)connectToUrl:(NSURL *)url withTimeout:(NSTimeInterval)timeout error:(NSError **)errPtr;

 #pragma mark Disconnecting

@@ -378,7 +389,6 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
 **/
 - (NSString *)connectedHost;
 - (uint16_t)connectedPort;
- (NSURL *)connectedUrl;

 - (NSString *)localHost;
 - (uint16_t)localPort;
@@ -636,12 +646,6 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
             maxLength:(NSUInteger)length
                   tag:(long)tag;

-/**
- * Returns progress of the current read, from 0.0 to 1.0, or NaN if no current read (use isnan() to check).
- * The parameters "tag", "done" and "total" will be filled in if they aren't NULL.
-**/
- (float)progressOfReadReturningTag:(long *)tagPtr bytesDone:(NSUInteger *)donePtr total:(NSUInteger *)totalPtr;
-
 #pragma mark Writing

 /**
@@ -663,12 +667,6 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
 **/
 - (void)writeData:(NSData *)data withTimeout:(NSTimeInterval)timeout tag:(long)tag;

-/**
- * Returns progress of the current write, from 0.0 to 1.0, or NaN if no current write (use isnan() to check).
- * The parameters "tag", "done" and "total" will be filled in if they aren't NULL.
-**/
- (float)progressOfWriteReturningTag:(long *)tagPtr bytesDone:(NSUInteger *)donePtr total:(NSUInteger *)totalPtr;
-
 #pragma mark Security

 /**
@@ -680,8 +678,7 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
 * Any reads or writes scheduled after this method is called will occur over the secured connection.
 * 
 * The possible keys and values for the TLS settings are well documented.
- * Standard keys are:
- * 
+ * Some possible keys are:
 * - kCFStreamSSLLevel
 * - kCFStreamSSLAllowsExpiredCertificates
 * - kCFStreamSSLAllowsExpiredRoots
@@ -691,18 +688,6 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
 * - kCFStreamSSLCertificates
 * - kCFStreamSSLIsServer
 * 
- * If SecureTransport is available on iOS:
- * 
- * - GCDAsyncSocketSSLCipherSuites
- * - GCDAsyncSocketSSLProtocolVersionMin
- * - GCDAsyncSocketSSLProtocolVersionMax
- * 
- * If SecureTransport is available on Mac OS X:
- * 
- * - GCDAsyncSocketSSLCipherSuites
- * - GCDAsyncSocketSSLDiffieHellmanParameters;
- * 
- * 
 * Please refer to Apple's documentation for associated values, as well as other possible keys.
 * 
 * If you pass in nil or an empty dictionary, the default settings will be used.
@@ -727,114 +712,6 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;

 #pragma mark Advanced

-/**
- * Traditionally sockets are not closed until the conversation is over.
- * However, it is technically possible for the remote enpoint to close its write stream.
- * Our socket would then be notified that there is no more data to be read,
- * but our socket would still be writeable and the remote endpoint could continue to receive our data.
- * 
- * The argument for this confusing functionality stems from the idea that a client could shut down its
- * write stream after sending a request to the server, thus notifying the server there are to be no further requests.
- * In practice, however, this technique did little to help server developers.
- * 
- * To make matters worse, from a TCP perspective there is no way to tell the difference from a read stream close
- * and a full socket close. They both result in the TCP stack receiving a FIN packet. The only way to tell
- * is by continuing to write to the socket. If it was only a read stream close, then writes will continue to work.
- * Otherwise an error will be occur shortly (when the remote end sends us a RST packet).
- * 
- * In addition to the technical challenges and confusion, many high level socket/stream API's provide
- * no support for dealing with the problem. If the read stream is closed, the API immediately declares the
- * socket to be closed, and shuts down the write stream as well. In fact, this is what Apple's CFStream API does.
- * It might sound like poor design at first, but in fact it simplifies development.
- * 
- * The vast majority of the time if the read stream is closed it's because the remote endpoint closed its socket.
- * Thus it actually makes sense to close the socket at this point.
- * And in fact this is what most networking developers want and expect to happen.
- * However, if you are writing a server that interacts with a plethora of clients,
- * you might encounter a client that uses the discouraged technique of shutting down its write stream.
- * If this is the case, you can set this property to NO,
- * and make use of the socketDidCloseReadStream delegate method.
- * 
- * The default value is YES.
-**/
- (BOOL)autoDisconnectOnClosedReadStream;
- (void)setAutoDisconnectOnClosedReadStream:(BOOL)flag;
-
-/**
- * GCDAsyncSocket maintains thread safety by using an internal serial dispatch_queue.
- * In most cases, the instance creates this queue itself.
- * However, to allow for maximum flexibility, the internal queue may be passed in the init method.
- * This allows for some advanced options such as controlling socket priority via target queues.
- * However, when one begins to use target queues like this, they open the door to some specific deadlock issues.
- * 
- * For example, imagine there are 2 queues:
- * dispatch_queue_t socketQueue;
- * dispatch_queue_t socketTargetQueue;
- * 
- * If you do this (pseudo-code):
- * socketQueue.targetQueue = socketTargetQueue;
- * 
- * Then all socketQueue operations will actually get run on the given socketTargetQueue.
- * This is fine and works great in most situations.
- * But if you run code directly from within the socketTargetQueue that accesses the socket,
- * you could potentially get deadlock. Imagine the following code:
- * 
- * - (BOOL)socketHasSomething
- * {
- *     __block BOOL result = NO;
- *     dispatch_block_t block = ^{
- *         result = [self someInternalMethodToBeRunOnlyOnSocketQueue];
- *     }
- *     if (is_executing_on_queue(socketQueue))
- *         block();
- *     else
- *         dispatch_sync(socketQueue, block);
- *     
- *     return result;
- * }
- * 
- * What happens if you call this method from the socketTargetQueue? The result is deadlock.
- * This is because the GCD API offers no mechanism to discover a queue's targetQueue.
- * Thus we have no idea if our socketQueue is configured with a targetQueue.
- * If we had this information, we could easily avoid deadlock.
- * But, since these API's are missing or unfeasible, you'll have to explicitly set it.
- * 
- * IF you pass a socketQueue via the init method,
- * AND you've configured the passed socketQueue with a targetQueue,
- * THEN you should pass the end queue in the target hierarchy.
- * 
- * For example, consider the following queue hierarchy:
- * socketQueue -> ipQueue -> moduleQueue
- *
- * This example demonstrates priority shaping within some server.
- * All incoming client connections from the same IP address are executed on the same target queue.
- * And all connections for a particular module are executed on the same target queue.
- * Thus, the priority of all networking for the entire module can be changed on the fly.
- * Additionally, networking traffic from a single IP cannot monopolize the module.
- * 
- * Here's how you would accomplish something like that:
- * - (dispatch_queue_t)newSocketQueueForConnectionFromAddress:(NSData *)address onSocket:(GCDAsyncSocket *)sock
- * {
- *     dispatch_queue_t socketQueue = dispatch_queue_create("", NULL);
- *     dispatch_queue_t ipQueue = [self ipQueueForAddress:address];
- *     
- *     dispatch_set_target_queue(socketQueue, ipQueue);
- *     dispatch_set_target_queue(iqQueue, moduleQueue);
- *     
- *     return socketQueue;
- * }
- * - (void)socket:(GCDAsyncSocket *)sock didAcceptNewSocket:(GCDAsyncSocket *)newSocket
- * {
- *     [clientConnections addObject:newSocket];
- *     [newSocket markSocketQueueTargetQueue:moduleQueue];
- * }
- * 
- * Note: This workaround is ONLY needed if you intend to execute code directly on the ipQueue or moduleQueue.
- * This is often NOT the case, as such queues are used solely for execution shaping.
-**/
- (void)markSocketQueueTargetQueue:(dispatch_queue_t)socketQueuesPreConfiguredTargetQueue;
- (void)unmarkSocketQueueTargetQueue:(dispatch_queue_t)socketQueuesPreviouslyConfiguredTargetQueue;
-
 /**
 * It's not thread-safe to access certain variables from outside the socket's internal queue.
 * 
@@ -928,9 +805,7 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
 **/
 - (BOOL)enableBackgroundingOnSocket;

-#endif
-
-#if SECURE_TRANSPORT_MAYBE_AVAILABLE
+#else

 /**
 * This method is only available from within the context of a performBlock: invocation.
@@ -1006,12 +881,6 @@ typedef enum GCDAsyncSocketError GCDAsyncSocketError;
 **/
 - (void)socket:(GCDAsyncSocket *)sock didConnectToHost:(NSString *)host port:(uint16_t)port;

-/**
- * Called when a socket connects and is ready for reading and writing.
- * The host parameter will be an IP address, not a DNS name.
- **/
- (void)socket:(GCDAsyncSocket *)sock didConnectToUrl:(NSURL *)url;
-
 /**
 * Called when a socket has completed reading the requested data into memory.
 * Not called if there is an error.
@@ -71,7 +71,6 @@ static IconCache* sharedInstance = nil;

 	if (image == nil)
 	{
-		NSLog(@"%@ Could not load %@", NSStringFromSelector(_cmd), path);
 		return [NSNumber numberWithInt:-1];
 	}

@@ -15,7 +15,6 @@
 #import <objc/runtime.h>
 #import "ContentManager.h"
 #import "IconCache.h"
-#import "FinishedIconCache.h"
 #import "IconOverlayHandlers.h"
 #import "Finder/Finder.h"

@@ -35,7 +34,7 @@

 	NSNumber* imageIndex = [[ContentManager sharedInstance] iconByPath:[url path] isDirectory:isDir];

-	//NSLog(@"1 The icon index is %d", [imageIndex intValue]);
+	NSLog(@"1 The icon index is %d", [imageIndex intValue]);
 	if ([imageIndex intValue] > 0)
 	{
 		NSImage* image = [[IconCache sharedInstance] getIcon:imageIndex];
@@ -70,6 +69,7 @@

 	NSURL* url = [node previewItemURL];

+	NSError *error;
 	BOOL isDir;
 	if ([[NSFileManager defaultManager] fileExistsAtPath:[url path] isDirectory:&isDir] == NO) {
 		NSLog(@"ERROR: Could not determine file type of %@", [url path]);
@@ -77,32 +77,21 @@
 	}

 	NSNumber* imageIndex = [[ContentManager sharedInstance] iconByPath:[url path] isDirectory:isDir];
-	//NSLog(@"2 The icon index is %d %@ %@", [imageIndex intValue], [url path], isDir ? @"isDir" : @"");
+	// NSLog(@"2 The icon index is %d", [imageIndex intValue]);

 	if ([imageIndex intValue] > 0)
 	{
 		NSImage* icon = [arg1 _nsImage];

-		// Use the short term icon cache that possibly has the finished icon
-		FinishedIconCache *finishedIconCache = [FinishedIconCache sharedInstance];
-		NSImage *finishedImage = [finishedIconCache getIcon:[url path] overlayIconIndex:imageIndex width:[icon size].width height:[icon size].height];
-		if (finishedImage) {
-			//NSLog(@"X Got finished image from cache %@ %@", finishedImage, [url path]);
-			return [[[IKImageWrapper alloc] initWithNSImage:finishedImage] autorelease];;
-		} else {
-			//NSLog(@"X Need to redraw %@", [url path]);
-		}
+		[icon lockFocus];
+
+		CGContextRef myContext = [[NSGraphicsContext currentContext] graphicsPort];

 		NSImage* iconimage = [[IconCache sharedInstance] getIcon:[NSNumber numberWithInt:[imageIndex intValue]]];

 		if (iconimage != nil)
 		{
-			[icon lockFocus];
-
-			CGContextRef myContext = [[NSGraphicsContext currentContext] graphicsPort];
-
 			CGRect destRect = CGRectMake(0, 0, [icon size].width, [icon size].height);
-
 			CGImageRef cgImage = [iconimage CGImageForProposedRect:&destRect
 														   context:[NSGraphicsContext currentContext]
 															 hints:nil];
@@ -114,11 +103,9 @@
 				NSLog(@"No image given!!!!!11 %@", [url path]);
 			}

-			[icon unlockFocus];
 		}

-		// Insert into cache
-		[finishedIconCache registerIcon:icon withFileName:[url path] overlayIconIndex:imageIndex width:[icon size].width height:[icon size].height];
+		[icon unlockFocus];

 		return [[[IKImageWrapper alloc] initWithNSImage:icon] autorelease];
 	}
@@ -158,7 +145,7 @@
 		}
 		
 		NSNumber* imageIndex = [[ContentManager sharedInstance] iconByPath:[url path] isDirectory:isDir];
-		//NSLog(@"3 The icon index is %d", [imageIndex intValue]);
+		NSLog(@"3 The icon index is %d", [imageIndex intValue]);

 		if ([imageIndex intValue] > 0)
 		{
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleSignature</key>
-	<string>OWNC</string>
+	<string>NVTY</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>CFPlugInDynamicRegisterFunction</key>
@@ -0,0 +1,251 @@
+//
+//  JSONKit.h
+//  http://github.com/johnezang/JSONKit
+//  Dual licensed under either the terms of the BSD License, or alternatively
+//  under the terms of the Apache License, Version 2.0, as specified below.
+//
+
+/*
+ Copyright (c) 2011, John Engelhart
+ 
+ All rights reserved.
+ 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ 
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 
+ * Neither the name of the Zang Industries nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+ 
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/*
+ Copyright 2011 John Engelhart
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+#include <stddef.h>
+#include <stdint.h>
+#include <limits.h>
+#include <TargetConditionals.h>
+#include <AvailabilityMacros.h>
+
+#ifdef    __OBJC__
+#import <Foundation/NSArray.h>
+#import <Foundation/NSData.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSError.h>
+#import <Foundation/NSObjCRuntime.h>
+#import <Foundation/NSString.h>
+#endif // __OBJC__
+ 
+#ifdef __cplusplus
+extern "C" {
+#endif
+  
+
+// For Mac OS X < 10.5.
+#ifndef   NSINTEGER_DEFINED
+#define   NSINTEGER_DEFINED
+#if       defined(__LP64__) || defined(NS_BUILD_32_LIKE_64)
+typedef long           NSInteger;
+typedef unsigned long  NSUInteger;
+#define NSIntegerMin   LONG_MIN
+#define NSIntegerMax   LONG_MAX
+#define NSUIntegerMax  ULONG_MAX
+#else  // defined(__LP64__) || defined(NS_BUILD_32_LIKE_64)
+typedef int            NSInteger;
+typedef unsigned int   NSUInteger;
+#define NSIntegerMin   INT_MIN
+#define NSIntegerMax   INT_MAX
+#define NSUIntegerMax  UINT_MAX
+#endif // defined(__LP64__) || defined(NS_BUILD_32_LIKE_64)
+#endif // NSINTEGER_DEFINED
+
+
+#ifndef _JSONKIT_H_
+#define _JSONKIT_H_
+
+#if defined(__GNUC__) && (__GNUC__ >= 4) && defined(__APPLE_CC__) && (__APPLE_CC__ >= 5465)
+#define JK_DEPRECATED_ATTRIBUTE __attribute__((deprecated))
+#else
+#define JK_DEPRECATED_ATTRIBUTE
+#endif
+  
+#define JSONKIT_VERSION_MAJOR 1
+#define JSONKIT_VERSION_MINOR 4
+
+typedef NSUInteger JKFlags;
+
+/*
+  JKParseOptionComments        : Allow C style // and /_* ... *_/ (without a _, obviously) comments in JSON.
+  JKParseOptionUnicodeNewlines : Allow Unicode recommended (?:\r\n|[\n\v\f\r\x85\p{Zl}\p{Zp}]) newlines.
+  JKParseOptionLooseUnicode    : Normally the decoder will stop with an error at any malformed Unicode.
+                                 This option allows JSON with malformed Unicode to be parsed without reporting an error.
+                                 Any malformed Unicode is replaced with \uFFFD, or "REPLACEMENT CHARACTER".
+ */
+
+enum {
+  JKParseOptionNone                     = 0,
+  JKParseOptionStrict                   = 0,
+  JKParseOptionComments                 = (1 << 0),
+  JKParseOptionUnicodeNewlines          = (1 << 1),
+  JKParseOptionLooseUnicode             = (1 << 2),
+  JKParseOptionPermitTextAfterValidJSON = (1 << 3),
+  JKParseOptionValidFlags               = (JKParseOptionComments | JKParseOptionUnicodeNewlines | JKParseOptionLooseUnicode | JKParseOptionPermitTextAfterValidJSON),
+};
+typedef JKFlags JKParseOptionFlags;
+
+enum {
+  JKSerializeOptionNone                 = 0,
+  JKSerializeOptionPretty               = (1 << 0),
+  JKSerializeOptionEscapeUnicode        = (1 << 1),
+  JKSerializeOptionEscapeForwardSlashes = (1 << 4),
+  JKSerializeOptionValidFlags           = (JKSerializeOptionPretty | JKSerializeOptionEscapeUnicode | JKSerializeOptionEscapeForwardSlashes),
+};
+typedef JKFlags JKSerializeOptionFlags;
+
+#ifdef    __OBJC__
+
+typedef struct JKParseState JKParseState; // Opaque internal, private type.
+
+// As a general rule of thumb, if you use a method that doesn't accept a JKParseOptionFlags argument, it defaults to JKParseOptionStrict
+
+@interface JSONDecoder : NSObject {
+  JKParseState *parseState;
+}
+ (id)decoder;
+ (id)decoderWithParseOptions:(JKParseOptionFlags)parseOptionFlags;
+- (id)initWithParseOptions:(JKParseOptionFlags)parseOptionFlags;
+- (void)clearCache;
+
+// The parse... methods were deprecated in v1.4 in favor of the v1.4 objectWith... methods.
+- (id)parseUTF8String:(const unsigned char *)string length:(size_t)length                         JK_DEPRECATED_ATTRIBUTE; // Deprecated in JSONKit v1.4.  Use objectWithUTF8String:length:        instead.
+- (id)parseUTF8String:(const unsigned char *)string length:(size_t)length error:(NSError **)error JK_DEPRECATED_ATTRIBUTE; // Deprecated in JSONKit v1.4.  Use objectWithUTF8String:length:error:  instead.
+// The NSData MUST be UTF8 encoded JSON.
+- (id)parseJSONData:(NSData *)jsonData                                                            JK_DEPRECATED_ATTRIBUTE; // Deprecated in JSONKit v1.4.  Use objectWithData:                     instead.
+- (id)parseJSONData:(NSData *)jsonData error:(NSError **)error                                    JK_DEPRECATED_ATTRIBUTE; // Deprecated in JSONKit v1.4.  Use objectWithData:error:               instead.
+
+// Methods that return immutable collection objects.
+- (id)objectWithUTF8String:(const unsigned char *)string length:(NSUInteger)length;
+- (id)objectWithUTF8String:(const unsigned char *)string length:(NSUInteger)length error:(NSError **)error;
+// The NSData MUST be UTF8 encoded JSON.
+- (id)objectWithData:(NSData *)jsonData;
+- (id)objectWithData:(NSData *)jsonData error:(NSError **)error;
+
+// Methods that return mutable collection objects.
+- (id)mutableObjectWithUTF8String:(const unsigned char *)string length:(NSUInteger)length;
+- (id)mutableObjectWithUTF8String:(const unsigned char *)string length:(NSUInteger)length error:(NSError **)error;
+// The NSData MUST be UTF8 encoded JSON.
+- (id)mutableObjectWithData:(NSData *)jsonData;
+- (id)mutableObjectWithData:(NSData *)jsonData error:(NSError **)error;
+
+@end
+
+////////////
+#pragma mark Deserializing methods
+////////////
+
+@interface NSString (JSONKitDeserializing)
+- (id)objectFromJSONString;
+- (id)objectFromJSONStringWithParseOptions:(JKParseOptionFlags)parseOptionFlags;
+- (id)objectFromJSONStringWithParseOptions:(JKParseOptionFlags)parseOptionFlags error:(NSError **)error;
+- (id)mutableObjectFromJSONString;
+- (id)mutableObjectFromJSONStringWithParseOptions:(JKParseOptionFlags)parseOptionFlags;
+- (id)mutableObjectFromJSONStringWithParseOptions:(JKParseOptionFlags)parseOptionFlags error:(NSError **)error;
+@end
+
+@interface NSData (JSONKitDeserializing)
+// The NSData MUST be UTF8 encoded JSON.
+- (id)objectFromJSONData;
+- (id)objectFromJSONDataWithParseOptions:(JKParseOptionFlags)parseOptionFlags;
+- (id)objectFromJSONDataWithParseOptions:(JKParseOptionFlags)parseOptionFlags error:(NSError **)error;
+- (id)mutableObjectFromJSONData;
+- (id)mutableObjectFromJSONDataWithParseOptions:(JKParseOptionFlags)parseOptionFlags;
+- (id)mutableObjectFromJSONDataWithParseOptions:(JKParseOptionFlags)parseOptionFlags error:(NSError **)error;
+@end
+
+////////////
+#pragma mark Serializing methods
+////////////
+  
+@interface NSString (JSONKitSerializing)
+// Convenience methods for those that need to serialize the receiving NSString (i.e., instead of having to serialize a NSArray with a single NSString, you can "serialize to JSON" just the NSString).
+// Normally, a string that is serialized to JSON has quotation marks surrounding it, which you may or may not want when serializing a single string, and can be controlled with includeQuotes:
+// includeQuotes:YES `a "test"...` -> `"a \"test\"..."`
+// includeQuotes:NO  `a "test"...` -> `a \"test\"...`
+- (NSData *)JSONData;     // Invokes JSONDataWithOptions:JKSerializeOptionNone   includeQuotes:YES
+- (NSData *)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions includeQuotes:(BOOL)includeQuotes error:(NSError **)error;
+- (NSString *)JSONString; // Invokes JSONStringWithOptions:JKSerializeOptionNone includeQuotes:YES
+- (NSString *)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions includeQuotes:(BOOL)includeQuotes error:(NSError **)error;
+@end
+
+@interface NSArray (JSONKitSerializing)
+- (NSData *)JSONData;
+- (NSData *)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions error:(NSError **)error;
+- (NSData *)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingDelegate:(id)delegate selector:(SEL)selector error:(NSError **)error;
+- (NSString *)JSONString;
+- (NSString *)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions error:(NSError **)error;
+- (NSString *)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingDelegate:(id)delegate selector:(SEL)selector error:(NSError **)error;
+@end
+
+@interface NSDictionary (JSONKitSerializing)
+- (NSData *)JSONData;
+- (NSData *)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions error:(NSError **)error;
+- (NSData *)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingDelegate:(id)delegate selector:(SEL)selector error:(NSError **)error;
+- (NSString *)JSONString;
+- (NSString *)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions error:(NSError **)error;
+- (NSString *)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingDelegate:(id)delegate selector:(SEL)selector error:(NSError **)error;
+@end
+
+#ifdef __BLOCKS__
+
+@interface NSArray (JSONKitSerializingBlockAdditions)
+- (NSData *)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingBlock:(id(^)(id object))block error:(NSError **)error;
+- (NSString *)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingBlock:(id(^)(id object))block error:(NSError **)error;
+@end
+
+@interface NSDictionary (JSONKitSerializingBlockAdditions)
+- (NSData *)JSONDataWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingBlock:(id(^)(id object))block error:(NSError **)error;
+- (NSString *)JSONStringWithOptions:(JKSerializeOptionFlags)serializeOptions serializeUnsupportedClassesUsingBlock:(id(^)(id object))block error:(NSError **)error;
+@end
+  
+#endif
+
+
+#endif // __OBJC__
+
+#endif // _JSONKIT_H_
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
@@ -7,9 +7,9 @@
 	objects = {

 /* Begin PBXBuildFile section */
-		0B13ECAE173C687400548DA1 /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B13ECAD173C686A00548DA1 /* GCDAsyncSocket.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
+		0B13ECAE173C687400548DA1 /* GCDAsyncSocket.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B13ECAD173C686A00548DA1 /* GCDAsyncSocket.m */; };
 		0B13ECAF173C687900548DA1 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0BFC9ACB173C57E400CDD329 /* Security.framework */; };
-		5BB74A8719DBF9BB001BAAAC /* FinishedIconCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BB74A8619DBF9BB001BAAAC /* FinishedIconCache.m */; };
+		0BFAF21C16F8E6C10017EA7E /* JSONKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BFAF21B16F8E6C10017EA7E /* JSONKit.m */; };
 		692C18A516660C4700BF6A53 /* ContextMenuHandlers.m in Sources */ = {isa = PBXBuildFile; fileRef = 692C18A416660C4600BF6A53 /* ContextMenuHandlers.m */; };
 		692C18A9166617F500BF6A53 /* IconOverlayHandlers.m in Sources */ = {isa = PBXBuildFile; fileRef = 692C18A8166617F500BF6A53 /* IconOverlayHandlers.m */; };
 		692C18AC1666392700BF6A53 /* MenuManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 692C18AB1666392700BF6A53 /* MenuManager.m */; };
@@ -29,9 +29,9 @@
 		0B13ECAC173C686900548DA1 /* GCDAsyncSocket.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GCDAsyncSocket.h; sourceTree = "<group>"; };
 		0B13ECAD173C686A00548DA1 /* GCDAsyncSocket.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GCDAsyncSocket.m; sourceTree = "<group>"; };
 		0B2BF60B176A43DB001246CD /* Finder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Finder.h; sourceTree = "<group>"; };
+		0BFAF21A16F8E6C10017EA7E /* JSONKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONKit.h; sourceTree = "<group>"; };
+		0BFAF21B16F8E6C10017EA7E /* JSONKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSONKit.m; sourceTree = "<group>"; };
 		0BFC9ACB173C57E400CDD329 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
-		5BB74A8519DBF9BB001BAAAC /* FinishedIconCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FinishedIconCache.h; sourceTree = "<group>"; };
-		5BB74A8619DBF9BB001BAAAC /* FinishedIconCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FinishedIconCache.m; sourceTree = "<group>"; };
 		692C18A316660C4600BF6A53 /* ContextMenuHandlers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextMenuHandlers.h; sourceTree = "<group>"; };
 		692C18A416660C4600BF6A53 /* ContextMenuHandlers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContextMenuHandlers.m; sourceTree = "<group>"; };
 		692C18A7166617F500BF6A53 /* IconOverlayHandlers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IconOverlayHandlers.h; sourceTree = "<group>"; };
@@ -48,7 +48,7 @@
 		8C37DDB9161594B400016A95 /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; };
 		8C99F6921622D145002D2135 /* IconCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IconCache.h; sourceTree = "<group>"; };
 		8C99F6931622D145002D2135 /* IconCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IconCache.m; sourceTree = "<group>"; };
-		8D576316048677EA00EA77CD /* SyncStateFinder.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SyncStateFinder.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
+		8D576316048677EA00EA77CD /* OwnCloudFinder.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OwnCloudFinder.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 /* End PBXFileReference section */

@@ -67,7 +67,7 @@
 /* End PBXFrameworksBuildPhase section */

 /* Begin PBXGroup section */
-		089C166AFE841209C02AAC07 /* SyncStateFinder */ = {
+		089C166AFE841209C02AAC07 /* OwnCloudFinder */ = {
 			isa = PBXGroup;
 			children = (
 				08FB77AFFE84173DC02AAC07 /* Source */,
@@ -75,7 +75,7 @@
 				089C1671FE841209C02AAC07 /* External Frameworks and Libraries */,
 				19C28FB6FE9D52B211CA2CBB /* Products */,
 			);
-			name = SyncStateFinder;
+			name = OwnCloudFinder;
 			sourceTree = "<group>";
 			usesTabs = 1;
 		};
@@ -104,6 +104,7 @@
 			children = (
 				0B2BF60A176A43DB001246CD /* Finder */,
 				0B08BAC21759627700C8351E /* GCDAsyncSocket */,
+				0BFAF21916F8E6910017EA7E /* JSONKit */,
 				8C37DD99161593BD00016A95 /* FinderHook.h */,
 				8C37DD9A161593BD00016A95 /* FinderHook.m */,
 				692C18A316660C4600BF6A53 /* ContextMenuHandlers.h */,
@@ -116,8 +117,6 @@
 				69948B351636D50E0093B6CE /* ContentManager.m */,
 				8C99F6921622D145002D2135 /* IconCache.h */,
 				8C99F6931622D145002D2135 /* IconCache.m */,
-				5BB74A8519DBF9BB001BAAAC /* FinishedIconCache.h */,
-				5BB74A8619DBF9BB001BAAAC /* FinishedIconCache.m */,
 				692C18AA1666392700BF6A53 /* MenuManager.h */,
 				692C18AB1666392700BF6A53 /* MenuManager.m */,
 			);
@@ -141,10 +140,19 @@
 			path = Finder;
 			sourceTree = "<group>";
 		};
+		0BFAF21916F8E6910017EA7E /* JSONKit */ = {
+			isa = PBXGroup;
+			children = (
+				0BFAF21A16F8E6C10017EA7E /* JSONKit.h */,
+				0BFAF21B16F8E6C10017EA7E /* JSONKit.m */,
+			);
+			name = JSONKit;
+			sourceTree = "<group>";
+		};
 		19C28FB6FE9D52B211CA2CBB /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				8D576316048677EA00EA77CD /* SyncStateFinder.bundle */,
+				8D576316048677EA00EA77CD /* OwnCloudFinder.bundle */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -152,9 +160,9 @@
 /* End PBXGroup section */

 /* Begin PBXNativeTarget section */
-		8D57630D048677EA00EA77CD /* SyncStateFinder */ = {
+		8D57630D048677EA00EA77CD /* OwnCloudFinder */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "SyncStateFinder" */;
+			buildConfigurationList = 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "OwnCloudFinder" */;
 			buildPhases = (
 				8D57630F048677EA00EA77CD /* Resources */,
 				8D576311048677EA00EA77CD /* Sources */,
@@ -164,10 +172,10 @@
 			);
 			dependencies = (
 			);
-			name = SyncStateFinder;
+			name = OwnCloudFinder;
 			productInstallPath = "$(HOME)/Library/Bundles";
-			productName = SyncStateFinder;
-			productReference = 8D576316048677EA00EA77CD /* SyncStateFinder.bundle */;
+			productName = OwnCloudFinder;
+			productReference = 8D576316048677EA00EA77CD /* OwnCloudFinder.bundle */;
 			productType = "com.apple.product-type.bundle";
 		};
 /* End PBXNativeTarget section */
@@ -178,7 +186,7 @@
 			attributes = {
 				LastUpgradeCheck = 0460;
 			};
-			buildConfigurationList = 1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "SyncStateFinder" */;
+			buildConfigurationList = 1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "OwnCloudFinder" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
@@ -188,11 +196,11 @@
 				French,
 				German,
 			);
-			mainGroup = 089C166AFE841209C02AAC07 /* SyncStateFinder` */;
+			mainGroup = 089C166AFE841209C02AAC07 /* OwnCloudFinder */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				8D57630D048677EA00EA77CD /* SyncStateFinder */,
+				8D57630D048677EA00EA77CD /* OwnCloudFinder */,
 			);
 		};
 /* End PBXProject section */
@@ -218,10 +226,10 @@
 				8C99F6941622D145002D2135 /* IconCache.m in Sources */,
 				69948B361636D50E0093B6CE /* ContentManager.m in Sources */,
 				6993878616494C000044E4DF /* RequestManager.m in Sources */,
-				5BB74A8719DBF9BB001BAAAC /* FinishedIconCache.m in Sources */,
 				692C18A516660C4700BF6A53 /* ContextMenuHandlers.m in Sources */,
 				692C18A9166617F500BF6A53 /* IconOverlayHandlers.m in Sources */,
 				692C18AC1666392700BF6A53 /* MenuManager.m in Sources */,
+				0BFAF21C16F8E6C10017EA7E /* JSONKit.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -252,7 +260,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
-				PRODUCT_NAME = SyncStateFinder;
+				PRODUCT_NAME = OwnCloudFinder;
 				WRAPPER_EXTENSION = bundle;
 			};
 			name = Debug;
@@ -269,7 +277,7 @@
 				GCC_MODEL_TUNING = G5;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Library/Bundles";
-				PRODUCT_NAME = SyncStateFinder;
+				PRODUCT_NAME = OwnCloudFinder;
 				WRAPPER_EXTENSION = bundle;
 			};
 			name = Release;
@@ -294,9 +302,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				COPY_PHASE_STRIP = NO;
+				COPY_PHASE_STRIP = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
@@ -308,7 +315,7 @@
 /* End XCBuildConfiguration section */

 /* Begin XCConfigurationList section */
-		1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "SyncStateFinder" */ = {
+		1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "OwnCloudFinder" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				1DEB911B08733D790010E9CD /* Debug */,
@@ -317,7 +324,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "SyncStateFinder" */ = {
+		1DEB911E08733D790010E9CD /* Build configuration list for PBXProject "OwnCloudFinder" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				1DEB911F08733D790010E9CD /* Debug */,
@@ -31,7 +31,7 @@

 + (RequestManager*)sharedInstance;

- (BOOL)isRegisteredPath:(NSString*)path isDirectory:(BOOL)isDir;
+- (BOOL)isRegisteredPath:(NSString*)path;
 - (void)askOnSocket:(NSString*)path query:(NSString*)verb;
 - (NSNumber*)askForIcon:(NSString*)path isDirectory:(BOOL)isDir;
 - (void)menuItemClicked:(NSDictionary*)actionDictionary;
@@ -77,20 +77,14 @@ static RequestManager* sharedInstance = nil;
 }


- (BOOL)isRegisteredPath:(NSString*)path isDirectory:(BOOL)isDir
+- (BOOL)isRegisteredPath:(NSString*)path
 {
 	// check if the file in question is underneath a registered directory
 	NSArray *regPathes = [_registeredPathes allKeys];
 	BOOL registered = NO;

-	NSString* checkPath = [NSString stringWithString:path];
-	if (isDir) {
-		// append a slash
-		checkPath = [path stringByAppendingString:@"/"];
-	}
-
 	for( NSString *regPath in regPathes ) {
-		if( [checkPath hasPrefix:regPath]) {
+		if( [path hasPrefix:regPath]) {
 			// the path was registered
 			registered = YES;
 			break;
@@ -105,7 +99,7 @@ static RequestManager* sharedInstance = nil;
 	NSString *verb = @"RETRIEVE_FILE_STATUS";
 	NSNumber *res = [NSNumber numberWithInt:0];

-	if( [self isRegisteredPath:path isDirectory:isDir] ) {
+	if( [self isRegisteredPath:path] ) {
 		if( _isConnected ) {
 			if(isDir) {
 				verb = @"RETRIEVE_FOLDER_STATUS";
@@ -127,49 +121,41 @@ static RequestManager* sharedInstance = nil;

 - (void)socket:(GCDAsyncSocket*)socket didReadData:(NSData*)data withTag:(long)tag
 {
+	NSArray *chunks;
 	NSString *answer = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-	NSArray *chunks = nil;
 	if (answer != nil && [answer length] > 0) {
 		// cut a trailing newline
 		answer = [answer substringToIndex:[answer length] - 1];
 		chunks = [answer componentsSeparatedByString: @":"];
 	}
+	NSLog(@"READ from socket (%ld): <%@>", tag, answer);
 	ContentManager *contentman = [ContentManager sharedInstance];

-	if( chunks && [chunks count] > 0 && tag == READ_TAG ) {
-		NSLog(@"READ from socket (%ld): <%@>", tag, answer);
+	if( [chunks count] > 0 && tag == READ_TAG ) {
 		if( [[chunks objectAtIndex:0] isEqualToString:@"STATUS"] ) {
-			NSString *path = [chunks objectAtIndex:2];
-			if( [chunks count] > 3 ) {
-				for( int i = 2; i < [chunks count]-1; i++ ) {
-					path = [NSString stringWithFormat:@"%@:%@",
-							path, [chunks objectAtIndex:i+1] ];
-				}
-			}
-			[contentman setResultForPath:path result:[chunks objectAtIndex:1]];
+			[contentman setResultForPath:[chunks objectAtIndex:2] result:[chunks objectAtIndex:1]];
 		} else if( [[chunks objectAtIndex:0] isEqualToString:@"UPDATE_VIEW"] ) {
 			NSString *path = [chunks objectAtIndex:1];
-			[contentman reFetchFileNameCacheForPath:path];
+			[contentman clearFileNameCacheForPath:path];
+
+			[contentman repaintAllWindows];
 		} else if( [[chunks objectAtIndex:0 ] isEqualToString:@"REGISTER_PATH"] ) {
 			NSNumber *one = [NSNumber numberWithInt:1];
 			NSString *path = [chunks objectAtIndex:1];
-			NSLog(@"Registering path: %@", path);
 			[_registeredPathes setObject:one forKey:path];
 			
 			[contentman repaintAllWindows];
 		} else if( [[chunks objectAtIndex:0 ] isEqualToString:@"UNREGISTER_PATH"] ) {
+			NSNumber *one = [NSNumber numberWithInt:1];
 			NSString *path = [chunks objectAtIndex:1];
 			[_registeredPathes removeObjectForKey:path];

 			[contentman repaintAllWindows];
-		} else if( [[chunks objectAtIndex:0 ] isEqualToString:@"ICON_PATH"] ) {
-			NSString *path = [chunks objectAtIndex:1];
-			[[ContentManager sharedInstance] loadIconResourcePath:path];
 		} else {
 			NSLog(@"Unknown command %@", [chunks objectAtIndex:0]);
 		}
-	} else if (tag != READ_TAG) {
-		NSLog(@"Received unknown tag %ld <%@>", tag, answer);
+	} else {
+		NSLog(@"Received unknown tag %ld", tag);
 	}
 	// Read on and on
 	NSData* stop = [@"\n" dataUsingEncoding:NSUTF8StringEncoding];
@@ -183,32 +169,18 @@ static RequestManager* sharedInstance = nil;
 	return 0.0;
 }

-(void)socket:(GCDAsyncSocket*)socket didConnectToUrl:(NSURL *)url {
-	NSLog(@"didConnectToUrl %@", url);
-	[self socketDidConnect:socket];
-}
-
 - (void)socket:(GCDAsyncSocket*)socket didConnectToHost:(NSString*)host port:(UInt16)port
 {
-	[self socketDidConnect:socket];
-}
-
-// Our impl
- (void)socketDidConnect:(GCDAsyncSocket*)socket  {
-	NSLog( @"Connected to sync client successfully!");
+	NSLog( @"Connected to host successfully!");
 	_isConnected = YES;
 	_isRunning = NO;

 	if( [_requestQueue count] > 0 ) {
 		NSLog( @"We have to empty the queue");
 		for( NSString *path in _requestQueue ) {
-			[self askOnSocket:path query:@"RETRIEVE_FILE_STATUS"];
+			[self askOnSocket:path];
 		}
 	}
-
-	ContentManager *contentman = [ContentManager sharedInstance];
-	[contentman clearFileNameCacheForPath:nil];
-	[contentman repaintAllWindows];
 	
 	// Read for the UPDATE_VIEW requests
 	NSData* stop = [@"\n" dataUsingEncoding:NSUTF8StringEncoding];
@@ -233,7 +205,6 @@ static RequestManager* sharedInstance = nil;
    // clear the caches in conent manager
 	ContentManager *contentman = [ContentManager sharedInstance];
 	[contentman clearFileNameCacheForPath:nil];
-	[contentman repaintAllWindows];

 	[NSTimer scheduledTimerWithTimeInterval:5 target:self selector:@selector(start) userInfo:nil repeats:NO];

@@ -244,27 +215,12 @@ static RequestManager* sharedInstance = nil;
 {
 	if (!_isRunning)
 	{
+		NSLog(@"Connect Socket!");
 		NSError *err = nil;
-		BOOL useTcp = NO;
-		if (useTcp) {
-			NSLog(@"Connect Socket");
-		    if (![_socket connectToHost:@"localhost" onPort:34001 withTimeout:5 error:&err]) {
-				// If there was an error, it's likely something like "already connected" or "no delegate set"
-				NSLog(@"I goofed: %@", err);
-			}
-		} else if (!useTcp) {
-			NSURL *url = nil;
-			NSArray *paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
-			if ([paths count])
-			{
-				// file:///Users/guruz/Library/Caches/SyncStateHelper/ownCloud.socket
-				// FIXME Generify this and support all sockets there since multiple sync clients might be running
-				url =[NSURL fileURLWithPath:[[[paths objectAtIndex:0] stringByAppendingPathComponent:@"SyncStateHelper"] stringByAppendingPathComponent:@"ownCloud.socket"]];
-			}
-			if (url) {
-				NSLog(@"Connect Socket to %@", url);
-				[_socket connectToUrl:url withTimeout:5 error:&err];
-			}
+		if (![_socket connectToHost:@"localhost" onPort:34001 withTimeout:5 error:&err]) // Asynchronous!
+		{
+			// If there was an error, it's likely something like "already connected" or "no delegate set"
+			NSLog(@"I goofed: %@", err);
 		}
 		
 		 _isRunning = YES;
@@ -26,7 +26,7 @@
 	<dict>
 		<key>Events</key>
 		<dict>
-			<key>OWNClded</key>
+			<key>NVTYlded</key>
 			<dict>
 				<key>Context</key>
 				<string>Process</string>
@@ -35,7 +35,7 @@
 				<key>ThreadSafe</key>
 				<false/>
 			</dict>
-			<key>OWNCload</key>
+			<key>NVTYload</key>
 			<dict>
 				<key>Context</key>
 				<string>Process</string>
@@ -44,7 +44,7 @@
 				<key>ThreadSafe</key>
 				<false/>
 			</dict>
-			<key>OWNCunld</key>
+			<key>NVTYunld</key>
 			<dict>
 				<key>Context</key>
 				<string>Process</string>
@@ -27,7 +27,7 @@ static NSString* globalLock = @"I'm the global lock to prevent concruent handler
@end

 static bool liferayNativityLoaded = false;
-static NSString* liferayNativityBundleName = @"SyncStateFinder";
+static NSString* liferayNativityBundleName = @"OwnCloudFinder";

 typedef struct {
  NSString* location;
@@ -85,7 +85,7 @@ static OSErr loadBundle(LNBundleType type, AppleEvent* reply, long refcon) {
  }

  if (isLoaded) {
-    NSLog(@"OwnCloudInjector: %@ already loaded.", bundleName);
+    NSLog(@"LiferayNativityInjector: %@ already loaded.", bundleName);
    return noErr;
  }

@@ -7,7 +7,7 @@
 	objects = {

 /* Begin PBXBuildFile section */
-		0B36CB92182461A10039B237 /* SyncStateFinder.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0B36CB91182461A10039B237 /* SyncStateFinder.bundle */; };
+		0B36CB92182461A10039B237 /* OwnCloudFinder.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0B36CB91182461A10039B237 /* OwnCloudFinder.bundle */; };
 		0BD9C38E1778EF450094CF5D /* license.txt in Resources */ = {isa = PBXBuildFile; fileRef = 0BD9C38D1778EF450094CF5D /* license.txt */; };
 		8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; };
 		8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; };
@@ -19,10 +19,10 @@
 /* Begin PBXFileReference section */
 		089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-		0B36CB91182461A10039B237 /* SyncStateFinder.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = SyncStateFinder.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
+		0B36CB91182461A10039B237 /* OwnCloudFinder.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; path = OwnCloudFinder.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		0BD9C38D1778EF450094CF5D /* license.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = license.txt; sourceTree = "<group>"; };
 		8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		D60A992314CE37030061AD6D /* SyncStateFinder.osax */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SyncStateFinder.osax; sourceTree = BUILT_PRODUCTS_DIR; };
+		D60A992314CE37030061AD6D /* OwnCloudFinder.osax */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = OwnCloudFinder.osax; sourceTree = BUILT_PRODUCTS_DIR; };
 		D6ACBE9E117B7D5600F6691C /* OwnCloudInjector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OwnCloudInjector.m; sourceTree = "<group>"; };
 		D6ACBE9F117B7D5600F6691C /* LNVersionComparisonProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LNVersionComparisonProtocol.h; sourceTree = "<group>"; };
 		D6ACBEA0117B7D5600F6691C /* LNStandardVersionComparator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LNStandardVersionComparator.m; sourceTree = "<group>"; };
@@ -51,7 +51,7 @@
 				D60A992414CE37030061AD6D /* Products */,
 			);
 			indentWidth = 2;
-			name = "SyncStateFinder-osax";
+			name = "TotalFinder-osax";
 			sourceTree = "<group>";
 			tabWidth = 2;
 			usesTabs = 0;
@@ -67,7 +67,7 @@
 		089C167CFE841241C02AAC07 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				0B36CB91182461A10039B237 /* SyncStateFinder.bundle */,
+				0B36CB91182461A10039B237 /* OwnCloudFinder.bundle */,
 				D6ACBEA4117B7D6100F6691C /* OwnCloudInjector.sdef */,
 				8D576317048677EA00EA77CD /* Info.plist */,
 				8D5B49A704867FD3000E48DA /* InfoPlist.strings */,
@@ -90,7 +90,7 @@
 		D60A992414CE37030061AD6D /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				D60A992314CE37030061AD6D /* SyncStateFinder.osax */,
+				D60A992314CE37030061AD6D /* OwnCloudFinder.osax */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -98,9 +98,9 @@
 /* End PBXGroup section */

 /* Begin PBXNativeTarget section */
-		8D57630D048677EA00EA77CD /* SyncStateFinder.osax */ = {
+		8D57630D048677EA00EA77CD /* OwnCloudFinder.osax */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "SyncStateFinder.osax" */;
+			buildConfigurationList = 1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "OwnCloudFinder.osax" */;
 			buildPhases = (
 				8D57630F048677EA00EA77CD /* Resources */,
 				8D576311048677EA00EA77CD /* Sources */,
@@ -110,10 +110,10 @@
 			);
 			dependencies = (
 			);
-			name = SyncStateFinder.osax;
+			name = OwnCloudFinder.osax;
 			productInstallPath = "$(HOME)/Library/Bundles";
-			productName = "SyncStateFinder-osax";
-			productReference = D60A992314CE37030061AD6D /* SyncStateFinder.osax */;
+			productName = "TotalFinder-osax";
+			productReference = D60A992314CE37030061AD6D /* OwnCloudFinder.osax */;
 			productType = "com.apple.product-type.bundle";
 		};
 /* End PBXNativeTarget section */
@@ -139,7 +139,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				8D57630D048677EA00EA77CD /* SyncStateFinder.osax */,
+				8D57630D048677EA00EA77CD /* OwnCloudFinder.osax */,
 			);
 		};
 /* End PBXProject section */
@@ -149,7 +149,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0B36CB92182461A10039B237 /* SyncStateFinder.bundle in Resources */,
+				0B36CB92182461A10039B237 /* OwnCloudFinder.bundle in Resources */,
 				8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */,
 				D6ACBEA5117B7D6100F6691C /* OwnCloudInjector.sdef in Resources */,
 				0BD9C38E1778EF450094CF5D /* license.txt in Resources */,
@@ -195,7 +195,7 @@
 					"-framework",
 					AppKit,
 				);
-				PRODUCT_NAME = SyncStateFinder;
+				PRODUCT_NAME = OwnCloudFinder;
 				SKIP_INSTALL = YES;
 				WRAPPER_EXTENSION = osax;
 			};
@@ -214,7 +214,7 @@
 					"-framework",
 					AppKit,
 				);
-				PRODUCT_NAME = SyncStateFinder;
+				PRODUCT_NAME = OwnCloudFinder;
 				WRAPPER_EXTENSION = osax;
 			};
 			name = Release;
@@ -245,7 +245,7 @@
 /* End XCBuildConfiguration section */

 /* Begin XCConfigurationList section */
-		1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "SyncStateFinder.osax" */ = {
+		1DEB911A08733D790010E9CD /* Build configuration list for PBXNativeTarget "OwnCloudFinder.osax" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				1DEB911B08733D790010E9CD /* Debug */,
@@ -15,8 +15,8 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "8D57630D048677EA00EA77CD"
-               BuildableName = "SyncStateFinder.bundle"
-               BlueprintName = "SyncStateFinder"
+               BuildableName = "OwnCloudFinder.bundle"
+               BlueprintName = "OwnCloudFinder"
               ReferencedContainer = "container:../OwnCloudFinder/OwnCloudFinder.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
@@ -29,8 +29,8 @@
            <BuildableReference
               BuildableIdentifier = "primary"
               BlueprintIdentifier = "8D57630D048677EA00EA77CD"
-               BuildableName = "SyncStateFinder.osax"
-               BlueprintName = "SyncStateFinder.osax"
+               BuildableName = "OwnCloudFinder.osax"
+               BlueprintName = "OwnCloudFinder.osax"
               ReferencedContainer = "container:OwnCloudInjector.xcodeproj">
            </BuildableReference>
         </BuildActionEntry>
@@ -1,6 +1,6 @@
 tell application "Finder"
    try
-        «event OWNClded»
+        «event NVTYlded»
        set the result to 0
    on error msg number code
        set the result to code
@@ -1,10 +1,10 @@
 #!/bin/sh
 # osascript $HOME/owncloud.com/mirall/shell_integration/MacOSX/unload.scpt

-sudo rm -rf /Library/ScriptingAdditions/SyncStateFinder.osax
+sudo rm -rf /Library/ScriptingAdditions/OwnCloudFinder.osax
 # Klaas' machine
-OSAXDIR=$HOME/Library/Developer/Xcode/DerivedData/OwnCloud-*/Build/Products/Debug/SyncStateFinder.osax
-[ -d $OSAXDIR ] ||OSAXDIR=$HOME/Library/Developer/Xcode/DerivedData/OwnCloud-*/Build/Intermediates/ArchiveIntermediates/SyncStateFinder.osax/IntermediateBuildFilesPath/UninstalledProducts/SyncStateFinder.osax
+OSAXDIR=$HOME/Library/Developer/Xcode/DerivedData/OwnCloud-*/Build/Products/Debug/OwnCloudFinder.osax
+[ -d $OSAXDIR ] ||OSAXDIR=$HOME/Library/Developer/Xcode/DerivedData/OwnCloud-*/Build/Intermediates/ArchiveIntermediates/OwnCloudFinder.osax/IntermediateBuildFilesPath/UninstalledProducts/OwnCloudFinder.osax

 # Markus' machine
 [ -d $OSAXDIR ] || echo "OSAX does not exist"
@@ -1,6 +1,6 @@
 tell application "Finder"
    try
-        «event OWNCload»
+        «event NVTYload»
    end try
 end tell

@@ -2,7 +2,7 @@

 osascript -e 'tell application "Finder" \
                try \
-                   «event OWNCload» \
+                   «event NVTYload» \
                end try \
              end tell'

@@ -1,6 +1,6 @@
 tell application "Finder"
    try
-        «event OWNCunld»
+        «event NVTYunld»
    end try
 end tell

@@ -13,12 +13,7 @@ if( UNIX AND NOT APPLE )
    
    FOREACH(size 128x128 16x16 256x256 32x32 48x48 64x64 72x72)
 	file(GLOB files  "${size}/*.png")
-	FOREACH( file ${files} )
-	    # the GLOB returns a absolute path. Make it relative by replacing the current src dir by nothing
-	    STRING(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/${size}/" "" shortFile ${file})
-	    STRING(REPLACE "oC" ${APPLICATION_NAME} brandedName ${shortFile})
-	    install(FILES ${file} DESTINATION ${ICON_DIR}/${size}/apps RENAME ${brandedName})
-	ENDFOREACH(file)
+        install(FILES ${files} DESTINATION ${ICON_DIR}/${size}/apps)
    ENDFOREACH(size)

 endif()
--- a/Mostrar Mais
+++ b/Mostrar Mais
Autor	SHA1	Mensagem	Data
Daniel Molkentin	942136167a	Add travis file	2014-08-27 14:01:35 +02:00
Daniel Molkentin	2c6324e3e5	Fix tests	2014-08-27 10:27:29 +02:00
Jenkins for ownCloud	e442ba863a	[tx-robot] updated from transifex	2014-08-27 01:25:26 -04:00
Daniel Molkentin	e5471d8318	Build after merge	2014-08-26 14:33:21 +02:00
Daniel Molkentin	902bb7a198	Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir Conflicts: src/CMakeLists.txt src/gui/accountsettings.cpp src/gui/folderwizard.cpp src/gui/settingsdialog.cpp src/libsync/syncengine.h	2014-08-26 11:29:42 +02:00
Daniel Molkentin	4fc044d368	Merge branch 'master' into move_lib_to_sep_dir Conflicts: cmake/modules/NSIS.template.in src/CMakeLists.txt src/creds/shibboleth/authenticationdialog.cpp src/creds/shibboleth/authenticationdialog.h src/gui/owncloudgui.cpp src/libsync/creds/shibboleth/authenticationdialog.cpp src/libsync/creds/shibboleth/authenticationdialog.h src/libsync/mirallaccessmanager.cpp src/mirall/authenticationdialog.cpp src/mirall/authenticationdialog.h	2014-08-12 21:08:44 +02:00
Daniel Molkentin	bb32831a60	Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir Conflicts: src/gui/folderman.cpp	2014-07-17 11:31:45 +02:00
Daniel Molkentin	ea690c285b	Make NSIS installer work with new structure	2014-07-14 13:12:31 +02:00
Daniel Molkentin	28879712e9	Make krazy target work again	2014-07-14 12:19:32 +02:00
Daniel Molkentin	3c2e43d883	Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir	2014-07-14 10:50:53 +02:00
Daniel Molkentin	5041880854	Try to handle BUILD_LIBRARIES_ONLY correctly Also, try to fix OS X build	2014-07-11 12:36:01 +02:00
Daniel Molkentin	2c904afd04	OS X explicitly requires the neon include path to be set	2014-07-11 12:11:04 +02:00
Daniel Molkentin	2cc13fb74a	Fix includes in mac specific headers	2014-07-11 11:38:01 +02:00
Daniel Molkentin	df3c3bca02	Split into three separate projects: library, gui and cmd	2014-07-11 11:07:31 +02:00