From e5471d8318a7063f726a8df1abc6a7c7d1648f9a Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <danimo@owncloud.com>
Date: Tue, 26 Aug 2014 14:33:21 +0200
Subject: [PATCH] Build after merge

---
 src/CMakeLists.txt                          |  2 -
 src/gui/CMakeLists.txt                      |  1 +
 src/{mirall => gui}/selectivesyncdialog.cpp |  0
 src/{mirall => gui}/selectivesyncdialog.h   |  0
 src/libsync/CMakeLists.txt                  | 41 +++++++++++----------
 src/{mirall => libsync}/discoveryphase.cpp  |  0
 src/{mirall => libsync}/discoveryphase.h    |  0
 7 files changed, 22 insertions(+), 22 deletions(-)
 rename src/{mirall => gui}/selectivesyncdialog.cpp (100%)
 rename src/{mirall => gui}/selectivesyncdialog.h (100%)
 rename src/{mirall => libsync}/discoveryphase.cpp (100%)
 rename src/{mirall => libsync}/discoveryphase.h (100%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 62875a07f..094d08372 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,4 @@
 # TODO: OSX and LIB_ONLY seem to require this to go to binary dir only
-    mirall/discoveryphase.cpp
-    mirall/selectivesyncdialog.cpp
 set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 6ab4bcf75..8df39671b 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -47,6 +47,7 @@ set(mirall_SRCS
     owncloudgui.cpp
     owncloudsetupwizard.cpp
     protocolwidget.cpp
+    selectivesyncdialog.cpp
     settingsdialog.cpp
     socketapi.cpp
     sslbutton.cpp
diff --git a/src/mirall/selectivesyncdialog.cpp b/src/gui/selectivesyncdialog.cpp
similarity index 100%
rename from src/mirall/selectivesyncdialog.cpp
rename to src/gui/selectivesyncdialog.cpp
diff --git a/src/mirall/selectivesyncdialog.h b/src/gui/selectivesyncdialog.h
similarity index 100%
rename from src/mirall/selectivesyncdialog.h
rename to src/gui/selectivesyncdialog.h
diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
index 318af28d6..b2df14edb 100644
--- a/src/libsync/CMakeLists.txt
+++ b/src/libsync/CMakeLists.txt
@@ -32,30 +32,31 @@ if(SPARKLE_FOUND AND NOT BUILD_LIBRARIES_ONLY)
 endif()
 
 set(libsync_SRCS
-    authenticationdialog.cpp
-    mirallconfigfile.cpp
-    syncengine.cpp
-    owncloudpropagator.cpp
-    propagatorjobs.cpp
-    propagator_qnam.cpp
-    propagator_legacy.cpp
-    syncjournalfilerecord.cpp
-    syncjournaldb.cpp
-    theme.cpp
-    logger.cpp
-    utility.cpp
-    filesystem.cpp
-    connectionvalidator.cpp
-    progressdispatcher.cpp
-    mirallaccessmanager.cpp
-    networkjobs.cpp
     account.cpp
-    quotainfo.cpp
+    authenticationdialog.cpp
     clientproxy.cpp
+    connectionvalidator.cpp
     cookiejar.cpp
-    syncfilestatus.cpp
-    syncresult.cpp
+    discoveryphase.cpp
+    filesystem.cpp
+    logger.cpp
+    mirallaccessmanager.cpp
+    mirallconfigfile.cpp
+    networkjobs.cpp
+    owncloudpropagator.cpp
     owncloudtheme.cpp
+    progressdispatcher.cpp
+    propagatorjobs.cpp
+    propagator_legacy.cpp
+    propagator_qnam.cpp
+    quotainfo.cpp
+    syncengine.cpp
+    syncfilestatus.cpp
+    syncjournaldb.cpp
+    syncjournalfilerecord.cpp
+    syncresult.cpp
+    theme.cpp
+    utility.cpp
     creds/dummycredentials.cpp
     creds/abstractcredentials.cpp
     creds/credentialsfactory.cpp
diff --git a/src/mirall/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
similarity index 100%
rename from src/mirall/discoveryphase.cpp
rename to src/libsync/discoveryphase.cpp
diff --git a/src/mirall/discoveryphase.h b/src/libsync/discoveryphase.h
similarity index 100%
rename from src/mirall/discoveryphase.h
rename to src/libsync/discoveryphase.h