VERSION.cmake: 2.2.3 final

2016-08-08 15:42:39 +02:00
@@ -1,9 +1,6 @@

 cmake_minimum_required(VERSION 2.6)
 cmake_policy(VERSION 2.8.0)
-if(POLICY CMP0020)
-  cmake_policy(SET CMP0020 NEW)
-endif()

 project(client)

@@ -60,7 +57,7 @@ endif()

 include(GNUInstallDirs)
 include(DefineInstallationPaths)
-include(GenerateExportHeader)
+

 include(GetGitRevisionDescription)

@@ -139,13 +136,6 @@ if(OWNCLOUD_RESTORE_RENAME)
    add_definitions(-DOWNCLOUD_RESTORE_RENAME=1)
 endif()

-# Disable shibboleth.
-# So the client can be built without QtWebKit
-option(NO_SHIBBOLETH "Build without Shibboleth support. Allow to build the client without QtWebKit" OFF)
-if(NO_SHIBBOLETH)
-   message("Compiling without shibboleth")
-   add_definitions(-DNO_SHIBBOLETH=1)
-endif()

 if(APPLE)
  set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
@@ -169,9 +159,6 @@ 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})
-    if (WIN32)
-        add_definitions(-DSQLITE_API=__declspec\(dllimport\))
-    endif()
 endif()

 find_package(ZLIB)
@@ -186,7 +173,6 @@ add_definitions(-DUNICODE)
 add_definitions(-D_UNICODE)
 if( WIN32 )
 add_definitions( -D__USE_MINGW_ANSI_STDIO=1 )
-add_definitions( -DNOMINMAX )
 endif( WIN32 )

 # Handle Translations, pick all client_* files from trans directory.
@@ -1,15 +1,6 @@
 ChangeLog
 =========

-version 2.2.4 (release 2016-09-27)
-* Dolphin Plugin: Use the Application name for the socket path (#5172)
-* SyncEngine: Fix renaming of folder when file are changed (#5195)
-* Selective Sync: Fix HTTP request loop and show error in view (#5154)
-* ConnectionValidator: properly handle error in status.php request (#5188)
-* Discovery: Set thread priority to low (#5017)
-* ExcludeFiles: Fix when the folder casing is not the same in the settings and in the FS
-* ShareLink: Ensure the password line edit is enabled (#5117)
-
 version 2.2.3 (release 2016-08-08)
 * SyncEngine: Fix detection of backup (#5104)
 * Fix bug with overriding URL in config (#5016)
@@ -38,21 +38,6 @@ node('CLIENT') {
 		ctest --output-on-failure'''


-    stage 'Win32'
-	def win32 = docker.image('deepdiver/docker-owncloud-client-win32:latest')
-	win32.pull() // make sure we have the latest available from Docker Hub
-	win32.inside {
-		sh '''
-		rm -rf build-win32
-		mkdir build-win32
-		cd build-win32
-		../admin/win/download_runtimes.sh
-		cmake .. -DCMAKE_TOOLCHAIN_FILE=../admin/win/Toolchain-mingw32-openSUSE.cmake -DWITH_CRASHREPORTER=ON
-		make -j4
-		make package
-		ctest .
-		'''
-	}
 }


@@ -27,7 +27,7 @@ https://github.com/owncloud/client.

 ## Building the source code

-[Building the Client](http://doc.owncloud.org/desktop/2.2/building.html)
+[Building the Client](http://doc.owncloud.org/desktop/2.0/building.html)
 in the ownCloud Desktop Client manual.

 ## Maintainers and Contributors
@@ -1,11 +1,11 @@
 set( MIRALL_VERSION_MAJOR 2 )
-set( MIRALL_VERSION_MINOR 3 )
-set( MIRALL_VERSION_PATCH 0 )
+set( MIRALL_VERSION_MINOR 2 )
+set( MIRALL_VERSION_PATCH 3 )
 set( MIRALL_VERSION_YEAR  2016 )
 set( MIRALL_SOVERSION 0 )

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

 if( NOT DEFINED MIRALL_VERSION_BUILD )
@@ -5,8 +5,7 @@
 #
 #  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; either version 2 of the License, or
-#  (at your option) any later version.
+#  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
@@ -33,11 +33,11 @@ StrCpy $UNINSTALL_MESSAGEBOX "Ez dirudi ${APPLICATION_NAME} '$INSTDIR'.$ direkto
 StrCpy $UNINSTALL_ABORT "Desinstalazioak erabiltzaileak bertan behera utzi du"
 StrCpy $INIT_NO_QUICK_LAUNCH "Abiarazle Bizkorreko Lasterbidea (E/E)"
 StrCpy $INIT_NO_DESKTOP "Mahaigaineko Lasterbidea (dagoena berridazten du)"
-StrCpy $UAC_ERROR_ELEVATE "Ezin izan da goratu, errorea:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Instalatzaileak administratzaile baimenak behar ditu, saiatu berriro"
 StrCpy $INIT_INSTALLER_RUNNING "Instalatzailea dagoeneko martxan da."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Desinstalatzaile honek administratzaile baimenak behar ditu, saiatu berriro"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Saioa hasteko zerbitzua ez dago martxan, bertan behera uzten!"
 StrCpy $INIT_UNINSTALLER_RUNNING "Desinstalatzailea dagoeneko martxan da."
 StrCpy $SectionGroup_Shortcuts "Lasterbideak"
 StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
+StrCpy $UAC_ERROR_ELEVATE "Unable to elevate, error:"
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
@@ -9,7 +9,6 @@ StrCpy $PageReinstall_NEW_Field_3 "No instal·lar"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Ja instal·lat"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Trieu la manera com voleu instal·lar ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Una versió més recent de ${APPLICATION_NAME} ja està instal.lada!! No es recomana instal.lar una versió més antiga. Si realment voleu instal.lar una versió més antiga, és millor primer desinstal.lar la versió actual. Seleccioni l'operació que desitjeu realitzar i feu clic a Següent per a continuar."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} ja està instal·lat.$\n$\nSeleccioneu la operació que voleu fer i feu clic a Següent per continuar."
 StrCpy $PageReinstall_SAME_Field_2 "Afegir/Reinstal.lar components"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstal.lar ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstal.lar ${APPLICATION_NAME}"
@@ -38,6 +37,7 @@ StrCpy $UAC_ERROR_ELEVATE "No es pot elevar, error:"
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Aquest instal·lador requereix accés d'administrador, intenteu-ho de nou"
 StrCpy $INIT_INSTALLER_RUNNING "L'instal·lador ja s'està executant."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Aquest desinstal·lador requereix accés d'administrador, intenteu-ho de nou."
-StrCpy $UAC_ERROR_LOGON_SERVICE "El servei de inici de sessió no s'està executant, s'està abortant!"
 StrCpy $INIT_UNINSTALLER_RUNNING "El desinstal·lador ja s'està executant."
 StrCpy $SectionGroup_Shortcuts "Dreceres"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
@@ -30,7 +30,7 @@ StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Z
 StrCpy $UNINSTALLER_FILE_Detail "Zapisuji odinstal tor"
 StrCpy $UNINSTALLER_REGISTRY_Detail "Zapisuji instal tor do registr…"
 StrCpy $UNINSTALLER_FINISHED_Detail "DokonŸeno"
-StrCpy $UNINSTALL_MESSAGEBOX "Nezd  se, §e ${APPLICATION_NAME} je nainstalov na v adres ýi '$INSTDIR'.$\n$\nChcete pokraŸovat (nedoporuŸuje se)?"
+StrCpy $UNINSTALL_MESSAGEBOX "Nezd  se, §e ${APPLICATION_NAME} je nainstalov na ve slo§ce '$INSTDIR'.$\n$\nChcete pokraŸovat (nedoporuŸuje se)?"
 StrCpy $UNINSTALL_ABORT "Odinstalace zruçena u§ivatelem"
 StrCpy $INIT_NO_QUICK_LAUNCH "Z stupce rychl‚ho spuçtØn¡ (nen¡ k dispozici)"
 StrCpy $INIT_NO_DESKTOP "Z stupce na ploçe (pýep¡çe existuj¡c¡)"
@@ -1,5 +1,5 @@
 # Auto-generated - do not modify
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Toon opmerkingen bij deze versie"
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Toon opmerkingen bij deze uitgave"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Gevonden ${APPLICATION_EXECUTABLE} proces(sen) moet worden gestopt.$\nWilt u dat het installatieprogramma dat voor u doet?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Stoppen ${APPLICATION_EXECUTABLE} processen."
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Het te stoppen proces is niet gevonden!"
@@ -9,7 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "インストール済"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "${APPLICATION_NAME} のインストール方法を選択する"
 StrCpy $PageReinstall_OLD_Field_1 "${APPLICATION_NAME} の最新バージョンがすでにインストールされています。$\n旧バージョンのインストールはお勧めしません。旧バージョンのインストールが本当に必要な場合は、まず最新バージョンをアンインストールしてから、旧バージョンをインストールしてください。$\nオペレーションを選択し、次へをクリックする。"
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} は、${VERSION} がすでにインストールされています。$\n$\n実行したい操作を選択して、次へをクリックしてください。"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} は、${VERSION} が既にインストールされています。$\n$\n実行したい操作を選択し、次へをクリックする。"
 StrCpy $PageReinstall_SAME_Field_2 "追加/再インストールコンポーネント"
 StrCpy $PageReinstall_SAME_Field_3 "${APPLICATION_NAME} をアンインストール"
 StrCpy $UNINSTALLER_APPDATA_TITLE "${APPLICATION_NAME} をアンインストール"
@@ -1,14 +1,14 @@
 # Auto-generated - do not modify
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar notas de lançamento"
-StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Encontrados ${APPLICATION_EXECUTABLE} processo(s) em execução que precisa(m) de ser interrompido(s).$\nDeseja que o instalador o(s) termine por si?"
-StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "A terminar os processos de ${APPLICATION_EXECUTABLE}."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Não foi encontrado o processo para terminar!"
-StrCpy $PageReinstall_NEW_Field_1 "Está instalada no sistema uma versão antiga de ${APPLICATION_NAME}. É recomendado que desinstale a versão atual antes de instalar a mais recente. Selecione a operação que deseja executar e clique em $\"Seguinte$\" para continuar."
+StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "Existem ${APPLICATION_EXECUTABLE} processo(s) em execução que precisa(m) de ser interrompido(s).$\nDeseja que o instalador o(s) termine automaticamente?"
+StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "A terminar os processos ${APPLICATION_EXECUTABLE}."
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "Não foi encontrado o processo a terminar!"
+StrCpy $PageReinstall_NEW_Field_1 "Uma versão antiga de ${APPLICATION_NAME} está instalada no sistema. É recomendado que você desinstale a versão atual antes de instalar a mais recente. Selecione a operação que deseja executar e clique em $\"Avançar$\" para continuar."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
 StrCpy $PageReinstall_NEW_Field_3 "Não desinstale"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Já instalado"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Escolha como pretende instalar ${APPLICATION_NAME}."
-StrCpy $PageReinstall_OLD_Field_1 "Uma versão mais recente da aplicação ${APPLICATION_NAME}  já está instalada! Não é recomendada a instalação de uma versão mais antiga. Se realmente deseja instalar esta versão, aconselha-se a desinstalação da versão atual primeiro. Selecione a operação que deseja executar e clique em Avançar para continuar."
+StrCpy $PageReinstall_OLD_Field_1 "Uma versão mais recente do ${APPLICATION_NAME}  já está instalada! Não é recomendada a instalação de uma versão mais antiga. Se realmente deseja instalar esta versão, aconselha-se a desinstalação da versão atual primeiro. Selecione a operação que deseja executar e clique em Avançar para continuar."
 StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} já está instalada.$\nSelecione a operação que deseja realizar e clique em 'Seguinte' para continuar."
 StrCpy $PageReinstall_SAME_Field_2 "Adicionar/Reinstalar Componentes"
 StrCpy $PageReinstall_SAME_Field_3 "Desinstalar ${APPLICATION_NAME}"
@@ -20,17 +20,17 @@ StrCpy $OPTION_SECTION_SC_SHELL_EXT_DetailPrint "A instalar integração para Wi
 StrCpy $OPTION_SECTION_SC_START_MENU_SECTION "Atalho  do progama no Menu Inicial"
 StrCpy $OPTION_SECTION_SC_START_MENU_DetailPrint "A adicionar o atalho de ${APPLICATION_NAME} ao Menu Inicial."
 StrCpy $OPTION_SECTION_SC_DESKTOP_SECTION "Atalho da área de trabalho"
-StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "A criar atalhos na área de trabalho"
+StrCpy $OPTION_SECTION_SC_DESKTOP_DetailPrint "A criar atalhos da área de trabalho"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_SECTION "Atalho de início rápido"
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_DetailPrint "A criar atalho de início rápido"
 StrCpy $OPTION_SECTION_SC_APPLICATION_Desc "O essencial de ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_START_MENU_Desc "Atalho de ${APPLICATION_NAME}."
-StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Atalho do ambiente de trabalho para ${APPLICATION_NAME}."
+StrCpy $OPTION_SECTION_SC_DESKTOP_Desc "Atalho no ambiente de trabalho de ${APPLICATION_NAME}."
 StrCpy $OPTION_SECTION_SC_QUICK_LAUNCH_Desc "Atalho de início rápido de ${APPLICATION_NAME}."
 StrCpy $UNINSTALLER_FILE_Detail "A escrever o Desinstalador"
 StrCpy $UNINSTALLER_REGISTRY_Detail "A escrever chaves de registo do instalador"
 StrCpy $UNINSTALLER_FINISHED_Detail "Terminado"
-StrCpy $UNINSTALL_MESSAGEBOX "Não parece que a aplicação ${APPLICATION_NAME} esteja instalada no diretório '$INSTDIR'.$\n$\nContinuar na mesma (não recomendado)?"
+StrCpy $UNINSTALL_MESSAGEBOX "Não parece que ${APPLICATION_NAME} esteja instalado no diretório '$INSTDIR'.$\n$\nContinuar na mesma (não recomendado)?"
 StrCpy $UNINSTALL_ABORT "Desinstalação cancelada pelo utilizador"
 StrCpy $INIT_NO_QUICK_LAUNCH "Atalho de Início Rápido (N/A)"
 StrCpy $INIT_NO_DESKTOP "Atalho do Ambiente de Trabalho (sobrepõe o existente)"
@@ -9,7 +9,6 @@ StrCpy $PageReinstall_NEW_Field_3 "Neodin
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Už je nainštalovaný"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Vyberte si, ako chcete nainštalova� ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "Novšia verzia ${APPLICATION_NAME} je už nainštalovaná! Neodporúèam vám nainštalova� staršiu verziu. Ak naozaj chcete nainštalova� túto staršiu verziu, je lepšie najprv odinštalova� aktuálnu verziu. Vyberte operáciu, ktorú chcete vykona�, a kliknite na tlaèidlo Ïalej pre pokraèovanie."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} je už nainštalovaná.$\n$\nVyberte operáciu, ktorú chcete vykona�, a kliknite na tlaèidlo Ïalej pre pokraèovanie."
 StrCpy $PageReinstall_SAME_Field_2 "Prida�/Preinštalova� komponenty"
 StrCpy $PageReinstall_SAME_Field_3 "Odinštalova� ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Odinštalova� ${APPLICATION_NAME}"
@@ -38,6 +37,7 @@ StrCpy $UAC_ERROR_ELEVATE "Nemo
 StrCpy $UAC_INSTALLER_REQUIRE_ADMIN "Tento inštalátor vyžaduje admin prístup, skúste to znova"
 StrCpy $INIT_INSTALLER_RUNNING "Inštalátor je už spustený."
 StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Tento odinštalátor vyžaduje admin prístup, skúste to znova"
-StrCpy $UAC_ERROR_LOGON_SERVICE "Prihlasovacia služba nebeží! Prerušuje sa."
 StrCpy $INIT_UNINSTALLER_RUNNING "Odinštalátor je už spustený."
 StrCpy $SectionGroup_Shortcuts "Zástupcovia"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
+StrCpy $UAC_ERROR_LOGON_SERVICE "Logon service is not running, aborting!"
@@ -2,7 +2,7 @@
 StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "Mostrar las notas de la versión"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "El/los proceso/s ${APPLICATION_EXECUTABLE} debe/n ser detenidos.$\n¿Quiere que el instalador lo haga por usted?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "Deteniendo el/los proceso/s ${APPLICATION_EXECUTABLE}."
-StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "¡Proceso a finalizar no encontrado!"
+StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "¡Proceso para detener no encontrado!"
 StrCpy $PageReinstall_NEW_Field_1 "Una versión anterior de ${APPLICATION_NAME} se encuentra instalada en el sistema. Se recomienda de instalar la versión actual antes de instalar la nueva. Seleccione la operacion deseada y haga click en Siguiente para continuar."
 StrCpy $PageReinstall_NEW_Field_2 "Desinstalar antes de instalar"
 StrCpy $PageReinstall_NEW_Field_3 "No desinstalar"
@@ -9,7 +9,6 @@ StrCpy $PageReinstall_NEW_Field_3 "Avinstallera inte"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Redan installerad"
 StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Välj hur du vill installera ${APPLICATION_NAME}."
 StrCpy $PageReinstall_OLD_Field_1 "En nyare version av ${APPLICATION_NAME} är redan installerad! Det rekommenderas inte att du installerar en äldre version. Om du verkligen vill installera denna äldre versionen, är det bättre att du avinstallerar den nuvarande versionen först. Välj den åtgärd du vill utföra och klicka Nästa för att fortsätta."
-StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} är redan installerad.$\n$\nVälj den åtgärd du vill utföra och klicka på Nästa för att fortsätta."
 StrCpy $PageReinstall_SAME_Field_2 "Lägg till/Ominstallera komponenter"
 StrCpy $PageReinstall_SAME_Field_3 "Avinstallera ${APPLICATION_NAME}"
 StrCpy $UNINSTALLER_APPDATA_TITLE "Avinstallera ${APPLICATION_NAME}"
@@ -41,3 +40,4 @@ StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Detta avinstallationsprogram  kräver adm
 StrCpy $UAC_ERROR_LOGON_SERVICE "Login-service körs inte, avbryter!"
 StrCpy $INIT_UNINSTALLER_RUNNING "Avinstallationsprogrammet körs redan."
 StrCpy $SectionGroup_Shortcuts "Genvägar"
+StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue."
@@ -1,5 +1,5 @@
 # Auto-generated - do not modify
-StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "แสดงบันทึกที่มี"
+StrCpy $MUI_FINISHPAGE_SHOWREADME_TEXT_STRING "แสดงบันทึกประจำรุ่น"
 StrCpy $ConfirmEndProcess_MESSAGEBOX_TEXT "พบว่ากระบวนการ ${APPLICATION_EXECUTABLE} จะต้องหยุดทำงาน$\nคุณต้องการติดตั้งเพื่อหยุดการทำงานเหล่านี้ของคุณ?"
 StrCpy $ConfirmEndProcess_KILLING_PROCESSES_TEXT "ฆ่ากระบวนการทำงาน ${APPLICATION_EXECUTABLE}"
 StrCpy $ConfirmEndProcess_KILL_NOT_FOUND_TEXT "ไม่พบการฆ่ากระบวนการ!"
@@ -2,27 +2,27 @@
 !insertmacro MUI_LANGUAGE "Swedish"
 !insertmacro MUI_LANGUAGE "Estonian"
 !insertmacro MUI_LANGUAGE "Turkish"
-!insertmacro MUI_LANGUAGE "PortugueseBR"
 !insertmacro MUI_LANGUAGE "Slovenian"
 !insertmacro MUI_LANGUAGE "SpanishInternational"
 !insertmacro MUI_LANGUAGE "Dutch"
-!insertmacro MUI_LANGUAGE "Norwegian"
 !insertmacro MUI_LANGUAGE "Hungarian"
 !insertmacro MUI_LANGUAGE "Ukrainian"
 !insertmacro MUI_LANGUAGE "French"
-!insertmacro MUI_LANGUAGE "Catalan"
+!insertmacro MUI_LANGUAGE "Norwegian"
 !insertmacro MUI_LANGUAGE "Russian"
 !insertmacro MUI_LANGUAGE "Thai"
 !insertmacro MUI_LANGUAGE "Finnish"
 !insertmacro MUI_LANGUAGE "Basque"
 !insertmacro MUI_LANGUAGE "Greek"
 !insertmacro MUI_LANGUAGE "SimpChinese"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+!insertmacro MUI_LANGUAGE "Catalan"
 !insertmacro MUI_LANGUAGE "Italian"
 !insertmacro MUI_LANGUAGE "Portuguese"
-!insertmacro MUI_LANGUAGE "Czech"
+!insertmacro MUI_LANGUAGE "German"
 !insertmacro MUI_LANGUAGE "Japanese"
 !insertmacro MUI_LANGUAGE "Galician"
-!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Czech"
 !insertmacro MUI_LANGUAGE "Slovak"
 !insertmacro MUI_LANGUAGE "Spanish"
 !insertmacro MUI_LANGUAGE "Polish"
@@ -32,7 +32,7 @@ find_library(CMOCKA_LIBRARY
    NAMES
        cmocka
    PATHS
-        ${CMOCKA_ROOT_DIR}/lib
+        ${CMOCKA_ROOT_DIR}/include
 )

 if (CMOCKA_LIBRARY)
@@ -22,18 +22,12 @@ if( Qt5Core_FOUND )
        find_package(Qt5Test REQUIRED)
    endif()
    if(NOT TOKEN_AUTH_ONLY)
+        find_package(Qt5WebKitWidgets REQUIRED)
+        find_package(Qt5WebKit REQUIRED)
        find_package(Qt5Widgets REQUIRED)
        if(APPLE)
           find_package(Qt5MacExtras REQUIRED)
        endif(APPLE)
-
-        if(NOT NO_SHIBBOLETH)
-            find_package(Qt5WebKitWidgets)
-            find_package(Qt5WebKit)
-            if(NOT Qt5WebKitWidgets_FOUND)
-                message(FATAL_ERROR "Qt5WebKit required for Shibboleth. Use -DNO_SHIBBOLETH=1 to disable it.")
-            endif()
-        endif()
    endif()

 else( Qt5Core_FOUND )
@@ -2,23 +2,21 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING* file.

-if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -Wno-long-long")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")

-    if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-        execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-                        OUTPUT_VARIABLE GCC_VERSION)
-        if(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpedantic")
-        else(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
-        endif(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
-    else()
+if(CMAKE_COMPILER_IS_GNUCXX)
+    execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
+                    OUTPUT_VARIABLE GCC_VERSION)
+    if(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpedantic")
+    else(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
-    endif()
+    endif(GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8)
+else()
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
+endif(CMAKE_COMPILER_IS_GNUCXX)

-    if(DEFINED MIRALL_FATAL_WARNINGS)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-    endif(DEFINED MIRALL_FATAL_WARNINGS)
-endif()
+if(DEFINED MIRALL_FATAL_WARNINGS)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+endif(DEFINED MIRALL_FATAL_WARNINGS)
@@ -23,6 +23,4 @@
 #cmakedefine SYSCONFDIR "@SYSCONFDIR@"
 #cmakedefine SHAREDIR "@SHAREDIR@"

-#cmakedefine WITH_UNIT_TESTING 1
-
 #endif
@@ -41,8 +41,6 @@ endif (MEM_NULL_TESTS)
 add_subdirectory(src)

 if (UNIT_TESTING)
-    set(WITH_UNIT_TESTING ON)
-
    find_package(CMocka)
    if (CMOCKA_FOUND)
        include(AddCMockaTest)
@@ -62,4 +62,8 @@ if (WIN32)
  check_function_exists(__mingw_asprintf HAVE___MINGW_ASPRINTF)
 endif(WIN32)

+if (UNIT_TESTING)
+    set(WITH_UNIT_TESTING ON)
+endif (UNIT_TESTING)
+
 set(CSYNC_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} CACHE INTERNAL "csync required system libraries")
@@ -81,13 +81,6 @@ set(csync_HDRS
 # Statically include sqlite
 if (USE_OUR_OWN_SQLITE3)
    list(APPEND csync_SRCS ${SQLITE3_SOURCE})
-    if (WIN32)
-        # We want to export sqlite symbols from the ocsync DLL without
-        # having to patch both sqlite3.h and the amalgation sqlite3.c,
-        # so do the import/export magic manually through the build system.
-        remove_definitions(-DSQLITE_API=__declspec\(dllimport\))
-        add_definitions(-DSQLITE_API=__declspec\(dllexport\))
-    endif()
 endif()

 include_directories(
@@ -98,12 +91,6 @@ include_directories(
 add_library(${CSYNC_LIBRARY} SHARED ${csync_SRCS})
 #add_library(${CSYNC_LIBRARY}_static STATIC ${csync_SRCS})

-generate_export_header( ${CSYNC_LIBRARY}
-  BASE_NAME ${CSYNC_LIBRARY}
-  EXPORT_MACRO_NAME OCSYNC_EXPORT
-  EXPORT_FILE_NAME ocsynclib.h
-)
-
 target_link_libraries(${CSYNC_LIBRARY} ${CSYNC_LINK_LIBRARIES})
 #target_link_libraries(${CSYNC_LIBRARY}_static ${CSYNC_LINK_LIBRARIES})

@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <stdbool.h>

@@ -89,7 +90,7 @@ static int _data_cmp(const void *key, const void *data) {
  return 0;
 }

-void csync_create(CSYNC **csync, const char *local) {
+void csync_create(CSYNC **csync, const char *local, const char *remote) {
  CSYNC *ctx;
  size_t len = 0;

@@ -103,6 +104,12 @@ void csync_create(CSYNC **csync, const char *local) {

  ctx->local.uri = c_strndup(local, len);

+  /* remove trailing slashes */
+  len = strlen(remote);
+  while(len > 0 && remote[len - 1] == '/') --len;
+
+  ctx->remote.uri = c_strndup(remote, len);
+
  ctx->status_code = CSYNC_STATUS_OK;

  ctx->current_fs = NULL;
@@ -114,7 +121,7 @@ void csync_create(CSYNC **csync, const char *local) {
  *csync = ctx;
 }

-void csync_init(CSYNC *ctx, const char *db_file) {
+void csync_init(CSYNC *ctx) {
  assert(ctx);
  /* Do not initialize twice */

@@ -125,9 +132,6 @@ void csync_init(CSYNC *ctx, const char *db_file) {

  ctx->remote.type = REMOTE_REPLICA;

-  SAFE_FREE(ctx->statedb.file);
-  ctx->statedb.file = c_strdup(db_file);
-
  c_rbtree_create(&ctx->local.tree, _key_cmp, _data_cmp);
  c_rbtree_create(&ctx->remote.tree, _key_cmp, _data_cmp);

@@ -149,11 +153,19 @@ int csync_update(CSYNC *ctx) {
  }
  ctx->status_code = CSYNC_STATUS_OK;

-  /* Path of database file is set in csync_init */
-  if (csync_statedb_load(ctx, ctx->statedb.file, &ctx->statedb.db) < 0) {
+  /* create/load statedb */
+    rc = asprintf(&ctx->statedb.file, "%s/.csync_journal.db",
+                  ctx->local.uri);
+    if (rc < 0) {
+        ctx->status_code = CSYNC_STATUS_MEMORY_ERROR;
+        return rc;
+    }
+    CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "Journal: %s", ctx->statedb.file);
+
+    if (csync_statedb_load(ctx, ctx->statedb.file, &ctx->statedb.db) < 0) {
      rc = -1;
      return rc;
-  }
+    }

  ctx->status_code = CSYNC_STATUS_OK;

@@ -188,7 +200,7 @@ int csync_update(CSYNC *ctx) {
  ctx->current = REMOTE_REPLICA;
  ctx->replica = ctx->remote.type;

-  rc = csync_ftw(ctx, "", csync_walker, MAX_DEPTH);
+  rc = csync_ftw(ctx, ctx->remote.uri, csync_walker, MAX_DEPTH);
  if (rc < 0) {
      if(ctx->status_code == CSYNC_STATUS_OK) {
          ctx->status_code = csync_errno_to_status(errno, CSYNC_STATUS_UPDATE_ERROR);
@@ -375,6 +387,7 @@ static int _csync_treewalk_visitor(void *obj, void *data) {
      trav.inode        = cur->inode;

      trav.error_status = cur->error_status;
+      trav.should_update_metadata = cur->should_update_metadata;
      trav.has_ignored_files = cur->has_ignored_files;
      trav.checksum = cur->checksum;
      trav.checksumTypeId = cur->checksumTypeId;
@@ -510,6 +523,7 @@ static void _csync_clean_ctx(CSYNC *ctx)
    c_rbtree_free(ctx->local.tree);
    c_rbtree_free(ctx->remote.tree);

+    SAFE_FREE(ctx->statedb.file);
    SAFE_FREE(ctx->remote.root_perms);
 }

@@ -566,8 +580,8 @@ int csync_destroy(CSYNC *ctx) {

  _csync_clean_ctx(ctx);

-  SAFE_FREE(ctx->statedb.file);
  SAFE_FREE(ctx->local.uri);
+  SAFE_FREE(ctx->remote.uri);
  SAFE_FREE(ctx->error_string);

 #ifdef WITH_ICONV
@@ -33,10 +33,10 @@
 #define _CSYNC_H

 #include "std/c_private.h"
-#include "ocsynclib.h"
 #include <sys/stat.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <config_csync.h>

@@ -98,7 +98,6 @@ enum csync_status_codes_e {
    CSYNC_STATUS_INDIVIDUAL_IS_SYMLINK,
    CSYNC_STATUS_INDIVIDUAL_IGNORE_LIST,
    CSYNC_STATUS_INDIVIDUAL_IS_INVALID_CHARS,
-    CSYNC_STATUS_INDIVIDUAL_TRAILING_SPACE,
    CSYNC_STATUS_INDIVIDUAL_EXCLUDE_LONG_FILENAME,
    CYSNC_STATUS_FILE_LOCKED_OR_OPEN,
    CSYNC_STATUS_INDIVIDUAL_EXCLUDE_HIDDEN,
@@ -125,22 +124,20 @@ typedef enum csync_status_codes_e CSYNC_STATUS;
  * the csync state of a file.
  */
 enum csync_instructions_e {
-  CSYNC_INSTRUCTION_NONE            = 0x00000000,  /* Nothing to do (UPDATE|RECONCILE) */
-  CSYNC_INSTRUCTION_EVAL            = 0x00000001,  /* There was changed compared to the DB (UPDATE) */
-  CSYNC_INSTRUCTION_REMOVE          = 0x00000002,  /* The file need to be removed (RECONCILE) */
-  CSYNC_INSTRUCTION_RENAME          = 0x00000004,  /* The file need to be renamed (RECONCILE) */
-  CSYNC_INSTRUCTION_EVAL_RENAME     = 0x00000800,  /* The file is new, it is the destination of a rename (UPDATE) */
-  CSYNC_INSTRUCTION_NEW             = 0x00000008,  /* The file is new compared to the db (UPDATE) */
-  CSYNC_INSTRUCTION_CONFLICT        = 0x00000010,  /* The file need to be downloaded because it is a conflict (RECONCILE) */
-  CSYNC_INSTRUCTION_IGNORE          = 0x00000020,  /* The file is ignored (UPDATE|RECONCILE) */
-  CSYNC_INSTRUCTION_SYNC            = 0x00000040,  /* The file need to be pushed to the other remote (RECONCILE) */
-  CSYNC_INSTRUCTION_STAT_ERROR      = 0x00000080,
-  CSYNC_INSTRUCTION_ERROR           = 0x00000100,
-  CSYNC_INSTRUCTION_TYPE_CHANGE     = 0x00000200,  /* Like NEW, but deletes the old entity first (RECONCILE)
-                                                      Used when the type of something changes from directory to file
-                                                      or back. */
-  CSYNC_INSTRUCTION_UPDATE_METADATA = 0x00000400,  /* If the etag has been updated and need to be writen to the db,
-                                                      but without any propagation (UPDATE|RECONCILE) */
+  CSYNC_INSTRUCTION_NONE       = 0x00000000,  /* Nothing to do (UPDATE|RECONCILE) */
+  CSYNC_INSTRUCTION_EVAL       = 0x00000001,  /* There was changed compared to the DB (UPDATE) */
+  CSYNC_INSTRUCTION_REMOVE     = 0x00000002,  /* The file need to be removed (RECONCILE) */
+  CSYNC_INSTRUCTION_RENAME     = 0x00000004,  /* The file need to be renamed (RECONCILE) */
+  CSYNC_INSTRUCTION_EVAL_RENAME= 0x00000800,  /* The file is new, it is the destination of a rename (UPDATE) */
+  CSYNC_INSTRUCTION_NEW        = 0x00000008,  /* The file is new compared to the db (UPDATE) */
+  CSYNC_INSTRUCTION_CONFLICT   = 0x00000010,  /* The file need to be downloaded because it is a conflict (RECONCILE) */
+  CSYNC_INSTRUCTION_IGNORE     = 0x00000020,  /* The file is ignored (UPDATE|RECONCILE) */
+  CSYNC_INSTRUCTION_SYNC       = 0x00000040,  /* The file need to be pushed to the other remote (RECONCILE) */
+  CSYNC_INSTRUCTION_STAT_ERROR = 0x00000080,
+  CSYNC_INSTRUCTION_ERROR      = 0x00000100,
+  CSYNC_INSTRUCTION_TYPE_CHANGE = 0x0000200,  /* Like NEW, but deletes the old entity first (RECONCILE)
+                                                 Used when the type of something changes from directory to file
+                                                 or back. */
 };

 enum csync_ftw_type_e {
@@ -229,14 +226,14 @@ struct csync_vio_file_stat_s {
  char *original_name; // only set if locale conversion fails
 };

-csync_vio_file_stat_t OCSYNC_EXPORT *csync_vio_file_stat_new(void);
-csync_vio_file_stat_t OCSYNC_EXPORT *csync_vio_file_stat_copy(csync_vio_file_stat_t *file_stat);
+csync_vio_file_stat_t *csync_vio_file_stat_new(void);
+csync_vio_file_stat_t *csync_vio_file_stat_copy(csync_vio_file_stat_t *file_stat);

-void OCSYNC_EXPORT csync_vio_file_stat_destroy(csync_vio_file_stat_t *fstat);
+void csync_vio_file_stat_destroy(csync_vio_file_stat_t *fstat);

-void OCSYNC_EXPORT csync_vio_file_stat_set_file_id( csync_vio_file_stat_t* dst, const char* src );
+void csync_vio_file_stat_set_file_id( csync_vio_file_stat_t* dst, const char* src );

-void OCSYNC_EXPORT csync_vio_set_file_id(char* dst, const char *src );
+void csync_vio_set_file_id(char* dst, const char *src );


 /**
@@ -256,6 +253,9 @@ struct csync_tree_walk_file_s {
    enum csync_ftw_type_e     type;
    enum csync_instructions_e instruction;

+    /* For directories: If the etag has been updated and need to be writen on the db */
+    int         should_update_metadata;
+
    /* For directories: Does it have children that were ignored (hidden or ignore pattern) */
    int         has_ignored_files;

@@ -317,7 +317,7 @@ typedef const char* (*csync_checksum_hook) (
 *
 * @param csync  The context variable to allocate.
 */
-void OCSYNC_EXPORT csync_create(CSYNC **csync, const char *local);
+void csync_create(CSYNC **csync, const char *local, const char *remote);

 /**
 * @brief Initialize the file synchronizer.
@@ -326,7 +326,7 @@ void OCSYNC_EXPORT csync_create(CSYNC **csync, const char *local);
 *
 * @param ctx  The context to initialize.
 */
-void OCSYNC_EXPORT csync_init(CSYNC *ctx, const char *db_file);
+void csync_init(CSYNC *ctx);

 /**
 * @brief Update detection
@@ -335,7 +335,7 @@ void OCSYNC_EXPORT csync_init(CSYNC *ctx, const char *db_file);
 *
 * @return  0 on success, less than 0 if an error occurred.
 */
-int OCSYNC_EXPORT csync_update(CSYNC *ctx);
+int csync_update(CSYNC *ctx);

 /**
 * @brief Reconciliation
@@ -344,7 +344,7 @@ int OCSYNC_EXPORT csync_update(CSYNC *ctx);
 *
 * @return  0 on success, less than 0 if an error occurred.
 */
-int OCSYNC_EXPORT csync_reconcile(CSYNC *ctx);
+int csync_reconcile(CSYNC *ctx);

 /**
 * @brief Re-initializes the csync context
@@ -353,7 +353,7 @@ int OCSYNC_EXPORT csync_reconcile(CSYNC *ctx);
 *
 * @return  0 on success, less than 0 if an error occurred.
 */
-int OCSYNC_EXPORT csync_commit(CSYNC *ctx);
+int csync_commit(CSYNC *ctx);

 /**
 * @brief Destroy the csync context
@@ -364,7 +364,7 @@ int OCSYNC_EXPORT csync_commit(CSYNC *ctx);
 *
 * @return  0 on success, less than 0 if an error occurred.
 */
-int OCSYNC_EXPORT csync_destroy(CSYNC *ctx);
+int csync_destroy(CSYNC *ctx);

 /**
 * @brief Get the userdata saved in the context.
@@ -386,7 +386,7 @@ void *csync_get_userdata(CSYNC *ctx);
 *
 * @return              0 on success, less than 0 if an error occurred.
 */
-int OCSYNC_EXPORT csync_set_userdata(CSYNC *ctx, void *userdata);
+int csync_set_userdata(CSYNC *ctx, void *userdata);

 /**
 * @brief Get the authentication callback set.
@@ -396,7 +396,7 @@ int OCSYNC_EXPORT csync_set_userdata(CSYNC *ctx, void *userdata);
 * @return              The authentication callback set or NULL if an error
 *                      occurred.
 */
-csync_auth_callback OCSYNC_EXPORT csync_get_auth_callback(CSYNC *ctx);
+csync_auth_callback csync_get_auth_callback(CSYNC *ctx);

 /**
 * @brief Set the authentication callback.
@@ -407,7 +407,7 @@ csync_auth_callback OCSYNC_EXPORT csync_get_auth_callback(CSYNC *ctx);
 *
 * @return              0 on success, less than 0 if an error occurred.
 */
-int OCSYNC_EXPORT csync_set_auth_callback(CSYNC *ctx, csync_auth_callback cb);
+int csync_set_auth_callback(CSYNC *ctx, csync_auth_callback cb);

 /**
 * @brief Set the log level.
@@ -416,14 +416,14 @@ int OCSYNC_EXPORT csync_set_auth_callback(CSYNC *ctx, csync_auth_callback cb);
 *
 * @return 0 on success, < 0 if an error occurred.
 */
-int OCSYNC_EXPORT csync_set_log_level(int level);
+int csync_set_log_level(int level);

 /**
 * @brief Get the log verbosity
 *
 * @return            The log verbosity, -1 on error.
 */
-int OCSYNC_EXPORT csync_get_log_level(void);
+int csync_get_log_level(void);

 /**
 * @brief Get the logging callback set.
@@ -431,7 +431,7 @@ int OCSYNC_EXPORT csync_get_log_level(void);
 * @return              The logging callback set or NULL if an error
 *                      occurred.
 */
-csync_log_callback OCSYNC_EXPORT csync_get_log_callback(void);
+csync_log_callback csync_get_log_callback(void);

 /**
 * @brief Set the logging callback.
@@ -440,14 +440,14 @@ csync_log_callback OCSYNC_EXPORT csync_get_log_callback(void);
 *
 * @return              0 on success, less than 0 if an error occurred.
 */
-int OCSYNC_EXPORT csync_set_log_callback(csync_log_callback cb);
+int csync_set_log_callback(csync_log_callback cb);

 /**
 * @brief get the userdata set for the logging callback.
 *
 * @return              The userdata or NULL.
 */
-void OCSYNC_EXPORT *csync_get_log_userdata(void);
+void *csync_get_log_userdata(void);

 /**
 * @brief Set the userdata passed to the logging callback.
@@ -456,13 +456,13 @@ void OCSYNC_EXPORT *csync_get_log_userdata(void);
 *
 * @return              0 on success, less than 0 if an error occurred.
 */
-int OCSYNC_EXPORT csync_set_log_userdata(void *data);
+int csync_set_log_userdata(void *data);

 /* Used for special modes or debugging */
-CSYNC_STATUS OCSYNC_EXPORT csync_get_status(CSYNC *ctx);
+CSYNC_STATUS csync_get_status(CSYNC *ctx);

 /* Used for special modes or debugging */
-int OCSYNC_EXPORT csync_set_status(CSYNC *ctx, int status);
+int csync_set_status(CSYNC *ctx, int status);

 typedef int csync_treewalk_visit_func(TREE_WALK_FILE* ,void*);

@@ -475,7 +475,7 @@ typedef int csync_treewalk_visit_func(TREE_WALK_FILE* ,void*);
 *
 * @return              0 on success, less than 0 if an error occurred.
 */
-int OCSYNC_EXPORT csync_walk_local_tree(CSYNC *ctx, csync_treewalk_visit_func *visitor, int filter);
+int csync_walk_local_tree(CSYNC *ctx, csync_treewalk_visit_func *visitor, int filter);

 /**
 * @brief Walk the remote file tree and call a visitor function for each file.
@@ -486,7 +486,7 @@ int OCSYNC_EXPORT csync_walk_local_tree(CSYNC *ctx, csync_treewalk_visit_func *v
 *
 * @return              0 on success, less than 0 if an error occurred.
 */
-int OCSYNC_EXPORT csync_walk_remote_tree(CSYNC *ctx, csync_treewalk_visit_func *visitor, int filter);
+int csync_walk_remote_tree(CSYNC *ctx, csync_treewalk_visit_func *visitor, int filter);

 /**
 * @brief Get the csync status string.
@@ -495,7 +495,7 @@ int OCSYNC_EXPORT csync_walk_remote_tree(CSYNC *ctx, csync_treewalk_visit_func *
 *
 * @return               A const pointer to a string with more precise status info.
 */
-const char OCSYNC_EXPORT *csync_get_status_string(CSYNC *ctx);
+const char *csync_get_status_string(CSYNC *ctx);

 #ifdef WITH_ICONV
 /**
@@ -505,7 +505,7 @@ const char OCSYNC_EXPORT *csync_get_status_string(CSYNC *ctx);
 *
 * @return              0 on success, or an iconv error number.
 */
-int OCSYNC_EXPORT csync_set_iconv_codec(const char *from);
+int csync_set_iconv_codec(const char *from);
 #endif

 /**
@@ -513,24 +513,24 @@ int OCSYNC_EXPORT csync_set_iconv_codec(const char *from);
 *
 * @param ctx           The csync context.
 */
-void OCSYNC_EXPORT csync_request_abort(CSYNC *ctx);
+void csync_request_abort(CSYNC *ctx);

 /**
 * @brief Clears the abort flag. Can be called from another thread.
 *
 * @param ctx           The csync context.
 */
-void OCSYNC_EXPORT csync_resume(CSYNC *ctx);
+void csync_resume(CSYNC *ctx);

 /**
 * @brief Checks for the abort flag, to be used from the modules.
 *
 * @param ctx           The csync context.
 */
-int  OCSYNC_EXPORT csync_abort_requested(CSYNC *ctx);
+int  csync_abort_requested(CSYNC *ctx);

-char OCSYNC_EXPORT *csync_normalize_etag(const char *);
-time_t OCSYNC_EXPORT oc_httpdate_parse( const char *date );
+char *csync_normalize_etag(const char *);
+time_t oc_httpdate_parse( const char *date );

 #ifdef __cplusplus
 }
@@ -28,6 +28,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <unistd.h>

 #include "c_lib.h"
 #include "c_private.h"
@@ -36,16 +37,10 @@
 #include "csync_exclude.h"
 #include "csync_misc.h"

-#ifdef _WIN32
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
 #define CSYNC_LOG_CATEGORY_NAME "csync.exclude"
 #include "csync_log.h"

-#ifndef WITH_UNIT_TESTING
+#ifndef NDEBUG
 static
 #endif
 int _csync_exclude_add(c_strlist_t **inList, const char *string) {
@@ -230,11 +225,6 @@ static CSYNC_EXCLUDE_TYPE _csync_excluded_common(c_strlist_t *excludes, const ch
    }
    blen = strlen(bname);

-    rc = csync_fnmatch("._sync_*.db*", bname, 0);
-    if (rc == 0) {
-        match = CSYNC_FILE_SILENTLY_EXCLUDED;
-        goto out;
-    }
    rc = csync_fnmatch(".csync_journal.db*", bname, 0);
    if (rc == 0) {
        match = CSYNC_FILE_SILENTLY_EXCLUDED;
@@ -253,14 +243,9 @@ static CSYNC_EXCLUDE_TYPE _csync_excluded_common(c_strlist_t *excludes, const ch
    // 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)
-    if (blen > 1) {
-        if (bname[blen-1]== ' ') {
-            match = CSYNC_FILE_EXCLUDE_TRAILING_SPACE;
-            goto out;
-        } else if (bname[blen-1]== '.' ) {
-            match = CSYNC_FILE_EXCLUDE_INVALID_CHAR;
-            goto out;
-        }
+    if (blen > 1 && (bname[blen-1]== ' ' || bname[blen-1]== '.' )) {
+        match = CSYNC_FILE_EXCLUDE_INVALID_CHAR;
+        goto out;
    }

    if (csync_is_windows_reserved_word(bname)) {
@@ -21,23 +21,20 @@
 #ifndef _CSYNC_EXCLUDE_H
 #define _CSYNC_EXCLUDE_H

-#include "ocsynclib.h"
-
 enum csync_exclude_type_e {
  CSYNC_NOT_EXCLUDED   = 0,
  CSYNC_FILE_SILENTLY_EXCLUDED,
  CSYNC_FILE_EXCLUDE_AND_REMOVE,
  CSYNC_FILE_EXCLUDE_LIST,
  CSYNC_FILE_EXCLUDE_INVALID_CHAR,
-  CSYNC_FILE_EXCLUDE_TRAILING_SPACE,
  CSYNC_FILE_EXCLUDE_LONG_FILENAME,
  CSYNC_FILE_EXCLUDE_HIDDEN,
  CSYNC_FILE_EXCLUDE_STAT_FAILED
 };
 typedef enum csync_exclude_type_e CSYNC_EXCLUDE_TYPE;

-#ifdef WITH_UNIT_TESTING
-int OCSYNC_EXPORT _csync_exclude_add(c_strlist_t **inList, const char *string);
+#ifdef NDEBUG
+int _csync_exclude_add(c_strlist_t **inList, const char *string);
 #endif

 /**
@@ -48,7 +45,7 @@ int OCSYNC_EXPORT _csync_exclude_add(c_strlist_t **inList, const char *string);
 *
 * @return  0 on success, -1 if an error occurred with errno set.
 */
-int OCSYNC_EXPORT csync_exclude_load(const char *fname, c_strlist_t **list);
+int csync_exclude_load(const char *fname, c_strlist_t **list);

 /**
 * @brief Check if the given path should be excluded in a traversal situation.
@@ -74,7 +71,7 @@ CSYNC_EXCLUDE_TYPE csync_excluded_traversal(c_strlist_t *excludes, const char *p
 * @param filetype
 * @return
 */
-CSYNC_EXCLUDE_TYPE OCSYNC_EXPORT csync_excluded_no_ctx(c_strlist_t *excludes, 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 */

 /**
@@ -23,6 +23,12 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
+#ifndef _WIN32
+#include <sys/time.h>
+#else
+#include <sys/utime.h>
+#endif
+#include <time.h>

 #include "csync_private.h"
 #include "csync_log.h"
@@ -31,11 +37,46 @@ CSYNC_THREAD int csync_log_level;
 CSYNC_THREAD csync_log_callback csync_log_cb;
 CSYNC_THREAD void *csync_log_userdata;

+static int current_timestring(int hires, char *buf, size_t len)
+{
+    char tbuf[64];
+    struct timeval tv;
+    struct tm *tm;
+    time_t t;
+
+    gettimeofday(&tv, NULL);
+    t = (time_t) tv.tv_sec;
+
+    tm = localtime(&t);
+    if (tm == NULL) {
+        return -1;
+    }
+
+    if (hires) {
+        strftime(tbuf, sizeof(tbuf) - 1, "%Y/%m/%d %H:%M:%S", tm);
+        snprintf(buf, len, "%s.%06ld", tbuf, (long) tv.tv_usec);
+    } else {
+        strftime(tbuf, sizeof(tbuf) - 1, "%Y/%m/%d %H:%M:%S", tm);
+        snprintf(buf, len, "%s", tbuf);
+    }
+
+    return 0;
+}
+
 static void csync_log_stderr(int verbosity,
                             const char *function,
                             const char *buffer)
 {
-    fprintf(stderr, "[%d] %s", verbosity, function);
+    char date[64] = {0};
+    int rc;
+
+    rc = current_timestring(1, date, sizeof(date));
+    if (rc == 0) {
+        fprintf(stderr, "[%s, %d] %s:", date+5, verbosity, function);
+    } else {
+        fprintf(stderr, "[%d] %s", verbosity, function);
+    }
+
    fprintf(stderr, "  %s\n", buffer);
 }
 static void csync_log_function(int verbosity,
@@ -39,6 +39,7 @@
 # include <shlobj.h>
 #else /* _WIN32 */
 # include <pwd.h>
+# include <unistd.h>
 #endif /* _WIN32 */

 #include "c_lib.h"
@@ -36,7 +36,7 @@
 #define FNM_CASEFOLD    (1 << 4) /* Compare without regard to case.  */
 #endif

-int csync_fnmatch(const char *pattern, const char *name, int flags);
+int csync_fnmatch(__const char *__pattern, __const char *__name, int __flags);

 /**
 * @brief csync_errno_to_status - errno to csync status code
@@ -126,6 +126,7 @@ struct csync_s {
  } local;

  struct {
+    char *uri;
    c_rbtree_t *tree;
    enum csync_replica_e type;
    int  read_from_db;
@@ -185,6 +186,8 @@ struct csync_file_stat_s {
  mode_t mode;      /* u32 */
  unsigned int type                   : 4;
  unsigned int child_modified         : 1;
+  unsigned int should_update_metadata : 1; /*specify that the etag, or the remote perm or fileid has
+                                changed and need to be updated on the db even for INSTRUCTION_NONE */
  unsigned int has_ignored_files      : 1; /* specify that a directory, or child directory contains ignored files */

  char *destpath;   /* for renames */
@@ -223,6 +226,9 @@ struct _csync_treewalk_context_s
 };
 typedef struct _csync_treewalk_context_s _csync_treewalk_context;

+
+time_t oc_httpdate_parse( const char *date );
+
 void set_errno_from_http_errcode( int err );

 /**
@@ -20,7 +20,6 @@

 #include "config_csync.h"

-#include <assert.h>
 #include "csync_private.h"
 #include "csync_reconcile.h"
 #include "csync_util.h"
@@ -65,21 +64,7 @@ static c_rbnode_t *_csync_check_ignored(c_rbtree_t *tree, const char *path, int
    }
 }

-/**
- * The main function in the reconcile pass.
- *
- * It's called for each entry in the local and remote rbtrees by
- * csync_reconcile()
- *
- * Before the reconcile phase the trees already know about changes
- * relative to the sync journal. This function's job is to spot conflicts
- * between local and remote changes and adjust the nodes accordingly.
- *
- * See doc/dev/sync-algorithm.md for an overview.
- *
- *
- * Older detail comment:
- *
+/*
 * We merge replicas at the file level. The merged replica contains the
 * superset of files that are on the local machine and server copies of
 * the replica. In the case where the same file is in both the local
@@ -145,7 +130,6 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
            break;
            /* file has been removed on the opposite replica */
        case CSYNC_INSTRUCTION_NONE:
-        case CSYNC_INSTRUCTION_UPDATE_METADATA:
            if (cur->has_ignored_files) {
                /* Do not remove a directory that has ignored files */
                break;
@@ -197,8 +181,13 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {

                if(!other) {
                    cur->instruction = CSYNC_INSTRUCTION_NEW;
+                    if (cur->type == CSYNC_FTW_TYPE_DIR) {
+                        // For new directories we always want to update the etag once
+                        // the directory has been propagated. Otherwise the directory
+                        // could appear locally without being added to the database.
+                        cur->should_update_metadata = true;
+                    }
                } else if (other->instruction == CSYNC_INSTRUCTION_NONE
-                           || other->instruction == CSYNC_INSTRUCTION_UPDATE_METADATA
                           || cur->type == CSYNC_FTW_TYPE_DIR) {
                    other->instruction = CSYNC_INSTRUCTION_RENAME;
                    other->destpath = c_strdup( cur->path );
@@ -206,6 +195,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
                        csync_vio_set_file_id( other->file_id, cur->file_id );
                    }
                    other->inode = cur->inode;
+                    other->should_update_metadata = true;
                    cur->instruction = CSYNC_INSTRUCTION_NONE;
                } else if (other->instruction == CSYNC_INSTRUCTION_REMOVE) {
                    other->instruction = CSYNC_INSTRUCTION_RENAME;
@@ -215,12 +205,12 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
                        csync_vio_set_file_id( other->file_id, cur->file_id );
                    }
                    other->inode = cur->inode;
+                    other->should_update_metadata = true;
                    cur->instruction = CSYNC_INSTRUCTION_NONE;
                } else if (other->instruction == CSYNC_INSTRUCTION_NEW) {
                    CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "OOOO=> NEW detected in other tree!");
                    cur->instruction = CSYNC_INSTRUCTION_CONFLICT;
                } else {
-                    assert(other->type != CSYNC_FTW_TYPE_DIR);
                    cur->instruction = CSYNC_INSTRUCTION_NONE;
                    other->instruction = CSYNC_INSTRUCTION_SYNC;
                }
@@ -232,19 +222,13 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
            break;
        }
    } else {
-        bool is_conflict = true;
+        bool is_equal_files = false;
        /*
     * file found on the other replica
     */
        other = (csync_file_stat_t *) node->data;

        switch (cur->instruction) {
-        case CSYNC_INSTRUCTION_UPDATE_METADATA:
-            if (other->instruction == CSYNC_INSTRUCTION_UPDATE_METADATA && ctx->current == LOCAL_REPLICA) {
-                // Remote wins, the SyncEngine will pick relevant local metadata since the remote tree is walked last.
-                cur->instruction = CSYNC_INSTRUCTION_NONE;
-            }
-            break;
        case CSYNC_INSTRUCTION_EVAL_RENAME:
            /* If the file already exist on the other side, we have a conflict.
               Abort the rename and consider it is a new file. */
@@ -269,39 +253,42 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
            case CSYNC_INSTRUCTION_EVAL:
                if (other->type == CSYNC_FTW_TYPE_DIR &&
                        cur->type == CSYNC_FTW_TYPE_DIR) {
-                    // Folders of the same path are always considered equals
-                    is_conflict = false;
+                    is_equal_files = (other->modtime == cur->modtime);
                } else {
-                    is_conflict = ((other->size != cur->size) || (other->modtime != cur->modtime));
+                    is_equal_files = ((other->size == cur->size) && (other->modtime == cur->modtime));
                    // FIXME: do a binary comparision of the file here because of the following
                    // edge case:
                    // The files could still have different content, even though the mtime
                    // and size are the same.
                }
-                if (ctx->current == REMOTE_REPLICA) {
-                    // If the files are considered equal, only update the DB with the etag from remote
-                    cur->instruction = is_conflict ? CSYNC_INSTRUCTION_CONFLICT : CSYNC_INSTRUCTION_UPDATE_METADATA;
-                    other->instruction = CSYNC_INSTRUCTION_NONE;
-                } else {
+                if (is_equal_files) {
+                    /* The files are considered equal. */
                    cur->instruction = CSYNC_INSTRUCTION_NONE;
-                    other->instruction = is_conflict ? CSYNC_INSTRUCTION_CONFLICT : CSYNC_INSTRUCTION_UPDATE_METADATA;
+                    other->instruction = CSYNC_INSTRUCTION_NONE;
+
+                    /* update DB with new etag from remote */
+                    if (ctx->current == LOCAL_REPLICA) {
+                        other->should_update_metadata = true;
+                    } else {
+                        cur->should_update_metadata = true;
+                    }
+                } else if(ctx->current == REMOTE_REPLICA) {
+                        cur->instruction = CSYNC_INSTRUCTION_CONFLICT;
+                        other->instruction = CSYNC_INSTRUCTION_NONE;
+                } else {
+                        cur->instruction = CSYNC_INSTRUCTION_NONE;
+                        other->instruction = CSYNC_INSTRUCTION_CONFLICT;
                }

                break;
                /* file on the other replica has not been modified */
            case CSYNC_INSTRUCTION_NONE:
-            case CSYNC_INSTRUCTION_UPDATE_METADATA:
                if (cur->type != other->type) {
                    // If the type of the entity changed, it's like NEW, but
                    // needs to delete the other entity first.
                    cur->instruction = CSYNC_INSTRUCTION_TYPE_CHANGE;
-                    other->instruction = CSYNC_INSTRUCTION_NONE;
-                } else if (cur->type == CSYNC_FTW_TYPE_DIR) {
-                    cur->instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
-                    other->instruction = CSYNC_INSTRUCTION_NONE;
                } else {
                    cur->instruction = CSYNC_INSTRUCTION_SYNC;
-                    other->instruction = CSYNC_INSTRUCTION_NONE;
                }
                break;
            case CSYNC_INSTRUCTION_IGNORE:
@@ -323,7 +310,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
        if(cur->type == CSYNC_FTW_TYPE_DIR)
        {
            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,
-                      "%-30s %s dir:  %s",
+                      "%-20s %s dir:  %s",
                      csync_instruction_str(cur->instruction),
                      repo,
                      cur->path);
@@ -331,7 +318,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
        else
        {
            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE,
-                      "%-30s %s file: %s",
+                      "%-20s %s file: %s",
                      csync_instruction_str(cur->instruction),
                      repo,
                      cur->path);
@@ -342,7 +329,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
        if(cur->type == CSYNC_FTW_TYPE_DIR)
        {
            CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
-                      "%-30s %s dir:  %s",
+                      "%-20s %s dir:  %s",
                      csync_instruction_str(cur->instruction),
                      repo,
                      cur->path);
@@ -350,7 +337,7 @@ static int _csync_merge_algorithm_visitor(void *obj, void *data) {
        else
        {
            CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG,
-                      "%-30s %s file: %s",
+                      "%-20s %s file: %s",
                      csync_instruction_str(cur->instruction),
                      repo,
                      cur->path);
@@ -50,7 +50,7 @@
 *
 * @todo Add an argument to set the algorithm to use.
 */
-int OCSYNC_EXPORT csync_reconcile_updates(CSYNC *ctx);
+int csync_reconcile_updates(CSYNC *ctx);

 /**
 * }@
@@ -20,7 +20,6 @@

 extern "C" {
 #include "csync_private.h"
-#include "csync_rename.h"
 }

 #include <map>
@@ -94,9 +93,5 @@ char* csync_rename_adjust_path_source(CSYNC* ctx, const char* path)
    return c_strdup(path);
 }

-bool csync_rename_count(CSYNC *ctx) {
-    csync_rename_s* d = csync_rename_s::get(ctx);
-    return d->folder_renamed_from.size();
-}

 }
@@ -27,13 +27,11 @@ extern "C" {
 #endif

 /* Return the final destination path of a given patch in case of renames */
-char OCSYNC_EXPORT *csync_rename_adjust_path(CSYNC *ctx, const char *path);
+char *csync_rename_adjust_path(CSYNC *ctx, const char *path);
 /* Return the source of a given path in case of renames */
-char OCSYNC_EXPORT *csync_rename_adjust_path_source(CSYNC *ctx, const char *path);
-void OCSYNC_EXPORT csync_rename_destroy(CSYNC *ctx);
-void OCSYNC_EXPORT csync_rename_record(CSYNC *ctx, const char *from, const char *to);
-/*  Return the amount of renamed item recorded */
-bool OCSYNC_EXPORT csync_rename_count(CSYNC *ctx);
+char *csync_rename_adjust_path_source(CSYNC *ctx, const char *path);
+void csync_rename_destroy(CSYNC *ctx);
+void csync_rename_record(CSYNC *ctx, const char *from, const char *to);

 #ifdef __cplusplus
 }
@@ -27,6 +27,7 @@

 #include <sqlite3.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -52,7 +53,7 @@

 #define sqlite_open(A, B) sqlite3_open_v2(A,B, SQLITE_OPEN_READONLY+SQLITE_OPEN_NOMUTEX, NULL)

-#define SQLTM_TIME 150
+#define SQLTM_TIME 150000
 #define SQLTM_COUNT 10

 #define SQLITE_BUSY_HANDLED(F) if(1) { \
@@ -60,7 +61,7 @@
    do { rc = F ; \
      if( (rc == SQLITE_BUSY) || (rc == SQLITE_LOCKED) ) { \
         n++; \
-         csync_sleep(SQLTM_TIME); \
+         usleep(SQLTM_TIME); \
      } \
    }while( (n < SQLTM_COUNT) && ((rc == SQLITE_BUSY) || (rc == SQLITE_LOCKED))); \
  }
@@ -518,7 +519,8 @@ c_strlist_t *csync_statedb_query(sqlite3 *db,
    /* compile SQL program into a virtual machine, reattempteing if busy */
    do {
      if (busy_count) {
-        csync_sleep(100);
+        /* sleep 100 msec */
+        usleep(100000);
        CSYNC_LOG(CSYNC_LOG_PRIORITY_DEBUG, "sqlite3_prepare: BUSY counter: %zu", busy_count);
      }
      err = sqlite3_prepare(db, statement, -1, &stmt, &tail);
@@ -545,7 +547,8 @@ c_strlist_t *csync_statedb_query(sqlite3 *db,
            CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "Busy counter has reached its maximum. Aborting this sql statement");
            break;
          }
-          csync_sleep(100);
+          /* sleep 100 msec */
+          usleep(100000);
          CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "sqlite3_step: BUSY counter: %zu", busy_count);
          continue;
        }
@@ -31,11 +31,6 @@
 #include "csync_time.h"
 #include "vio/csync_vio.h"

-#ifndef _WIN32
-#include <unistd.h>
-#include <sys/time.h>
-#endif
-
 #define CSYNC_LOG_CATEGORY_NAME "csync.time"
 #include "csync_log.h"

@@ -50,13 +45,7 @@

 int csync_gettime(struct timespec *tp)
 {
-#if defined(_WIN32)
-	__int64 wintime;
-	GetSystemTimeAsFileTime((FILETIME*)&wintime);
-	wintime -= 116444736000000000ll;  //1jan1601 to 1jan1970
-	tp->tv_sec = wintime / 10000000ll;           //seconds
-	tp->tv_nsec = wintime % 10000000ll * 100;      //nano-seconds
-#elif defined(HAVE_CLOCK_GETTIME)
+#ifdef HAVE_CLOCK_GETTIME
 	return clock_gettime(CSYNC_CLOCK, tp);
 #else
 	struct timeval tv;
@@ -73,11 +62,4 @@ int csync_gettime(struct timespec *tp)

 #undef CSYNC_CLOCK

-void csync_sleep(unsigned int msecs)
-{
-#if defined(_WIN32)
-	Sleep(msecs);
-#else
-    usleep(msecs * 1000);
-#endif
-}
+/* vim: set ts=8 sw=2 et cindent: */
@@ -26,6 +26,5 @@
 #include "csync_private.h"

 int csync_gettime(struct timespec *tp);
-void csync_sleep(unsigned int msecs);

 #endif /* _CSYNC_TIME_H */
@@ -56,13 +56,26 @@ static uint64_t _hash_of_file(CSYNC *ctx, const char *file) {

  if( ctx && file ) {
    path = file;
-    if (ctx->current == LOCAL_REPLICA) {
+    switch (ctx->current) {
+    case LOCAL_REPLICA:
      if (strlen(path) <= strlen(ctx->local.uri)) {
        return 0;
      }
      path += strlen(ctx->local.uri) + 1;
+      break;
+    case REMOTE_REPLICA:
+      if (strlen(path) <= strlen(ctx->remote.uri)) {
+        return 0;
+      }
+      path += strlen(ctx->remote.uri) + 1;
+      break;
+    default:
+      path = NULL;
+      return 0;
+      break;
    }
    len = strlen(path);
+
    h = c_jhash64((uint8_t *) path, len, 0);
  }
  return h;
@@ -145,19 +158,7 @@ static bool _csync_mtime_equal(time_t a, time_t b)
    return false;
 }

-/**
- * The main function of the discovery/update pass.
- *
- * It's called (indirectly) by csync_update(), once for each entity in the
- * local filesystem and once for each entity in the server data.
- *
- * It has two main jobs:
- * - figure out whether anything happened compared to the sync journal
- *   and set (primarily) the instruction flag accordingly
- * - build the ctx->local.tree / ctx->remote.tree
- *
- * See doc/dev/sync-algorithm.md for an overview.
- */
+
 static int _csync_detect_update(CSYNC *ctx, const char *file,
    const csync_vio_file_stat_t *fs, const int type) {
  uint64_t h = 0;
@@ -175,12 +176,25 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
  }

  path = file;
-  if (ctx->current == LOCAL_REPLICA) {
+  switch (ctx->current) {
+    case LOCAL_REPLICA:
      if (strlen(path) <= strlen(ctx->local.uri)) {
        ctx->status_code = CSYNC_STATUS_PARAM_ERROR;
        return -1;
      }
      path += strlen(ctx->local.uri) + 1;
+      break;
+    case REMOTE_REPLICA:
+      if (strlen(path) <= strlen(ctx->remote.uri)) {
+        ctx->status_code = CSYNC_STATUS_PARAM_ERROR;
+        return -1;
+      }
+      path += strlen(ctx->remote.uri) + 1;
+      break;
+    default:
+      path = NULL;
+      ctx->status_code = CSYNC_STATUS_PARAM_ERROR;
+      return -1;
  }

  len = strlen(path);
@@ -300,7 +314,8 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
                }
                if (checksumIdentical) {
                    CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "NOTE: Checksums are identical, file did not actually change: %s", path);
-                    st->instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
+                    st->instruction = CSYNC_INSTRUCTION_NONE;
+                    st->should_update_metadata = true;
                    goto out;
                }
            }
@@ -326,19 +341,18 @@ static int _csync_detect_update(CSYNC *ctx, const char *file,
            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Reading from database: %s", path);
            ctx->remote.read_from_db = true;
        }
+        if (metadata_differ) {
+            /* file id or permissions has changed. Which means we need to update them in the DB. */
+            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Need to update metadata for: %s", path);
+            st->should_update_metadata = true;
+        }
        /* If it was remembered in the db that the remote dir has ignored files, store
         * that so that the reconciler can make advantage of.
         */
        if( ctx->current == REMOTE_REPLICA ) {
            st->has_ignored_files = tmp->has_ignored_files;
        }
-        if (metadata_differ) {
-            /* file id or permissions has changed. Which means we need to update them in the DB. */
-            CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Need to update metadata for: %s", path);
-            st->instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
-        } else {
-            st->instruction = CSYNC_INSTRUCTION_NONE;
-        }
+        st->instruction = CSYNC_INSTRUCTION_NONE;
    } else {
        enum csync_vio_file_type_e tmp_vio_type = CSYNC_VIO_FILE_TYPE_UNKNOWN;

@@ -463,8 +477,6 @@ out:
              st->error_status = CSYNC_STATUS_INDIVIDUAL_IGNORE_LIST; /* File listed on ignore list. */
          } else if (excluded == CSYNC_FILE_EXCLUDE_INVALID_CHAR) {
              st->error_status = CSYNC_STATUS_INDIVIDUAL_IS_INVALID_CHARS;  /* File contains invalid characters. */
-          } else if (excluded == CSYNC_FILE_EXCLUDE_TRAILING_SPACE) {
-              st->error_status = CSYNC_STATUS_INDIVIDUAL_TRAILING_SPACE; /* File ends with a trailing space. */
          } else if (excluded == CSYNC_FILE_EXCLUDE_LONG_FILENAME) {
              st->error_status = CSYNC_STATUS_INDIVIDUAL_EXCLUDE_LONG_FILENAME; /* File name is too long. */
          } else if (excluded == CSYNC_FILE_EXCLUDE_HIDDEN ) {
@@ -474,9 +486,7 @@ out:
          }
      }
  }
-  if (st->instruction != CSYNC_INSTRUCTION_NONE
-      && st->instruction != CSYNC_INSTRUCTION_IGNORE
-      && st->instruction != CSYNC_INSTRUCTION_UPDATE_METADATA
+  if (st->instruction != CSYNC_INSTRUCTION_NONE && st->instruction != CSYNC_INSTRUCTION_IGNORE
      && type != CSYNC_FTW_TYPE_DIR) {
    st->child_modified = 1;
  }
@@ -603,7 +613,16 @@ int csync_walker(CSYNC *ctx, const char *file, const csync_vio_file_stat_t *fs,

 static bool fill_tree_from_db(CSYNC *ctx, const char *uri)
 {
-    if( csync_statedb_get_below_path(ctx, uri) < 0 ) {
+    const char *path = NULL;
+
+    if( strlen(uri) < strlen(ctx->remote.uri)+1) {
+        CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "name does not contain remote uri!");
+        return false;
+    }
+
+    path = uri + strlen(ctx->remote.uri)+1;
+
+    if( csync_statedb_get_below_path(ctx, path) < 0 ) {
        CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "StateDB could not be read!");
        return false;
    }
@@ -645,6 +664,12 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,

  bool do_read_from_db = (ctx->current == REMOTE_REPLICA && ctx->remote.read_from_db);

+  if (uri[0] == '\0') {
+    errno = ENOENT;
+    ctx->status_code = CSYNC_STATUS_PARAM_ERROR;
+    goto error;
+  }
+
  read_from_db = ctx->remote.read_from_db;

  // if the etag of this dir is still the same, its content is restored from the
@@ -658,7 +683,16 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
      goto done;
  }

-  if ((dh = csync_vio_opendir(ctx, uri)) == NULL) {
+  const char *uri_for_vio = uri;
+  if (ctx->current == REMOTE_REPLICA) {
+      uri_for_vio += strlen(ctx->remote.uri);
+      if (strlen(uri_for_vio) > 0 && uri_for_vio[0] == '/') {
+          uri_for_vio++; // cut leading slash
+      }
+      CSYNC_LOG(CSYNC_LOG_PRIORITY_ERROR, "URI without fuzz for %s is \"%s\"", uri, uri_for_vio);
+  }
+
+  if ((dh = csync_vio_opendir(ctx, uri_for_vio)) == NULL) {
      if (ctx->abort) {
          CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Aborted!");
          ctx->status_code = CSYNC_STATUS_ABORTED;
@@ -704,6 +738,8 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
  }

  while ((dirent = csync_vio_readdir(ctx, dh))) {
+    const char *path = NULL;
+    size_t ulen = 0;
    int flen;
    int flag;

@@ -729,19 +765,50 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
      continue;
    }

-    if (uri[0] == '\0') {
-      filename = c_strdup(d_name);
-      flen = strlen(d_name);
-    } else {
-      flen = asprintf(&filename, "%s/%s", uri, d_name);
-    }
-    if (flen < 0 || !filename) {
+    flen = asprintf(&filename, "%s/%s", uri, d_name);
+    if (flen < 0) {
      csync_vio_file_stat_destroy(dirent);
      dirent = NULL;
      ctx->status_code = CSYNC_STATUS_MEMORY_ERROR;
      goto error;
    }

+    /* Create relative path */
+    switch (ctx->current) {
+      case LOCAL_REPLICA:
+        ulen = strlen(ctx->local.uri) + 1;
+        break;
+      case REMOTE_REPLICA:
+        ulen = strlen(ctx->remote.uri) + 1;
+        break;
+      default:
+        break;
+    }
+
+    if (((size_t)flen) < ulen) {
+      csync_vio_file_stat_destroy(dirent);
+      dirent = NULL;
+      ctx->status_code = CSYNC_STATUS_UNSUCCESSFUL;
+      goto error;
+    }
+
+    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_journal.db-journal")) {
+        csync_vio_file_stat_destroy(dirent);
+        dirent = NULL;
+        SAFE_FREE(filename);
+        continue;
+    }
+
    /* Only for the local replica we have to stat(), for the remote one we have all data already */
    if (ctx->replica == LOCAL_REPLICA) {
        res = csync_vio_stat(ctx, filename, dirent);
@@ -808,11 +875,10 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,

      if (ctx->current_fs && !ctx->current_fs->child_modified
          && ctx->current_fs->instruction == CSYNC_INSTRUCTION_EVAL) {
-          if (ctx->current == REMOTE_REPLICA) {
-              ctx->current_fs->instruction = CSYNC_INSTRUCTION_UPDATE_METADATA;
-          } else {
-              ctx->current_fs->instruction = CSYNC_INSTRUCTION_NONE;
-          }
+        ctx->current_fs->instruction = CSYNC_INSTRUCTION_NONE;
+        if (ctx->current == REMOTE_REPLICA) {
+          ctx->current_fs->should_update_metadata = true;
+        }
      }

      if (ctx->current_fs && previous_fs && ctx->current_fs->has_ignored_files) {
@@ -826,6 +892,12 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
        previous_fs->child_modified = ctx->current_fs->child_modified;
    }

+    if (flag == CSYNC_FTW_FLAG_DIR && ctx->current_fs
+        && (ctx->current_fs->instruction == CSYNC_INSTRUCTION_EVAL ||
+            ctx->current_fs->instruction == CSYNC_INSTRUCTION_NEW)) {
+        ctx->current_fs->should_update_metadata = true;
+    }
+
    ctx->current_fs = previous_fs;
    ctx->remote.read_from_db = read_from_db;
    SAFE_FREE(filename);
@@ -56,7 +56,6 @@ static const _instr_code_struct _instr[] =
  { "INSTRUCTION_STAT_ERR", CSYNC_INSTRUCTION_STAT_ERROR },
  { "INSTRUCTION_ERROR", CSYNC_INSTRUCTION_ERROR },
  { "INSTRUCTION_TYPE_CHANGE", CSYNC_INSTRUCTION_TYPE_CHANGE },
-  { "INSTRUCTION_UPDATE_METADATA", CSYNC_INSTRUCTION_UPDATE_METADATA },
  { NULL, CSYNC_INSTRUCTION_ERROR }
 };

@@ -26,9 +26,9 @@

 #include "csync_private.h"

-const char OCSYNC_EXPORT *csync_instruction_str(enum csync_instructions_e instr);
+const char *csync_instruction_str(enum csync_instructions_e instr);

-void OCSYNC_EXPORT csync_memstat_check(void);
+void csync_memstat_check(void);

-bool OCSYNC_EXPORT csync_file_locked_or_open( const char *dir, const char *fname);
+bool csync_file_locked_or_open( const char *dir, const char *fname);
 #endif /* _CSYNC_UTIL_H */
@@ -26,12 +26,6 @@ set(cstdlib_SRCS
  c_time.c
 )

-if(NOT HAVE_ASPRINTF AND NOT HAVE___MINGW_ASPRINTF)
-    list(APPEND cstdlib_SRCS
-        asprintf.c
-    )
-endif()
-
 include_directories(
  ${CSTDLIB_PUBLIC_INCLUDE_DIRS}
  ${CSTDLIB_PRIVATE_INCLUDE_DIRS}
@@ -1,90 +0,0 @@
-/*
-  https://raw.githubusercontent.com/littlstar/asprintf.c/20ce5207a4ecb24017b5a17e6cd7d006e3047146/asprintf.c
-
-  The MIT License (MIT)
-
-  Copyright (c) 2014 Little Star Media, Inc.
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-*/
-
-/**
- * `asprintf.c' - asprintf
- *
- * copyright (c) 2014 joseph werle <joseph.werle@gmail.com>
- */
-
-#ifndef HAVE_ASPRINTF
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "asprintf.h"
-
-int
-asprintf (char **str, const char *fmt, ...) {
-  int size = 0;
-  va_list args;
-
-  // init variadic argumens
-  va_start(args, fmt);
-
-  // format and get size
-  size = vasprintf(str, fmt, args);
-
-  // toss args
-  va_end(args);
-
-  return size;
-}
-
-int
-vasprintf (char **str, const char *fmt, va_list args) {
-  int size = 0;
-  va_list tmpa;
-
-  // copy
-  va_copy(tmpa, args);
-
-  // apply variadic arguments to
-  // sprintf with format to get size
-  size = vsnprintf(NULL, size, fmt, tmpa);
-
-  // toss args
-  va_end(tmpa);
-
-  // return -1 to be compliant if
-  // size is less than 0
-  if (size < 0) { return -1; }
-
-  // alloc with size plus 1 for `\0'
-  *str = (char *) malloc(size + 1);
-
-  // return -1 to be compliant
-  // if pointer is `NULL'
-  if (NULL == *str) { return -1; }
-
-  // format string with original
-  // variadic arguments and set new size
-  size = vsprintf(*str, fmt, args);
-  return size;
-}
-
-#endif
@@ -1,60 +0,0 @@
-/*
-  https://raw.githubusercontent.com/littlstar/asprintf.c/20ce5207a4ecb24017b5a17e6cd7d006e3047146/asprintf.h
-
-  The MIT License (MIT)
-
-  Copyright (c) 2014 Little Star Media, Inc.
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
-*/
-
-/**
- * `asprintf.h' - asprintf.c
- *
- * copyright (c) 2014 joseph werle <joseph.werle@gmail.com>
- */
-
-#ifndef HAVE_ASPRINTF
-#ifndef ASPRINTF_H
-#define ASPRINTF_H 1
-
-#include <stdarg.h>
-
-/**
- * Sets `char **' pointer to be a buffer
- * large enough to hold the formatted string
- * accepting a `va_list' args of variadic
- * arguments.
- */
-
-int
-vasprintf (char **, const char *, va_list);
-
-/**
- * Sets `char **' pointer to be a buffer
- * large enough to hold the formatted
- * string accepting `n' arguments of
- * variadic arguments.
- */
-
-int
-asprintf (char **, const char *, ...);
-
-#endif
-#endif
@@ -31,17 +31,14 @@
 #include <sys/stat.h>

 #ifdef _WIN32
-#include <windows.h>
 #include <windef.h>
 #include <winbase.h>
 #include <wchar.h>
-#else
-#include <unistd.h>
 #endif

 #include <errno.h>

-#ifdef __MINGW32__
+#ifdef _WIN32
 #define EDQUOT 0
 #define ENODATA 0
 #ifndef S_IRGRP
@@ -68,8 +65,6 @@
 #define nlink_t int
 #define getuid() 0
 #define geteuid() 0
-#elif defined(_WIN32)
-#define mode_t int
 #else
 #include <fcntl.h>
 #endif
@@ -94,12 +89,8 @@ typedef struct stat csync_stat_t;
 #define ENODATA EBADF
 #endif

-#if !defined(HAVE_ASPRINTF)
-#if defined(HAVE___MINGW_ASPRINTF)
+#if !defined(HAVE_ASPRINTF) && defined(HAVE___MINGW_ASPRINTF)
 #define asprintf __mingw_asprintf
-#else
-#include "asprintf.h"
-#endif
 #endif

 #ifndef HAVE_STRERROR_R
@@ -25,10 +25,6 @@
 #include "c_path.h"
 #include "c_time.h"

-#ifndef _WIN32
-#include <sys/time.h>
-#endif
-
 struct timespec c_tspecdiff(struct timespec time1, struct timespec time0) {
  struct timespec ret;
  int xsec = 0;
@@ -22,6 +22,7 @@
 #define _C_TIME_H

 #include <time.h>
+#include <sys/time.h>

 /**
 * @brief Calculate time difference
@@ -21,10 +21,12 @@
 #ifndef _CSYNC_VIO_LOCAL_H
 #define _CSYNC_VIO_LOCAL_H

-csync_vio_handle_t OCSYNC_EXPORT *csync_vio_local_opendir(const char *name);
-int OCSYNC_EXPORT csync_vio_local_closedir(csync_vio_handle_t *dhandle);
-csync_vio_file_stat_t OCSYNC_EXPORT *csync_vio_local_readdir(csync_vio_handle_t *dhandle);
+#include <sys/time.h>

-int OCSYNC_EXPORT csync_vio_local_stat(const char *uri, csync_vio_file_stat_t *buf);
+csync_vio_handle_t *csync_vio_local_opendir(const char *name);
+int csync_vio_local_closedir(csync_vio_handle_t *dhandle);
+csync_vio_file_stat_t *csync_vio_local_readdir(csync_vio_handle_t *dhandle);
+
+int csync_vio_local_stat(const char *uri, csync_vio_file_stat_t *buf);

 #endif /* _CSYNC_VIO_LOCAL_H */
@@ -23,6 +23,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <dirent.h>
 #include <stdio.h>

 #include "windows.h"
@@ -23,36 +23,38 @@

 #include "csync_private.h"

-static int setup(void **state) {
+static void setup(void **state) {
    CSYNC *csync;
    int rc;

    rc = system("mkdir -p /tmp/check_csync1");
    assert_int_equal(rc, 0);

-    csync_create(&csync, "/tmp/check_csync1");
+    rc = system("mkdir -p /tmp/check_csync2");
+    assert_int_equal(rc, 0);
+
+    csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");

    *state = csync;
-    
-    return 0;
 }

-static int setup_module(void **state) {
+static void setup_module(void **state) {
    CSYNC *csync;
    int rc;

    rc = system("mkdir -p /tmp/check_csync1");
    assert_int_equal(rc, 0);

-    csync_create(&csync, "/tmp/check_csync1");
+    rc = system("mkdir -p /tmp/check_csync2");
+    assert_int_equal(rc, 0);

-    csync_init(csync, "foo");
+    csync_create(&csync, "/tmp/check_csync1", "dummy://foo/bar");
+
+    csync_init(csync);
    *state = csync;
-    
-    return 0;
 }

-static int teardown(void **state) {
+static void teardown(void **state) {
    CSYNC *csync = *state;
    int rc;

@@ -64,9 +66,10 @@ static int teardown(void **state) {
    rc = system("rm -rf /tmp/check_csync1");
    assert_int_equal(rc, 0);

+    rc = system("rm -rf /tmp/check_csync2");
+    assert_int_equal(rc, 0);
+
    *state = NULL;
-    
-    return 0;
 }

 static void check_csync_commit(void **state)
@@ -94,10 +97,10 @@ static void check_csync_commit_dummy(void **state)

 int torture_run_tests(void)
 {
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test_setup_teardown(check_csync_commit, setup, teardown),
-        cmocka_unit_test_setup_teardown(check_csync_commit_dummy, setup_module, teardown),
+    const UnitTest tests[] = {
+        unit_test_setup_teardown(check_csync_commit, setup, teardown),
+        unit_test_setup_teardown(check_csync_commit_dummy, setup_module, teardown),
    };

-    return cmocka_run_group_tests(tests, NULL, NULL);
+    return run_tests(tests);
 }
@@ -42,7 +42,7 @@ static void check_csync_create(void **state)

    (void) state; /* unused */

-    csync_create(&csync, "/tmp/csync1");
+    csync_create(&csync, "/tmp/csync1", "/tmp/csync2");

    rc = csync_destroy(csync);
    assert_int_equal(rc, 0);
@@ -50,11 +50,11 @@ static void check_csync_create(void **state)

 int torture_run_tests(void)
 {
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test(check_csync_destroy_null),
-        cmocka_unit_test(check_csync_create),
+    const UnitTest tests[] = {
+        unit_test(check_csync_destroy_null),
+        unit_test(check_csync_create),
    };

-    return cmocka_run_group_tests(tests, NULL, NULL);
+    return run_tests(tests);
 }

@@ -20,7 +20,6 @@
 #include "config_csync.h"
 #include <string.h>
 #include <time.h>
-#include <sys/time.h>

 #include "torture.h"

@@ -29,20 +28,20 @@

 #define EXCLUDE_LIST_FILE SOURCEDIR"/../sync-exclude.lst"

-static int setup(void **state) {
-    CSYNC *csync;
-
-    csync_create(&csync, "/tmp/check_csync1");
-
-    *state = csync;
-    return 0;
-}
-
-static int setup_init(void **state) {
+static void setup(void **state) {
    CSYNC *csync;
    int rc;

-    csync_create(&csync, "/tmp/check_csync1");
+    csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
+
+    *state = csync;
+}
+
+static void setup_init(void **state) {
+    CSYNC *csync;
+    int rc;
+
+    csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");

    rc = csync_exclude_load(EXCLUDE_LIST_FILE, &(csync->excludes));
    assert_int_equal(rc, 0);
@@ -60,10 +59,9 @@ static int setup_init(void **state) {
    assert_int_equal(rc, 0);

    *state = csync;
-    return 0;
 }

-static int teardown(void **state) {
+static void teardown(void **state) {
    CSYNC *csync = *state;
    int rc;

@@ -76,8 +74,6 @@ static int teardown(void **state) {
    assert_int_equal(rc, 0);

    *state = NULL;
-    
-    return 0;
 }

 static void check_csync_exclude_add(void **state)
@@ -147,17 +143,6 @@ static void check_csync_excluded(void **state)
    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
    rc = csync_excluded_no_ctx(csync->excludes, "subdir/.csync_journal.db", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    
-    /* also the new form of the database name */
-    rc = csync_excluded_no_ctx(csync->excludes, "._sync_5bdd60bdfcfa.db", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    rc = csync_excluded_no_ctx(csync->excludes, "._sync_5bdd60bdfcfa.db.ctmp", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    rc = csync_excluded_no_ctx(csync->excludes, "._sync_5bdd60bdfcfa.db-shm", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    rc = csync_excluded_no_ctx(csync->excludes, "subdir/._sync_5bdd60bdfcfa.db", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_SILENTLY_EXCLUDED);
-    

    /* pattern ]*.directory - ignore and remove */
    rc = csync_excluded_no_ctx(csync->excludes, "my.~directory", CSYNC_FTW_TYPE_FILE);
@@ -194,20 +179,6 @@ static void check_csync_excluded(void **state)

    rc = csync_excluded_no_ctx(csync->excludes, "latex/songbook/my_manuscript.tex.tmp", CSYNC_FTW_TYPE_FILE);
    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_LIST);
-
-#ifdef _WIN32
-    rc = csync_excluded_no_ctx(csync->excludes, "file_trailing_space ", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_TRAILING_SPACE);
-
-    rc = csync_excluded_no_ctx(csync->excludes, "file_trailing_dot.", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_INVALID_CHAR);
-
-    rc = csync_excluded_no_ctx(csync->excludes, "AUX", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_INVALID_CHAR);
-
-    rc = csync_excluded_no_ctx(csync->excludes, "file_invalid_char<", CSYNC_FTW_TYPE_FILE);
-    assert_int_equal(rc, CSYNC_FILE_EXCLUDE_INVALID_CHAR);
-#endif
 }

 static void check_csync_excluded_traversal(void **state)
@@ -334,14 +305,13 @@ static void check_csync_excluded_performance(void **state)

    const int N = 10000;
    int totalRc = 0;
-    int i = 0;

    // Being able to use QElapsedTimer for measurement would be nice...
    {
        struct timeval before, after;
        gettimeofday(&before, 0);

-        for (i = 0; i < N; ++i) {
+        for (int i = 0; i < N; ++i) {
            totalRc += csync_excluded_no_ctx(csync->excludes, "/this/is/quite/a/long/path/with/many/components", CSYNC_FTW_TYPE_DIR);
            totalRc += csync_excluded_no_ctx(csync->excludes, "/1/2/3/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20/21/22/23/24/25/26/27/29", CSYNC_FTW_TYPE_FILE);
        }
@@ -359,7 +329,7 @@ static void check_csync_excluded_performance(void **state)
        struct timeval before, after;
        gettimeofday(&before, 0);

-        for (i = 0; i < N; ++i) {
+        for (int i = 0; i < N; ++i) {
            totalRc += csync_excluded_traversal(csync->excludes, "/this/is/quite/a/long/path/with/many/components", CSYNC_FTW_TYPE_DIR);
            totalRc += csync_excluded_traversal(csync->excludes, "/1/2/3/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20/21/22/23/24/25/26/27/29", CSYNC_FTW_TYPE_FILE);
        }
@@ -395,16 +365,16 @@ static void check_csync_exclude_expand_escapes(void **state)

 int torture_run_tests(void)
 {
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test_setup_teardown(check_csync_exclude_add, setup, teardown),
-        cmocka_unit_test_setup_teardown(check_csync_exclude_load, setup, teardown),
-        cmocka_unit_test_setup_teardown(check_csync_excluded, setup_init, teardown),
-        cmocka_unit_test_setup_teardown(check_csync_excluded_traversal, setup_init, teardown),
-        cmocka_unit_test_setup_teardown(check_csync_pathes, setup_init, teardown),
-        cmocka_unit_test_setup_teardown(check_csync_is_windows_reserved_word, setup_init, teardown),
-        cmocka_unit_test_setup_teardown(check_csync_excluded_performance, setup_init, teardown),
-        cmocka_unit_test(check_csync_exclude_expand_escapes),
+    const UnitTest tests[] = {
+        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_excluded_traversal, 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),
+        unit_test_setup_teardown(check_csync_excluded_performance, setup_init, teardown),
+        unit_test(check_csync_exclude_expand_escapes),
    };

-    return cmocka_run_group_tests(tests, NULL, NULL);
+    return run_tests(tests);
 }
@@ -23,33 +23,37 @@

 #include "csync_private.h"

-static int setup(void **state) {
+static void setup(void **state) {
    CSYNC *csync;
    int rc;

    rc = system("mkdir -p /tmp/check_csync1");
    assert_int_equal(rc, 0);

-    csync_create(&csync, "/tmp/check_csync1");
+    rc = system("mkdir -p /tmp/check_csync2");
+    assert_int_equal(rc, 0);
+
+    csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");

    *state = csync;
-    return 0;
 }

-static int setup_module(void **state) {
+static void setup_module(void **state) {
    CSYNC *csync;
    int rc;

    rc = system("mkdir -p /tmp/check_csync1");
    assert_int_equal(rc, 0);

-    csync_create(&csync, "/tmp/check_csync1");
+    rc = system("mkdir -p /tmp/check_csync2");
+    assert_int_equal(rc, 0);
+
+    csync_create(&csync, "/tmp/check_csync1", "dummy://foo/bar");

    *state = csync;
-    return 0;
 }

-static int teardown(void **state) {
+static void teardown(void **state) {
    CSYNC *csync = *state;
    int rc;

@@ -61,28 +65,29 @@ static int teardown(void **state) {
    rc = system("rm -rf /tmp/check_csync1");
    assert_int_equal(rc, 0);

+    rc = system("rm -rf /tmp/check_csync2");
+    assert_int_equal(rc, 0);
+
    *state = NULL;
-    
-    return 0;
 }

 static void check_csync_init(void **state)
 {
    CSYNC *csync = *state;
+    int rc;

-    csync_init(csync, "");
+    csync_init(csync);

    assert_int_equal(csync->status & CSYNC_STATUS_INIT, 1);
-
 }

 int torture_run_tests(void)
 {
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test_setup_teardown(check_csync_init, setup, teardown),
-        cmocka_unit_test_setup_teardown(check_csync_init, setup_module, teardown),
+    const UnitTest tests[] = {
+        unit_test_setup_teardown(check_csync_init, setup, teardown),
+        unit_test_setup_teardown(check_csync_init, setup_module, teardown),
    };

-    return cmocka_run_group_tests(tests, NULL, NULL);
+    return run_tests(tests);
 }

@@ -19,6 +19,7 @@
 */
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>

 #include "torture.h"

@@ -26,21 +27,22 @@
 #include "csync_log.c"
 #include "c_private.h"

-static int setup(void **state) {
+static void setup(void **state) {
    CSYNC *csync;
    int rc;

    rc = system("mkdir -p /tmp/check_csync1");
    assert_int_equal(rc, 0);

-    csync_create(&csync, "/tmp/check_csync1");
+    rc = system("mkdir -p /tmp/check_csync2");
+    assert_int_equal(rc, 0);
+
+    csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");

    *state = csync;
-    
-    return 0;
 }

-static int teardown(void **state) {
+static void teardown(void **state) {
    CSYNC *csync = *state;
    int rc;

@@ -52,9 +54,10 @@ static int teardown(void **state) {
    rc = system("rm -rf /tmp/check_csync1");
    assert_int_equal(rc, 0);

+    rc = system("rm -rf /tmp/check_csync2");
+    assert_int_equal(rc, 0);
+
    *state = NULL;
-    
-    return 0;
 }

 static void check_log_callback(int verbosity,
@@ -138,11 +141,11 @@ static void check_logging(void **state)

 int torture_run_tests(void)
 {
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test(check_set_log_level),
-        cmocka_unit_test(check_set_auth_callback),
-        cmocka_unit_test_setup_teardown(check_logging, setup, teardown),
+    const UnitTest tests[] = {
+        unit_test(check_set_log_level),
+        unit_test(check_set_auth_callback),
+        unit_test_setup_teardown(check_logging, setup, teardown),
    };

-    return cmocka_run_group_tests(tests, NULL, NULL);
+    return run_tests(tests);
 }
@@ -48,10 +48,10 @@ static void check_csync_normalize_etag(void **state)

 int torture_run_tests(void)
 {
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test(check_csync_normalize_etag),
+    const UnitTest tests[] = {
+        unit_test(check_csync_normalize_etag),
    };

-    return cmocka_run_group_tests(tests, NULL, NULL);
+    return run_tests(tests);
 }

@@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 #include <string.h>
+#include <unistd.h>

 #include "torture.h"

@@ -26,7 +27,7 @@

 #define TESTDB "/tmp/check_csync1/test.db"

-static int setup(void **state) {
+static void setup(void **state) {
    CSYNC *csync;
    int rc;

@@ -36,7 +37,7 @@ static int setup(void **state) {
    rc = system("mkdir -p /tmp/check_csync1");
    assert_int_equal(rc, 0);

-    csync_create(&csync, "/tmp/check_csync1");
+    csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");

    csync->statedb.file = c_strdup( TESTDB );
    *state = csync;
@@ -47,11 +48,9 @@ static int setup(void **state) {

    rc = sqlite3_close(db);
    assert_int_equal(rc, SQLITE_OK);
-
-    return 0;
 }

-static int teardown(void **state) {
+static void teardown(void **state) {
    CSYNC *csync = *state;
    int rc;

@@ -62,8 +61,6 @@ static int teardown(void **state) {
    assert_int_equal(rc, 0);

    *state = NULL;
-    
-    return 0;
 }

 static void check_csync_statedb_load(void **state)
@@ -120,11 +117,11 @@ static void check_csync_statedb_close(void **state)

 int torture_run_tests(void)
 {
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test_setup_teardown(check_csync_statedb_load, setup, teardown),
-        cmocka_unit_test_setup_teardown(check_csync_statedb_close, setup, teardown),
+    const UnitTest tests[] = {
+        unit_test_setup_teardown(check_csync_statedb_load, setup, teardown),
+        unit_test_setup_teardown(check_csync_statedb_close, setup, teardown),
    };

-    return cmocka_run_group_tests(tests, NULL, NULL);
+    return run_tests(tests);
 }

@@ -27,19 +27,23 @@



-static int setup(void **state)
+static void setup(void **state)
 {
    CSYNC *csync;
    int rc = 0;

    rc = system("rm -rf /tmp/check_csync1");
    assert_int_equal(rc, 0);
+    rc = system("rm -rf /tmp/check_csync2");
+    assert_int_equal(rc, 0);
    rc = system("mkdir -p /tmp/check_csync1");
    assert_int_equal(rc, 0);
+    rc = system("mkdir -p /tmp/check_csync2");
+    assert_int_equal(rc, 0);
    rc = system("mkdir -p /tmp/check_csync");
    assert_int_equal(rc, 0);
-    csync_create(&csync, "/tmp/check_csync1");
-    csync_init(csync, TESTDB);
+    csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
+    csync_init(csync);

    sqlite3 *db = NULL;
    rc = sqlite3_open_v2(TESTDB, &db, SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE, NULL);
@@ -51,11 +55,9 @@ static int setup(void **state)
    assert_int_equal(rc, 0);

    *state = csync;
-    
-    return 0;
 }

-static int setup_db(void **state)
+static void setup_db(void **state)
 {
    char *errmsg;
    int rc = 0;
@@ -91,12 +93,10 @@ static int setup_db(void **state)
    assert_int_equal(rc, SQLITE_OK);

    sqlite3_close(db);
-    
-    return 0;

 }

-static int teardown(void **state) {
+static void teardown(void **state) {
    CSYNC *csync = *state;
    int rc = 0;

@@ -106,10 +106,10 @@ static int teardown(void **state) {
    assert_int_equal(rc, 0);
    rc = system("rm -rf /tmp/check_csync1");
    assert_int_equal(rc, 0);
+    rc = system("rm -rf /tmp/check_csync2");
+    assert_int_equal(rc, 0);

    *state = NULL;
-    
-    return 0;
 }


@@ -210,15 +210,15 @@ static void check_csync_statedb_get_stat_by_inode_not_found(void **state)

 int torture_run_tests(void)
 {
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test_setup_teardown(check_csync_statedb_query_statement, setup, teardown),
-        cmocka_unit_test_setup_teardown(check_csync_statedb_drop_tables, setup, teardown),
-        cmocka_unit_test_setup_teardown(check_csync_statedb_insert_metadata, setup, teardown),
-        cmocka_unit_test_setup_teardown(check_csync_statedb_write, setup, teardown),
-        cmocka_unit_test_setup_teardown(check_csync_statedb_get_stat_by_hash_not_found, setup_db, teardown),
-        cmocka_unit_test_setup_teardown(check_csync_statedb_get_stat_by_inode_not_found, setup_db, teardown),
+    const UnitTest tests[] = {
+        unit_test_setup_teardown(check_csync_statedb_query_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),
+        unit_test_setup_teardown(check_csync_statedb_get_stat_by_hash_not_found, setup_db, teardown),
+        unit_test_setup_teardown(check_csync_statedb_get_stat_by_inode_not_found, setup_db, teardown),
    };

-    return cmocka_run_group_tests(tests, NULL, NULL);
+    return run_tests(tests);
 }

@@ -81,7 +81,7 @@ static void statedb_insert_metadata(sqlite3 *db)
    }
 }

-static int setup(void **state)
+static void setup(void **state)
 {
    CSYNC *csync;
    int rc;
@@ -91,8 +91,10 @@ static int setup(void **state)
    assert_int_equal(rc, 0);
    rc = system("mkdir -p /tmp/check_csync1");
    assert_int_equal(rc, 0);
-    csync_create(&csync, "/tmp/check_csync1");
-    csync_init(csync, TESTDB);
+    rc = system("mkdir -p /tmp/check_csync2");
+    assert_int_equal(rc, 0);
+    csync_create(&csync, "/tmp/check_csync1", "/tmp/check_csync2");
+    csync_init(csync);

    /* Create a new db with metadata */
    sqlite3 *db;
@@ -109,11 +111,9 @@ static int setup(void **state)
    assert_int_equal(rc, 0);

    *state = csync;
-    
-    return 0;
 }

-static int setup_ftw(void **state)
+static void setup_ftw(void **state)
 {
    CSYNC *csync;
    int rc;
@@ -122,8 +122,10 @@ static int setup_ftw(void **state)
    assert_int_equal(rc, 0);
    rc = system("mkdir -p /tmp/check_csync1");
    assert_int_equal(rc, 0);
-    csync_create(&csync, "/tmp");
-    csync_init(csync, TESTDB);
+    rc = system("mkdir -p /tmp/check_csync2");
+    assert_int_equal(rc, 0);
+    csync_create(&csync, "/tmp", "/tmp");
+    csync_init(csync);

    sqlite3 *db = NULL;
    rc = sqlite3_open_v2(TESTDB, &db, SQLITE_OPEN_CREATE | SQLITE_OPEN_READWRITE, NULL);
@@ -137,11 +139,9 @@ static int setup_ftw(void **state)

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

-static int teardown(void **state)
+static void teardown(void **state)
 {
    CSYNC *csync = *state;
    int rc;
@@ -151,11 +151,9 @@ static int teardown(void **state)
    assert_int_equal(rc, 0);

    *state = NULL;
-    
-    return 0;
 }

-static int teardown_rm(void **state) {
+static void teardown_rm(void **state) {
    int rc;

    teardown(state);
@@ -164,8 +162,8 @@ static int teardown_rm(void **state) {
    assert_int_equal(rc, 0);
    rc = system("rm -rf /tmp/check_csync1");
    assert_int_equal(rc, 0);
-    
-    return 0;
+    rc = system("rm -rf /tmp/check_csync2");
+    assert_int_equal(rc, 0);
 }

 /* create a file stat, caller must free memory */
@@ -432,19 +430,19 @@ static void check_csync_ftw_failing_fn(void **state)

 int torture_run_tests(void)
 {
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test_setup_teardown(check_csync_detect_update, setup, teardown_rm),
-        cmocka_unit_test_setup_teardown(check_csync_detect_update_db_none, setup, teardown),
-        cmocka_unit_test_setup_teardown(check_csync_detect_update_db_eval, setup, teardown),
-        cmocka_unit_test_setup_teardown(check_csync_detect_update_db_rename, setup, teardown),
-        cmocka_unit_test_setup_teardown(check_csync_detect_update_db_new, setup, teardown_rm),
-        cmocka_unit_test_setup_teardown(check_csync_detect_update_null, setup, teardown_rm),
+    const UnitTest tests[] = {
+        unit_test_setup_teardown(check_csync_detect_update, setup, teardown_rm),
+        unit_test_setup_teardown(check_csync_detect_update_db_none, setup, teardown),
+        unit_test_setup_teardown(check_csync_detect_update_db_eval, setup, teardown),
+        unit_test_setup_teardown(check_csync_detect_update_db_rename, setup, teardown),
+        unit_test_setup_teardown(check_csync_detect_update_db_new, setup, teardown_rm),
+        unit_test_setup_teardown(check_csync_detect_update_null, setup, teardown_rm),

-        cmocka_unit_test_setup_teardown(check_csync_ftw, setup_ftw, teardown_rm),
-        cmocka_unit_test_setup_teardown(check_csync_ftw_empty_uri, setup_ftw, teardown_rm),
-        cmocka_unit_test_setup_teardown(check_csync_ftw_failing_fn, setup_ftw, teardown_rm),
+        unit_test_setup_teardown(check_csync_ftw, setup_ftw, teardown_rm),
+        unit_test_setup_teardown(check_csync_ftw_empty_uri, setup_ftw, teardown_rm),
+        unit_test_setup_teardown(check_csync_ftw_failing_fn, setup_ftw, teardown_rm),
    };

-    return cmocka_run_group_tests(tests, NULL, NULL);
+    return run_tests(tests);
 }

@@ -43,11 +43,11 @@ static void check_csync_memstat(void **state)

 int torture_run_tests(void)
 {
-    const struct CMUnitTest tests[] = {
-        cmocka_unit_test(check_csync_instruction_str),
-        cmocka_unit_test(check_csync_memstat),
+    const UnitTest tests[] = {
+        unit_test(check_csync_instruction_str),
+        unit_test(check_csync_memstat),
    };

-    return cmocka_run_group_tests(tests, NULL, NULL);
+    return run_tests(tests);
 }

@@ -457,7 +457,6 @@ sub traverse( $$;$ )

 	$isHere = 1 if( $acceptConflicts && !$isHere && $f =~ /_conflict/ );
 	$isHere = 1 if( $f =~ /\.csync/ );
-	$isHere = 1 if( $f =~ /\._sync_/ );
 	assert( $isHere, "Filename local, but not remote: $f" );
    }

@@ -521,7 +520,7 @@ sub put_to_dir( $$;$ )
 	    $targetUrl = $optionsRef->{url};
 	}
    }
-    $d->open($targetUrl . $dir);
+    $d->open($dir);

    my $filename = $file;
    $filename =~ s/^.*\///;
@@ -176,7 +176,7 @@ assertLocalAndRemoteDir( 'remoteToLocal1', 1);

 printInfo("simulate a owncloud 5 update by removing all the fileid");
 ## simulate a owncloud 5 update by removing all the fileid
-system( "sqlite3 " . localDir() . "._sync_*.db \"UPDATE metadata SET fileid='';\"");
+system( "sqlite3 " . localDir() . ".csync_journal.db \"UPDATE metadata SET fileid='';\"");
 #refresh the ids
 csync();
 assertLocalAndRemoteDir( 'remoteToLocal1', 1);
@@ -31,13 +31,6 @@ use strict;

 print "Hello, this is t6, a tester for csync with ownCloud.\n";

-# Checking CURL is installed to avoid misleading errors later...
-system(("curl", "--help", ">", "/dev/null"));
-if ($? != 0) {
-   print "CURL is needed for this script, aborting with error\n";
-   exit 1;
-}
-
 initTesting();

 sub createPostUpdateScript($)
@@ -61,7 +54,7 @@ sub getETagFromJournal($$)
 {
    my ($name,$num) = @_;

-    my $sql = "sqlite3 " . localDir() . "._sync_*.db \"SELECT md5 FROM metadata WHERE path='$name';\"";
+    my $sql = "sqlite3 " . localDir() . ".csync_journal.db \"SELECT md5 FROM metadata WHERE path='$name';\"";
    open(my $fh, '-|', $sql) or die $!;
    my $etag  = <$fh>;
    close $fh;
@@ -37,8 +37,8 @@ sub assertCsyncJournalOk {
 	my $path = $_[0];

    # FIXME: should test also remoteperm but it's not working with owncloud6
-    #     my $cmd = 'sqlite3 ' . $path . '._sync_*.db "SELECT count(*) from metadata where length(remotePerm) == 0 or length(fileId) == 0"';
-    my $cmd = 'sqlite3 ' . $path . '._sync_*.db "SELECT count(*) from metadata where length(fileId) == 0"';
+    #     my $cmd = 'sqlite3 ' . $path . '.csync_journal.db "SELECT count(*) from metadata where length(remotePerm) == 0 or length(fileId) == 0"';
+    my $cmd = 'sqlite3 ' . $path . '.csync_journal.db "SELECT count(*) from metadata where length(fileId) == 0"';
 	my $result = `$cmd`;
 	assert($result == "0");
 }
@@ -170,14 +170,14 @@ assertLocalAndRemoteDir( '', 0);

 #######################################################################
 printInfo( "move a directory in a outside read only folder" );
-system("sqlite3 " . localDir().'._sync_*.db .dump');
+system("sqlite3 " . localDir().'.csync_journal.db .dump');

 #Missing directory should be restored
 #new directory should be uploaded
 system("mv " . localDir().'readonlyDirectory_PERM_M_/subdir_PERM_CK_ ' . localDir().'normalDirectory_PERM_CKDNV_/subdir_PERM_CKDNV_'  );

 csync();
-system("sqlite3 " . localDir().'._sync_*.db .dump');
+system("sqlite3 " . localDir().'.csync_journal.db .dump');
 assertCsyncJournalOk(localDir());

 # old name restored
@@ -229,38 +229,7 @@ system("rm -r " . localDir(). "readonlyDirectory_PERM_M_/moved_PERM_CK_");

 assertLocalAndRemoteDir( '', 0);

-system("sqlite3 " . localDir().'._sync_*.db .dump');
-
-
-#######################################################################
-printInfo( "multiple restores of a file create different conflict files" );
-
-system("sleep 1"); #make sure changes have different mtime
-
-system("echo 'modified_1' > ". localDir() . "readonlyDirectory_PERM_M_/canotBeModified_PERM_DVN_.data");
-
-#do the sync
-csync();
-assertCsyncJournalOk(localDir());
-
-system("sleep 1"); #make sure changes have different mtime
-
-system("echo 'modified_2' > ". localDir() . "readonlyDirectory_PERM_M_/canotBeModified_PERM_DVN_.data");
-
-#do the sync
-csync();
-assertCsyncJournalOk(localDir());
-
-# there should be two conflict files
-# TODO check that the conflict file has the right content
-my @conflicts = glob(localDir().'readonlyDirectory_PERM_M_/canotBeModified_PERM_DVN__conflict-*.data' );
-assert( scalar @conflicts == 2 );
-# remove the conflicts for the next assertLocalAndRemoteDir
-system("rm " . localDir().'readonlyDirectory_PERM_M_/canotBeModified_PERM_DVN__conflict-*.data' );
-
-### Both side should still be the same
-assertLocalAndRemoteDir( '', 0);
-
+system("sqlite3 " . localDir().'.csync_journal.db .dump');


 cleanup();
@@ -56,8 +56,6 @@ assertLocalAndRemoteDir( '', 0);
 printInfo( "Testing with a .sys.admin#recall#" );
 system("echo 'dir/file2.dat' > ". $tmpdir . ".sys.admin\#recall\#");
 system("echo 'dir/file3.dat' >> ". $tmpdir . ".sys.admin\#recall\#");
-system("echo 'nonexistant' >> ". $tmpdir . ".sys.admin\#recall\#");
-system("echo '/tmp/t_recall/file4.dat' >> ". $tmpdir . ".sys.admin\#recall\#");
 glob_put( "$tmpdir/.sys.admin\#recall\#", "" );

 csync();
@@ -66,14 +64,6 @@ csync();
 assert( -e glob(localDir().'dir/file2_.sys.admin#recall#-*.dat' ) );
 assert( -e glob(localDir().'dir/file3_.sys.admin#recall#-*.dat' ) );

-# verify that the original files still exist
-assert( -e glob(localDir().'dir/file2.dat' ) );
-assert( -e glob(localDir().'dir/file3.dat' ) );
-
-assert( !-e glob(localDir().'nonexistant*' ) );
-assert( !-e glob('/tmp/t_recall/file4_.sys.admin#recall#-*.dat' ) );
-assert( -e glob('/tmp/t_recall/file4.dat' ) );
-
 #Remove the recall file
 unlink(localDir() . ".sys.admin#recall#");

@@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */
 #include <string.h>
+#include <unistd.h>

 #include "torture.h"

@@ -22,6 +22,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
+#include <unistd.h>

 #include "torture.h"

@@ -48,7 +49,7 @@ static void setup(void **state)
    rc = system("rm -rf /tmp/csync_test");
    assert_int_equal(rc, 0);

-    csync_create(&csync, "/tmp/csync1");
+    csync_create(&csync, "/tmp/csync1", "/tmp/csync2");

    csync->replica = LOCAL_REPLICA;

@@ -22,6 +22,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
+#include <unistd.h>
 #include <stdio.h>

 #include "torture.h"
@@ -96,7 +97,7 @@ static void setup_testenv(void **state) {
    statevar *mystate = malloc( sizeof(statevar) );
    mystate->result = NULL;

-    csync_create(&(mystate->csync), "/tmp/csync1");
+    csync_create(&(mystate->csync), "/tmp/csync1", "/tmp/csync2");

    mystate->csync->replica = LOCAL_REPLICA;

@@ -153,8 +153,7 @@ By default, the ownCloud Client ignores the following files:

 * Files matched by one of the patterns defined in the Ignored Files Editor
 * Files containing characters that do not work on certain file systems ``(`\, /, :, ?, *, ", >, <, |`)``.
-* Files starting with ``._sync_xxxxxxx.db`` and the old format ``.csync_journal.db``, 
-as these files are reserved for journalling.
+* Files starting with ``.csync_journal.db``, as these files are reserved for journalling.

 If a pattern selected using a checkbox in the `ignoredFilesEditor-label` (or if
 a line in the exclude file starts with the character ``]`` directly followed by
@@ -200,6 +199,12 @@ the database by comparing the files and their modification times. This process
 ensures that both server and client are synchronized using the appropriate NTP
 time before restarting the client following a database removal.

+Pressing ``F5`` while in the Account Settings Dialog enables you to "reset" the
+journal. This function can be used to recreate the journal database.
+
+.. note:: We recommend that you use this function only when advised to do so by
+   ownCloud support staff.
+
 Custom WebDAV Properties
 ------------------------

@@ -42,8 +42,7 @@ repositories`_ to see all the Linux client repos.
    echo 'deb-src 
    http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Debian_8.0/ /' >> /etc/apt/sources.list.d/owncloud-client.list

-2. Install the dependencies using the following commands for your specific Linux 
-distribution. Make sure the repositories for source packages are enabled.
+2. Install the dependencies using the following commands for your specific Linux distribution:
  
   * Debian/Ubuntu: ``apt-get update; apt-get build-dep owncloud-client``
   * openSUSE/SLES: ``zypper ref; zypper si -d owncloud-client``
@@ -66,18 +65,11 @@ recipes.

 To set up your build environment for development using HomeBrew_:

-1. Install Xcode
-2. Install Xcode command line tools::
-    xcode-select --install
-
-3. Install homebrew::
-    /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
-
-4. Add the ownCloud repository using the following command::
+1. Add the ownCloud repository using the following command::

    brew tap owncloud/owncloud

-5. Install any missing dependencies::
+2. Install any missing dependencies::

    brew install $(brew deps owncloud-client)

@@ -87,9 +79,6 @@ To set up your build environment for development using HomeBrew_:

   Where ``x.z`` is the current version of Qt 5 that brew has installed
   on your machine.
-4. Install qtkeychain from here:  git clone https://github.com/frankosterfeld/qtkeychain.git
-   make sure you make the same install prefix as later while building the client e.g.  -            
-   ``DCMAKE_INSTALL_PREFIX=/Path/to/client-install``

 5. For compilation of the client, follow the :ref:`generic-build-instructions`.

@@ -244,10 +233,6 @@ To build the most up-to-date version of the client:
   .. 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:: qtkeychain must be compiled with the same prefix e.g CMAKE_INSTALL_PREFIX=/Users/path/to/client/install/
-
-   .. note:: Example:: cmake -DCMAKE_PREFIX_PATH=/usr/local/opt/qt5 -DCMAKE_INSTALL_PREFIX=/Users/path/to/client/install/  -D_OPENSSL_LIBDIR=/usr/local/opt/openssl/lib/ -D_OPENSSL_INCLUDEDIR=/usr/local/opt/openssl/include/   -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include/ -DNO_SHIBBOLETH=1

 4. Call ``make``.

@@ -7,7 +7,7 @@ On Microsoft Windows systems:
        ``%LOCALAPPDATA%\ownCloud\owncloud.cfg``

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


 The configuration file contains settings using the Microsoft Windows .ini file
@@ -1,84 +0,0 @@
-Sync Algorithm
-==============
-
-Overview
--------
-
-This is a technical description of the synchronization (sync) algorithm used by the ownCloud client.
-
-The sync algorithm is the thing that looks at the local and remote file system trees and the sync journal and decides which steps need to be taken to bring the two trees into synchronization. It's different from the propagator, whose job it is to actually execute these steps.
-
-
-Definitions
-----------
-
-  - local tree: The files and directories on the local file system that shall be kept in sync with the remote tree.
-  - remote tree: The files and directories on the ownCloud server that shall be kept in sync with the local tree.
-  - sync journal (journal): A snapshot of file and directory metadata that the sync algorithm uses as a baseline to detect local or remote changes. Typically stored in a database.
-  - file and directory metadata:
-    - mtimes
-    - sizes
-    - inodes (journal and local only): Representation of filesystem object. Useful for rename detection.
-    - etags (journal and remote only): The server assigns a new etag when a file or directory changes.
-    - checksums (journal and remote only): Checksum algorithm applied to a file's contents.
-    - permissions (journal and remote only)
-
-
-Phases
------
-
-### Discovery (aka Update)
-
-The discovery phase collects file and directory metadata from the local and remote trees, detecting differences between each tree and the journal.
-
-Afterwards, we have two trees that tell us what happened relative to the journal. But there may still be conflicts if something happened to an entity both locally and on the remote.
-
-  - Input: file system, server data, journal
-  - Output: two c_rbtree_t*, representing the local and remote trees
-
-  - Note on remote discovery: Since a change to a file on the server causes the etags of all parent folders to change, folders with an unchanged etag can be read from the journal directly and don't need to be walked into.
-
-  - Details
-    - csync_update() uses csync_ftw() on the local and remote trees, one after the other.
-    - csync_ftw() iterates through the entities in a tree and calls csync_walker() for each.
-    - csync_walker() calls _csync_detect_update() on each.
-    - _csync_detect_update() compares the item to its journal entry (if any) to detect new, changed or renamed files. This is the main function of this pass.
-
-
-
-### Reconcile
-
-The reconcile phase compares and adjusts the local and remote trees (in both directions), detecting conflicts.
-
-Afterwards, there are still two trees, but conflicts are marked in them.
-
-  - Input: c_rbtree_t* for the local and remote trees, journal (for some rename-related queries)
-  - Output: changes c_rbtree_t* in-place
-
-  - Details
-    - csync_reconcile() runs csync_reconcile_updates() for the local and remote trees, one after the other.
-    - csync_reconcile_updates() uses c_rbtree_walk() to iterate through the entries, calling _csync_merge_algorithm_visitor() for each.
-    - _csync_merge_algorithm_visitor() checks whether the other tree also has an entry for that node and merges the actions, detecting conflicts. This is the main function of this pass.
-
-
-### Post-Reconcile
-
-The post-reconcile phase merges the two trees into one set of SyncFileItems.
-
-Afterwards, there is a list of items that can tell the propagator what needs to be done.
-
-  - Input: c_rbtree_t* for the local and remote trees
-  - Output: QMap<QString, SyncFileItemPtr>
-
-  - Note that some "propagations", specifically cheap metadata-only updates, are already done at this stage.
-
-  - Details
-    - csync_walk_local_tree() and csync_walk_remote_tree() are called.
-    - They use _csync_walk_tree() to run SyncEngine::treewalkFile() on each entry.
-    - treewalkFile() creates and fills SyncFileItems for each entry, ensuring that each file only has a single instance. This is the main function of this pass.
-
-
-See Also
--------
-
-An overview of the propagation steps is still missing. The sync protocol is documented at https://github.com/cernbox/smashbox/blob/master/protocol/protocol.md.
@@ -12,7 +12,7 @@ Desktop Sync client enables you to:
 Your files are always automatically synchronized between your ownCloud server 
 and local PC.

-Because of various technical issues, desktop sync clients older than 2.2.1 will 
+Because of various technical issues, desktop sync clients older than 1.7 will 
 not allowed to connect and sync with the ownCloud 8.1+ server. It is highly 
 recommended to keep your client updated.

@@ -4,8 +4,7 @@
 #
 #  This program 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; either version 2 of the License, or
-#  (at your option) any later version.
+#  the Free Software Foundation; version 2 of the License.
 #
 #  This program is distributed in the hope that it will be useful, but
 #  WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -1,11 +1,3 @@
-<!--- 
-Please try to only report a bug if it happens with the latest version
-The latest version can be seen by checking the ChangeLog: https://owncloud.org/changelog/desktop/
-
-For support try: https://central.owncloud.org/c/help/desktop-file-sync
--->
-
-
 ### Expected behaviour
 Tell us what should happen

@@ -28,7 +20,7 @@ PHP version:

 ownCloud version:

-Storage backend (external storage):
+Storage backend:

 ### Client configuration
 Client version:
@@ -46,11 +38,11 @@ logs.

 ```Template for output < 10 lines```

-1. Client logfile: Output of `owncloud --logwindow` or `owncloud --logfile log.txt`
+1. Output of `owncloud --logwindow` or `owncloud --logfile log.txt`
 (On Windows using `cmd.exe`, you might need to first `cd` into the ownCloud directory)
-(See also http://doc.owncloud.org/desktop/2.2/troubleshooting.html#client-logfile )
+(See also http://doc.owncloud.org/desktop/1.8/troubleshooting.html#client-logfile )

 2. Web server error log:

-3. Server logfile: ownCloud log (data/owncloud.log):
+3. ownCloud log (data/owncloud.log):

@@ -247,270 +247,6 @@ X-GNOME-Autostart-Delay=3
 # Translations


-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
-# Translations
-
-
 # Translations
 Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
 GenericName[oc]=Dorsièr de Sincronizacion
@@ -533,7 +269,7 @@ GenericName[de]=Ordner-Synchronisation
 Name[de]=@APPLICATION_NAME@ Desktop-Synchronisationsclient
 Icon[de]=@APPLICATION_EXECUTABLE@
 Comment[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
-GenericName[ja_JP]=フォルダー同期
+GenericName[ja_JP]=フォルダ同期
 Name[ja_JP]=@APPLICATION_NAME@ デスクトップ同期クライアント
 Icon[ja_JP]=@APPLICATION_EXECUTABLE@
 GenericName[el]=Συγχρονισμός φακέλου
@@ -601,10 +337,10 @@ Comment[cs_CZ]=@APPLICATION_NAME@ počítačový synchronizační klient
 GenericName[cs_CZ]=Synchronizace adresáře
 Name[cs_CZ]=@APPLICATION_NAME@ počítačový synchronizační klient
 Icon[cs_CZ]=@APPLICATION_EXECUTABLE@
-Comment[ru]=Настольный клиент синхронизации @APPLICATION_NAME@ 
-GenericName[ru]=Синхронизация каталогов
-Name[ru]=Настольный клиент синхронизации @APPLICATION_NAME@
-Icon[ru]=@APPLICATION_EXECUTABLE@
+Comment[ru]=Настольный клиент синхронизации @НАЗВАНИЕ_ПРИЛОЖЕНИЯ@ 
+GenericName[ru]=Синхронизация папки
+Name[ru]=Настольный клиент синхронизации @НАЗВАНИЕ_ПРИЛОЖЕНИЯ@
+Icon[ru]=@ВЫПОЛНЯЕМОЕ_ПРИЛОЖЕНИЕ@
 Comment[sl]=@APPLICATION_NAME@ ‒ Program za usklajevanje datotek z namizjem
 GenericName[sl]=Usklajevanje map
 Name[sl]=@APPLICATION_NAME@ ‒ Program za usklajevanje datotek z namizjem
@@ -646,7 +382,6 @@ Comment[th_TH]=@APPLICATION_NAME@ ไคลเอนต์ประสานข
 GenericName[th_TH]=ประสานข้อมูลโฟลเดอร์
 Name[th_TH]= @APPLICATION_NAME@ ไคลเอนต์ประสานข้อมูลเดสก์ท็อป
 Icon[th_TH]=@APPLICATION_EXECUTABLE@
-GenericName[es_MX]=Sincronización de Carpetas
 Comment[nb_NO]=@APPLICATION_NAME@ skrivebordssynkroniseringsklient
 GenericName[nb_NO]=Mappesynkronisering
 Name[nb_NO]=@APPLICATION_NAME@ skrivebordssynkroniseringsklient 
@@ -21,7 +21,6 @@
 #include <qcoreevent.h>
 #include <QFile>
 #include "ownclouddolphinpluginhelper.h"
-#include "config.h"

 OwncloudDolphinPluginHelper* OwncloudDolphinPluginHelper::instance()
 {
@@ -68,10 +67,7 @@ void OwncloudDolphinPluginHelper::tryConnect()
        return;
    }
    QString runtimeDir = QFile::decodeName(qgetenv("XDG_RUNTIME_DIR"));
-    runtimeDir.append( QChar('/'));
-    runtimeDir.append( QLatin1String(APPLICATION_SHORTNAME) );
-
-    const QString socketPath = runtimeDir + QLatin1String("/socket");
+    QString socketPath = runtimeDir + QLatin1String("/ownCloud/socket");
    _socket.connectToServer(socketPath);
 }

@@ -4,7 +4,6 @@ if( UNIX AND NOT APPLE )

    configure_file(syncstate.py syncstate.py COPYONLY)
    configure_file(syncstate.py syncstate_nemo.py COPYONLY)
-    configure_file(syncstate.py syncstate_caja.py COPYONLY)

    # Call the setupappname.sh script to set the custom app name.
    set (cmd "${CMAKE_CURRENT_SOURCE_DIR}/setappname.sh")
@@ -19,17 +18,9 @@ if( UNIX AND NOT APPLE )
                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
                    ERROR_VARIABLE errors OUTPUT_VARIABLE out)

-    # Create a caja plugin script from the nautilus one. 
-    # cajacmd copies the syncstate.py and performs string replacement.
-    set (cajacmd "${CMAKE_CURRENT_SOURCE_DIR}/createcajaplugin.sh")
-    execute_process(COMMAND ${cajacmd}
-                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                    ERROR_VARIABLE errors OUTPUT_VARIABLE out)
-
                                        
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate.py DESTINATION ${DATADIR}/nautilus-python/extensions RENAME syncstate-${APPLICATION_SHORTNAME}.py)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate_nemo.py DESTINATION ${DATADIR}/nemo-python/extensions RENAME syncstate-${APPLICATION_SHORTNAME}.py)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate_caja.py DESTINATION ${DATADIR}/caja-python/extensions RENAME syncstate-${APPLICATION_SHORTNAME}.py)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate.py DESTINATION ${DATADIR}/nautilus-python/extensions)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate_nemo.py DESTINATION ${DATADIR}/nemo-python/extensions RENAME syncstate.py)
    
    

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# this script creates a plugin for caja, just by replacing
-# all occurences of Nautilus with Caja (case sensitive).
-
-sed -i.org -e 's/Nautilus/Caja/g' syncstate_caja.py
-sed -i.org -e 's/nautilus/caja/g' syncstate_caja.py
@@ -18,7 +18,6 @@
 import os
 import urllib
 import socket
-import tempfile

 from gi.repository import GObject, Nautilus

@@ -44,7 +43,7 @@ def get_runtime_dir():
    try:
        return os.environ['XDG_RUNTIME_DIR']
    except KeyError:
-        fallback = os.path.join(tempfile.gettempdir(), 'runtime-' + os.environ['USER'])
+        fallback = '/tmp/runtime-' + os.environ['USER']
        return fallback


@@ -87,17 +86,22 @@ class SocketConnect(GObject.GObject):
    def _connectToSocketServer(self):
        try:
            self._sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-            sock_file = os.path.join(get_runtime_dir(), appname, "socket")
-            try:
-                print("Socket File: " + sock_file)
-                self._sock.connect(sock_file) # fails if sock_file doesn't exist
-                self.connected = True
-                print("Setting connected to %r." % self.connected )
-                self._watch_id = GObject.io_add_watch(self._sock, GObject.IO_IN, self._handle_notify)
-                print("Socket watch id: " + str(self._watch_id))
-                return False  # Don't run again
-            except Exception as e:
-                print("Could not connect to unix socket. " + str(e))
+            postfix = "/" + appname + "/socket"  # Should use os.path.join instead
+            sock_file = get_runtime_dir() + postfix
+            print ("Socket: " + sock_file + " <=> " + postfix)
+            if sock_file != postfix:
+                try:
+                    print("Socket File: " + sock_file)
+                    self._sock.connect(sock_file)
+                    self.connected = True
+                    print("Setting connected to %r." % self.connected )
+                    self._watch_id = GObject.io_add_watch(self._sock, GObject.IO_IN, self._handle_notify)
+                    print("Socket watch id: " + str(self._watch_id))
+                    return False  # Don't run again
+                except Exception as e:
+                    print("Could not connect to unix socket. " + str(e))
+            else:
+                print("Sock-File not valid: " + sock_file)
        except Exception as e:  # Bad habbit
            print("Connect could not be established, try again later.")
            self._sock.close()
@@ -153,65 +157,32 @@ class MenuExtension(GObject.GObject, Nautilus.MenuProvider):
    def __init__(self):
        GObject.GObject.__init__(self)

-    def check_registered_paths(self, filename):
-        topLevelFolder = False
-        internalFile = False
-        for reg_path in socketConnect.registered_paths:
-            if filename == reg_path:
-                topLevelFolder = True
-                break
-            if filename.startswith(reg_path):
-                internalFile = True
-                # you can't have a registered path below another so it is save to break here
-                break
-        return (topLevelFolder, internalFile)
-
    def get_file_items(self, window, files):
-        # Show the menu extension to share a file or folder
-        #
-        # Show if file is OK.
-        # Ignore top level folders.
-        # Also show extension for folders
-        #  if there is a OK or SYNC underneath.
-        # This is only
-
        if len(files) != 1:
            return
        file = files[0]
        items = []

-        filename = get_local_path(file.get_uri())
-        # Check if its a folder (ends with an /), if yes add a "/"
-        # otherwise it will not find the entry in the table
-        isDir = os.path.isdir(filename + os.sep)
-        if isDir:
-            filename += os.sep
+        # Internal or external file?!
+        syncedFile = False
+        for reg_path in socketConnect.registered_paths:
+            topLevelFolder = False
+            filename = get_local_path(file.get_uri())
+            # Check if its a folder (ends with an /), if yes add a "/"
+            # otherwise it will not find the entry in the table
+            if os.path.isdir(filename + "/"):
+                filename += "/"
+                # Check if toplevel folder, we need to ignore those as they cannot be shared
+                if filename == reg_path:
+                    topLevelFolder=True                
+            # Only show the menu extension if the file is synced and the sync
+            # status is ok. Not for ignored files etc.
+            # ignore top level folders
+            if filename.startswith(reg_path) and topLevelFolder == False and socketConnect.nautilusVFSFile_table[filename]['state'].startswith('OK'):
+                syncedFile = True

-        # Check if toplevel folder, we need to ignore those as they cannot be shared
-        topLevelFolder, internalFile = self.check_registered_paths(filename)
-        if topLevelFolder or not internalFile:
-            return items
-
-        entry = socketConnect.nautilusVFSFile_table.get(filename)
-        if not entry:
-            return items
-
-        shareable = False
-        state = entry['state']
-        state_ok = state.startswith('OK')
-        state_sync = state.startswith('SYNC')
-        if state_ok:
-            shareable = True
-        elif state_sync and isDir:
-            # some file below is OK or SYNC
-            for key, value in socketConnect.nautilusVFSFile_table.items():
-                if key != filename and key.startswith(filename):
-                    state = value['state']
-                    if state.startswith('OK') or state.startswith('SYNC'):
-                        shareable = True
-                        break
-
-        if not shareable:
+        # If it is neither in a synced folder or is a directory
+        if not syncedFile:
            return items

        # Create a menu item
@@ -332,7 +303,7 @@ class SyncStateExtension(GObject.GObject, Nautilus.ColumnProvider, Nautilus.Info

        filename = get_local_path(item.get_uri())
        if item.is_directory():
-            filename += os.sep
+            filename += '/'

        inScope = False
        for reg_path in socketConnect.registered_paths:
@@ -1,21 +1,165 @@
-The MIT License (MIT)
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007

-Copyright (c) 2011 Morgan Leborgne
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.

-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:

-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
@@ -1,27 +1,24 @@
 /*
- * The MIT License (MIT)
- *
- * Copyright (c) 2011 Morgan Leborgne
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
+*
+* This file is part of QProgressIndicator,
+* an open-source recent files menu widget
+*
+* Copyright (C) 2009 - 2010 Morgan Leborgne
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program 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 Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with QRecentFilesMenu. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
 #include "QProgressIndicator.h"

 #include <QPainter>
@@ -1,27 +1,24 @@
 /*
- * The MIT License (MIT)
- *
- * Copyright (c) 2011 Morgan Leborgne
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
+*
+* This file is part of QProgressIndicator,
+* an open-source recent files menu widget
+*
+* Copyright (C) 2009 - 2010 Morgan Leborgne
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program 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 Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with QRecentFilesMenu. If not, see <http://www.gnu.org/licenses/>.
+*
+*/
 #ifndef QPROGRESSINDICATOR_H
 #define QPROGRESSINDICATOR_H

@@ -67,8 +64,8 @@ public:
      */
    const QColor & color() const { return m_color; }

-    virtual QSize sizeHint() const;
-    int heightForWidth(int w) const;
+    virtual QSize sizeHint() const Q_DECL_OVERRIDE;
+    int heightForWidth(int w) const Q_DECL_OVERRIDE;
 public slots:
    /*! Starts the spin animation.
        \sa stopAnimation isAnimated
@@ -98,8 +95,8 @@ public slots:
     */
    void setColor(const QColor & color);
 protected:
-    virtual void timerEvent(QTimerEvent * event); 
-    virtual void paintEvent(QPaintEvent * event);
+    virtual void timerEvent(QTimerEvent * event) Q_DECL_OVERRIDE; 
+    virtual void paintEvent(QPaintEvent * event) Q_DECL_OVERRIDE;
 private:
    int m_angle;
    int m_timerId;
@@ -11,4 +11,4 @@ Qt 4.4.x.

 ## License

-MIT
+LGPL
@@ -18,7 +18,6 @@
 #include <QStringList>
 #include <QUrl>
 #include <QFile>
-#include <QFileInfo>
 #include <qdebug.h>

 #include "account.h"
@@ -29,7 +28,6 @@
 #include "syncengine.h"
 #include "syncjournaldb.h"
 #include "config.h"
-#include "connectionvalidator.h"

 #include "cmd.h"

@@ -42,14 +40,10 @@
 #include <windows.h>
 #else
 #include <termios.h>
-#include <unistd.h>
 #endif

 using namespace OCC;

-
-static void nullMessageHandler(QtMsgType, const char *) {}
-
 struct CmdOptions {
    QString source_dir;
    QString target_url;
@@ -73,8 +67,6 @@ struct CmdOptions {
 // So we have to use a global variable
 CmdOptions *opts = 0;

-const qint64 timeoutToUseMsec = qMax(1000, ConnectionValidator::DefaultCallingIntervalMsec - 5*1000);
-
 class EchoDisabler
 {
 public:
@@ -204,12 +196,10 @@ void parseOptions( const QStringList& app_args, CmdOptions *options )
    if (!options->source_dir.endsWith('/')) {
        options->source_dir.append('/');
    }
-    QFileInfo fi(options->source_dir);
-    if( !fi.exists() ) {
+    if( !QFile::exists( options->source_dir )) {
        std::cerr << "Source dir '" << qPrintable(options->source_dir) << "' does not exist." << std::endl;
        exit(1);
    }
-    options->source_dir = fi.absoluteFilePath();

    QStringListIterator it(args);
    // skip file name;
@@ -278,6 +268,7 @@ void selectiveSyncFixup(OCC::SyncJournalDb *journal, const QStringList &newList)
    }
 }

+
 int main(int argc, char **argv) {
    QCoreApplication app(argc, argv);

@@ -301,11 +292,6 @@ int main(int argc, char **argv) {

    parseOptions( app.arguments(), &options );

-    csync_set_log_level(options.silent ? 1 : 11);
-    if (options.silent) {
-        qInstallMsgHandler(nullMessageHandler);
-    }
-
    AccountPtr account = Account::create();

    if( !account ) {
@@ -382,20 +368,11 @@ int main(int argc, char **argv) {
    QByteArray remUrl = options.target_url.toUtf8();

    // Find the folder and the original owncloud url
-    QStringList splitted = url.path().split("/" + account->davPath());
+    QStringList splitted = url.path().split(account->davPath());
    url.setPath(splitted.value(0));

    url.setScheme(url.scheme().replace("owncloud", "http"));
-
-    QUrl credentialFreeUrl = url;
-    credentialFreeUrl.setUserName(QString());
-    credentialFreeUrl.setPassword(QString());
-
-    // Remote folders typically start with a / and don't end with one
-    QString folder = "/" + splitted.value(1);
-    if (folder.endsWith("/") && folder != "/") {
-        folder.chop(1);
-    }
+    QString folder = splitted.value(1);

    SimpleSslErrorHandler *sslErrorHandler = new SimpleSslErrorHandler;

@@ -408,29 +385,13 @@ int main(int argc, char **argv) {
    account->setCredentials(cred);
    account->setSslErrorHandler(sslErrorHandler);

-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    //obtain capabilities using event loop
-    QEventLoop loop;
-
-    JsonApiJob *job = new JsonApiJob(account, QLatin1String("ocs/v1.php/cloud/capabilities"));
-    job->setTimeout(timeoutToUseMsec);
-    QObject::connect(job, &JsonApiJob::jsonReceived, [&](const QVariantMap &json) {
-        auto caps = json.value("ocs").toMap().value("data").toMap().value("capabilities");
-        qDebug() << "Server capabilities" << caps;
-        account->setCapabilities(caps.toMap());
-        loop.quit();
-    });
-    job->start();
-
-    loop.exec();
-#endif
-
    // much lower age than the default since this utility is usually made to be run right after a change in the tests
    SyncEngine::minimumFileAgeForUpload = 0;

    int restartCount = 0;
 restart_sync:

+    csync_set_log_level(options.silent ? 1 : 11);

    opts = &options;

@@ -478,14 +439,12 @@ restart_sync:
    }

    Cmd cmd;
-    QString dbPath = options.source_dir + SyncJournalDb::makeDbName(credentialFreeUrl, folder, user);
-    SyncJournalDb db(dbPath);
-
+    SyncJournalDb db(options.source_dir);
    if (!selectiveSyncList.empty()) {
        selectiveSyncFixup(&db, selectiveSyncList);
    }

-    SyncEngine engine(account, options.source_dir, folder, &db);
+    SyncEngine engine(account, options.source_dir, QUrl(options.target_url), folder, &db);
    engine.setIgnoreHiddenFiles(options.ignoreHiddenFiles);
    QObject::connect(&engine, SIGNAL(finished(bool)), &app, SLOT(quit()));
    QObject::connect(&engine, SIGNAL(transmissionProgress(ProgressInfo)), &cmd, SLOT(transmissionProgressSlot()));
@@ -3,8 +3,7 @@
 *
 * This program 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; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; version 2 of the License.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -3,8 +3,7 @@
 *
 * This program 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; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; version 2 of the License.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -70,9 +70,9 @@ set(client_SRCS
    activityitemdelegate.cpp
    selectivesyncdialog.cpp
    settingsdialog.cpp
+    share.cpp
    sharedialog.cpp
    sharelinkwidget.cpp
-    sharemanager.cpp
    shareusergroupwidget.cpp
    sharee.cpp
    socketapi.cpp
@@ -94,26 +94,22 @@ set(client_SRCS
    servernotificationhandler.cpp
    creds/credentialsfactory.cpp
    creds/httpcredentialsgui.cpp
+    creds/shibbolethcredentials.cpp
+    creds/shibboleth/shibbolethwebview.cpp
+    creds/shibboleth/shibbolethuserjob.cpp
    wizard/postfixlineedit.cpp
    wizard/abstractcredswizardpage.cpp
    wizard/owncloudadvancedsetuppage.cpp
    wizard/owncloudconnectionmethoddialog.cpp
    wizard/owncloudhttpcredspage.cpp
    wizard/owncloudsetuppage.cpp
+    wizard/owncloudshibbolethcredspage.cpp
    wizard/owncloudwizardcommon.cpp
    wizard/owncloudwizard.cpp
    wizard/owncloudwizardresultpage.cpp
    ../3rdparty/qjson/json.cpp
 )

-IF(NOT NO_SHIBBOLETH)
-    list(APPEND client_SRCS
-        creds/shibbolethcredentials.cpp
-        creds/shibboleth/shibbolethwebview.cpp
-        creds/shibboleth/shibbolethuserjob.cpp
-        wizard/owncloudshibbolethcredspage.cpp
-    )
-endif()

 set(updater_SRCS
    updater/ocupdater.cpp
@@ -199,9 +195,6 @@ IF( WIN32 )
      ${CMAKE_CURRENT_BINARY_DIR}/version.rc
      @ONLY)
    set(client_version ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-    IF(NOT MSVC)
-        set(client_manifest ${CMAKE_CURRENT_SOURCE_DIR}/manifest-mingw.rc)
-    ENDIF()
 ENDIF()

 set( final_src
@@ -209,7 +202,6 @@ set( final_src
    ${client_SRCS}
    ${client_UI_SRCS}
    ${client_version}
-    ${client_manifest}
    ${guiMoc}
    ${client_I18N}
    ${3rdparty_SRC}
@@ -240,9 +232,6 @@ set(ownCloud ${ownCloud_old})
 if (WITH_DBUS)
    set(ADDITIONAL_APP_MODULES DBus)
 endif(WITH_DBUS)
-if (NOT NO_SHIBBOLETH)
-    list(APPEND ADDITIONAL_APP_MODULES WebKitWidgets)
-endif()

 if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)

@@ -261,14 +250,14 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)

    # add_executable( ${APPLICATION_EXECUTABLE} main.cpp ${final_src})
    add_executable( ${APPLICATION_EXECUTABLE} WIN32 main.cpp ${final_src})
-    qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml Sql ${ADDITIONAL_APP_MODULES})
+    qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql ${ADDITIONAL_APP_MODULES})
 else()
    # set(CMAKE_INSTALL_PREFIX ".") # Examples use /Applications. hurmpf.
    set(MACOSX_BUNDLE_ICON_FILE "ownCloud.icns")

    # we must add MACOSX_BUNDLE only if building a bundle
    add_executable( ${APPLICATION_EXECUTABLE} WIN32 MACOSX_BUNDLE main.cpp ${final_src})
-    qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml Sql  ${ADDITIONAL_APP_MODULES})
+    qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql  ${ADDITIONAL_APP_MODULES})

    set (QM_DIR ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/Translations)
    install(FILES ${client_I18N} DESTINATION ${QM_DIR})
@@ -3,8 +3,7 @@
 *
 * This program 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; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; version 2 of the License.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -45,7 +44,7 @@ AccountManager *AccountManager::instance()

 bool AccountManager::restore()
 {
-    auto settings = Utility::settingsWithGroup(QLatin1String(accountsC));
+    auto settings = Account::settingsWithGroup(QLatin1String(accountsC));

    // If there are no accounts, check the old format.
    if (settings->childGroups().isEmpty()
@@ -70,7 +69,9 @@ bool AccountManager::restore()
 bool AccountManager::restoreFromLegacySettings()
 {
    // try to open the correctly themed settings
-    auto settings = Utility::settingsWithGroup(Theme::instance()->appName());
+    auto settings = Account::settingsWithGroup(Theme::instance()->appName());
+
+    bool migratedCreds = false;

    // if the settings file could not be opened, the childKeys list is empty
    // then try to load settings from a very old place
@@ -101,6 +102,7 @@ bool AccountManager::restoreFromLegacySettings()
                qDebug() << "Migrate oC config if " << oCUrl << " == " << overrideUrl << ":"
                         << (oCUrl == overrideUrl ? "Yes" : "No");
                if( oCUrl == overrideUrl ) {
+                    migratedCreds = true;
                    settings.reset( oCSettings );
                } else {
                    delete oCSettings;
@@ -112,6 +114,9 @@ bool AccountManager::restoreFromLegacySettings()
    // Try to load the single account.
    if (!settings->childKeys().isEmpty()) {
        if (auto acc = loadAccountHelper(*settings)) {
+            if (migratedCreds) {
+                acc->setMigrated(true);
+            }
            addAccount(acc);
            return true;
        }
@@ -121,7 +126,7 @@ bool AccountManager::restoreFromLegacySettings()

 void AccountManager::save(bool saveCredentials)
 {
-    auto settings = Utility::settingsWithGroup(QLatin1String(accountsC));
+    auto settings = Account::settingsWithGroup(QLatin1String(accountsC));
    settings->setValue(QLatin1String(versionC), 2);
    foreach (const auto &acc, _accounts) {
        settings->beginGroup(acc->account()->id());
@@ -137,7 +142,7 @@ void AccountManager::save(bool saveCredentials)
 void AccountManager::saveAccount(Account* a)
 {
    qDebug() << "Saving account" << a->url().toString();
-    auto settings = Utility::settingsWithGroup(QLatin1String(accountsC));
+    auto settings = Account::settingsWithGroup(QLatin1String(accountsC));
    settings->beginGroup(a->id());
    saveAccountHelper(a, *settings, false); // don't save credentials they might not have been loaded yet
    settings->endGroup();
@@ -149,7 +154,7 @@ void AccountManager::saveAccount(Account* a)
 void AccountManager::saveAccountState(AccountState* a)
 {
    qDebug() << "Saving account state" << a->account()->url().toString();
-    auto settings = Utility::settingsWithGroup(QLatin1String(accountsC));
+    auto settings = Account::settingsWithGroup(QLatin1String(accountsC));
    settings->beginGroup(a->account()->id());
    a->writeToSettings(*settings);
    settings->endGroup();
@@ -204,13 +209,6 @@ void AccountManager::saveAccountHelper(Account* acc, QSettings& settings, bool s

 AccountPtr AccountManager::loadAccountHelper(QSettings& settings)
 {
-    auto urlConfig = settings.value(QLatin1String(urlC));
-    if (!urlConfig.isValid()) {
-        // No URL probably means a corrupted entry in the account settings
-        qDebug() << "No URL for account " << settings.group();
-        return AccountPtr();
-    }
-
    auto acc = createAccount();

    QString authType = settings.value(QLatin1String(authTypeC)).toString();
@@ -222,7 +220,7 @@ AccountPtr AccountManager::loadAccountHelper(QSettings& settings)
        acc->setUrl(overrideUrl);
        authType = forceAuth;
    } else {
-        acc->setUrl(urlConfig.toUrl());
+        acc->setUrl(settings.value(QLatin1String(urlC)).toUrl());
    }
    acc->_serverVersion = settings.value(QLatin1String(serverVersionC)).toString();

@@ -275,7 +273,7 @@ void AccountManager::deleteAccount(AccountState* account)
    auto copy = *it; // keep a reference to the shared pointer so it does not delete it just yet
    _accounts.erase(it);

-    auto settings = Utility::settingsWithGroup(QLatin1String(accountsC));
+    auto settings = Account::settingsWithGroup(QLatin1String(accountsC));
    settings->remove(account->account()->id());

    emit accountRemoved(account);
@@ -3,8 +3,7 @@
 *
 * This program 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; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; version 2 of the License.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -3,8 +3,7 @@
 *
 * This program 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; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; version 2 of the License.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -118,10 +117,6 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent) :

    connect(ui->selectiveSyncApply, SIGNAL(clicked()), _model, SLOT(slotApplySelectiveSync()));
    connect(ui->selectiveSyncCancel, SIGNAL(clicked()), _model, SLOT(resetFolders()));
-    connect(ui->bigFolderApply, SIGNAL(clicked(bool)), _model, SLOT(slotApplySelectiveSync()));
-    connect(ui->bigFolderSyncAll, SIGNAL(clicked(bool)), _model, SLOT(slotSyncAllPendingBigFolders()));
-    connect(ui->bigFolderSyncNone, SIGNAL(clicked(bool)), _model, SLOT(slotSyncNoPendingBigFolders()));
-
    connect(FolderMan::instance(), SIGNAL(folderListChanged(Folder::Map)), _model, SLOT(resetFolders()));
    connect(this, SIGNAL(folderChanged()), _model, SLOT(resetFolders()));

@@ -289,8 +284,7 @@ void AccountSettings::slotFolderWizardAccepted()
    FolderDefinition definition;
    definition.localPath    = FolderDefinition::prepareLocalPath(
            folderWizard->field(QLatin1String("sourceFolder")).toString());
-    definition.targetPath   = FolderDefinition::prepareTargetPath(
-            folderWizard->property("targetPath").toString());
+    definition.targetPath   = folderWizard->property("targetPath").toString();

    {
        QDir dir(definition.localPath);
@@ -323,7 +317,7 @@ void AccountSettings::slotFolderWizardAccepted()
        // The user already accepted the selective sync dialog. everything is in the white list
        f->journalDb()->setSelectiveSyncList(SyncJournalDb::SelectiveSyncWhiteList,
                                             QStringList() << QLatin1String("/"));
-        folderMan->scheduleAllFolders();
+        folderMan->slotScheduleAllFolders();
        emit folderChanged();
    }
 }
@@ -362,7 +356,7 @@ void AccountSettings::slotRemoveCurrentFolder()
                return;
            }

-            folderMan->removeFolder( folderMan->folder(alias) );
+            folderMan->slotRemoveFolder( folderMan->folder(alias) );
            _model->removeRow(row);

            // single folder fix to show add-button and hide remove-button
@@ -470,7 +464,7 @@ void AccountSettings::slotSyncCurrentFolderNow()
    QString alias = _model->data( selected, FolderStatusDelegate::FolderAliasRole ).toString();
    FolderMan *folderMan = FolderMan::instance();

-    folderMan->scheduleFolder(folderMan->folder(alias));
+    folderMan->slotScheduleSync(folderMan->folder(alias));
 }

 void AccountSettings::slotOpenOC()
@@ -641,13 +635,12 @@ void AccountSettings::refreshSelectiveSyncStatus()
    }

    if (msg.isEmpty()) {
-        ui->selectiveSyncButtons->setVisible(true);
-        ui->bigFolderUi->setVisible(false);
+        ui->selectiveSyncNotification->setVisible(false);
+        ui->selectiveSyncNotification->setText(QString());
    } else {
+        ui->selectiveSyncNotification->setVisible(true);
        QString wholeMsg = tr("There are new folders that were not synchronized because they are too big: ") + msg;
        ui->selectiveSyncNotification->setText(wholeMsg);
-        ui->selectiveSyncButtons->setVisible(false);
-        ui->bigFolderUi->setVisible(true);
        shouldBeVisible = true;
    }

@@ -3,8 +3,7 @@
 *
 * This program 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; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; version 2 of the License.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -154,105 +154,44 @@
         </widget>
        </item>
        <item>
-         <widget class="QWidget" name="bigFolderUi" native="true">
-          <layout class="QVBoxLayout" name="verticalLayout">
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QLabel" name="selectiveSyncNotification">
-             <property name="styleSheet">
-              <string notr="true">color: red</string>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_2">
-             <item>
-              <widget class="QPushButton" name="bigFolderSyncAll">
-               <property name="text">
-                <string>Synchronize all</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QPushButton" name="bigFolderSyncNone">
-               <property name="text">
-                <string>Synchronize none</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QPushButton" name="bigFolderApply">
-               <property name="text">
-                <string>Apply manual changes</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-          </layout>
+         <widget class="QLabel" name="selectiveSyncNotification">
+          <property name="styleSheet">
+           <string notr="true">color: red</string>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="wordWrap">
+           <bool>true</bool>
+          </property>
         </widget>
        </item>
       </layout>
      </item>
      <item>
-       <widget class="QWidget" name="selectiveSyncButtons" native="true">
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QPushButton" name="selectiveSyncCancel">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Cancel</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="selectiveSyncApply">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Apply</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
+       <widget class="QPushButton" name="selectiveSyncCancel">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Cancel</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="selectiveSyncApply">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Apply</string>
+        </property>
       </widget>
      </item>
     </layout>
@@ -3,8 +3,7 @@
 *
 * This program 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; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; version 2 of the License.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -307,7 +306,7 @@ void AccountState::slotCredentialsAsked(AbstractCredentials* credentials)

 std::unique_ptr<QSettings> AccountState::settings()
 {
-    auto s = Utility::settingsWithGroup(QLatin1String("Accounts"));
+    auto s = _account->settingsWithGroup(QLatin1String("Accounts"));
    s->beginGroup(_account->id());
    return s;
 }
@@ -3,8 +3,7 @@
 *
 * This program 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; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; version 2 of the License.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -3,8 +3,7 @@
 *
 * This program 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; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; version 2 of the License.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -3,8 +3,7 @@
 *
 * This program 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; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; version 2 of the License.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -3,8 +3,7 @@
 *
 * This program 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; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation; version 2 of the License.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
--- a/Mostrar Mais
+++ b/Mostrar Mais