HACK to avoid continuation: See task #1448

We do not know the _modtime from the server, at this point, so just set
the current one.  (rather than the one locally)

src/mirall/csyncthread.cpp

@@ -490,8 +490,6 @@ void CSyncThread::startSync()
     // }
 
     // csync_set_auth_callback( _csync_ctx, getauth );
-    csync_set_log_callback( csyncLogCatcher );
-    csync_set_log_level( 11 );
 
     _syncTime.start();
 

src/mirall/owncloudpropagator.cpp

@@ -122,6 +122,10 @@ bool PropagateItemJob::checkForProblemsWithShared(const QString& msg)
             } else if (downloadItem._instruction == CSYNC_INSTRUCTION_SYNC) {
                 // we modified the file locally, jsut create a conflict then
                 downloadItem._instruction = CSYNC_INSTRUCTION_CONFLICT;
+
+                // HACK to avoid continuation: See task #1448:  We do not know the _modtime from the
+                //  server, at this point, so just set the current one. (rather than the one locally)
+                downloadItem._modtime = Utility::qDateTimeToTime_t(QDateTime::currentDateTime());
             } else {
                 // the file was removed or renamed, just recover the old one
                 downloadItem._instruction = CSYNC_INSTRUCTION_SYNC;

src/mirall/utility_unix.cpp

@@ -26,17 +26,30 @@ static void setupFavLink_private(const QString &folder) {
     }
 }
 
+// returns the autostart directory the linux way
+// and respects the XDG_CONFIG_HOME env variable
+// can be replaces for qt5 with QStandardPaths
+QString getUserAutostartDir_private()
+{
+    QString config = QLatin1String(qgetenv("XDG_CONFIG_HOME"));
+
+    if (config.isEmpty()) {
+        config = QDir::homePath()+QLatin1String("/.config");
+    }
+    config += QLatin1String("/autostart/");
+    return config;
+}
+
 bool hasLaunchOnStartup_private(const QString &appName)
 {
-    QString userAutoStartPath = QDir::homePath()+QLatin1String("/.config/autostart/");
-    QString desktopFileLocation = userAutoStartPath+appName+QLatin1String(".desktop");
+    QString desktopFileLocation = getUserAutostartDir_private()+appName+QLatin1String(".desktop");
     return QFile::exists(desktopFileLocation);
 }
 
 
 void setLaunchOnStartup_private(const QString &appName, const QString& guiName, bool enable)
 {
-    QString userAutoStartPath = QDir::homePath()+QLatin1String("/.config/autostart/");
+    QString userAutoStartPath = getUserAutostartDir_private();
     QString desktopFileLocation = userAutoStartPath+appName+QLatin1String(".desktop");
     if (enable) {
         if (!QDir().exists(userAutoStartPath) && !QDir().mkdir(userAutoStartPath)) {

src/owncloudcmd/owncloudcmd.cpp

@@ -126,6 +126,7 @@ int main(int argc, char **argv) {
         qFatal("ne_sock_init failed!");
     }
 
+    csync_set_log_callback( csyncLogCatcher );
     csync_set_log_level(11);
     csync_enable_conflictcopys(_csync_ctx);
     Logger::instance()->setLogFile("-");