- set app name correctly in config file class

- fix link to newly  installed ownCloud

src/mirall/application.cpp

@@ -48,17 +48,16 @@ Application::Application(int argc, char **argv) :
     _networkMgr(new QNetworkConfigurationManager(this)),
     _contextMenu(0)
 {
-    INotify::initialize();
-
 #ifdef OWNCLOUD_CLIENT
     _theme = new ownCloudTheme();
 #else
     _theme = new mirallTheme();
 #endif
+    setApplicationName( _theme->appName() );
+    INotify::initialize();
 
     _folderMan = new FolderMan();
 
-    setApplicationName( _theme->appName() );
     setQuitOnLastWindowClosed(false);
 
     _folderWizard = new FolderWizard();

src/mirall/folderman.cpp

@@ -32,12 +32,11 @@ FolderMan::FolderMan(QObject *parent) :
     _folderSyncCount(0)
 
 {
-    _folderConfigPath = QDesktopServices::storageLocation(QDesktopServices::DataLocation) + "/folders";
-
     // if QDir::mkpath would not be so stupid, I would not need to have this
     // duplication of folderConfigPath() here
     QDir storageDir(QDesktopServices::storageLocation(QDesktopServices::DataLocation));
     storageDir.mkpath("folders");
+    _folderConfigPath = QDesktopServices::storageLocation(QDesktopServices::DataLocation) + "/folders";
 }
 
 FolderMan::~FolderMan()
@@ -55,10 +54,8 @@ Mirall::Folder::Map FolderMan::map()
 
 int FolderMan::setupFolders()
 {
-    QDir storageDir(QDesktopServices::storageLocation(QDesktopServices::DataLocation));
-
     // setup a handler to look for configuration changes
-    _configFolderWatcher = new FolderWatcher(storageDir.path());
+    _configFolderWatcher = new FolderWatcher( _folderConfigPath );
     connect(_configFolderWatcher, SIGNAL(folderChanged(const QStringList &)),
             this, SLOT(slotReparseConfiguration()));
 

src/mirall/mirallconfigfile.cpp

@@ -31,6 +31,9 @@ QString MirallConfigFile::mirallConfigFile() const
 #else
     mirallTheme theme;
 #endif
+    if( qApp->applicationName().isEmpty() ) {
+        qApp->setApplicationName( theme.appName() );
+    }
     const QString dir = QDesktopServices::storageLocation(QDesktopServices::DataLocation)+"/"+theme.configFileName();
     return dir;
 }

src/mirall/owncloudwizard.cpp

@@ -293,8 +293,8 @@ void OwncloudWizard::slotCurrentPageChanged( int id )
     showOCUrlLabel( false );
     if( field("connectMyOC").toBool() ) {
       // check the url and connect.
-      QString url = field("OCUrl").toString();
-      emit connectToOCUrl( url );
+      _oCUrl = field("OCUrl").toString();
+      emit connectToOCUrl( _oCUrl);
     } else if( field("createLocalOC").toBool() ) {
       qDebug() << "Connect to local!";
       emit installOCLocalhost();