[Pkg-owncloud-commits] [owncloud-client] 210/332: SocketAPI: Create the socket API instance in folderman.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit fef713aaedb395a772f42adf899641c089a83af9
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Mon Jul 14 15:31:38 2014 +0200

    SocketAPI: Create the socket API instance in folderman.
---
 .../mackie.xcuserdatad/UserInterfaceState.xcuserstate   | Bin 0 -> 33432 bytes
 src/mirall/application.cpp                              |   3 ---
 src/mirall/application.h                                |   1 -
 src/mirall/folderman.cpp                                |   6 +++++-
 src/mirall/folderman.h                                  |   6 ++++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/shell_integration/MacOSX/LiferayNativity.xcworkspace/xcuserdata/mackie.xcuserdatad/UserInterfaceState.xcuserstate b/shell_integration/MacOSX/LiferayNativity.xcworkspace/xcuserdata/mackie.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000..a86c41f
Binary files /dev/null and b/shell_integration/MacOSX/LiferayNativity.xcworkspace/xcuserdata/mackie.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp
index aac84b0..c5acd2d 100644
--- a/src/mirall/application.cpp
+++ b/src/mirall/application.cpp
@@ -151,9 +151,6 @@ Application::Application(int &argc, char **argv) :
     }
 
     connect (this, SIGNAL(aboutToQuit()), SLOT(slotCleanup()));
-
-    _socketApi = new SocketApi(this, QUrl::fromLocalFile(cfg.configPathWithAppName().append(QLatin1String("socket"))));
-
 }
 
 Application::~Application()
diff --git a/src/mirall/application.h b/src/mirall/application.h
index 36d3baa..19c8800 100644
--- a/src/mirall/application.h
+++ b/src/mirall/application.h
@@ -87,7 +87,6 @@ private:
     void setHelp();
 
     QPointer<ownCloudGui> _gui;
-    QPointer<SocketApi> _socketApi;
 
     QPointer<ConnectionValidator> _conValidator;
 
diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp
index 1c701ef..ed34475 100644
--- a/src/mirall/folderman.cpp
+++ b/src/mirall/folderman.cpp
@@ -17,6 +17,7 @@
 #include "mirall/folder.h"
 #include "mirall/syncresult.h"
 #include "mirall/theme.h"
+#include "mirall/socketapi.h"
 
 #include <neon/ne_socket.h>
 
@@ -28,7 +29,7 @@
 #endif
 
 #include <QMessageBox>
-
+#include <QPointer>
 #include <QtCore>
 
 namespace Mirall {
@@ -47,6 +48,9 @@ FolderMan::FolderMan(QObject *parent) :
     connect(_folderWatcherSignalMapper, SIGNAL(mapped(const QString&)),
             this, SLOT(slotScheduleSync(const QString&)));
 
+    MirallConfigFile cfg;
+    _socketApi = new SocketApi(this, QUrl::fromLocalFile(cfg.configPathWithAppName().append(QLatin1String("socket"))));
+
     ne_sock_init();
     Q_ASSERT(!_instance);
     _instance = this;
diff --git a/src/mirall/folderman.h b/src/mirall/folderman.h
index a78c547..c3a8d00 100644
--- a/src/mirall/folderman.h
+++ b/src/mirall/folderman.h
@@ -19,6 +19,7 @@
 #include <QObject>
 #include <QQueue>
 #include <QList>
+#include <QPointer>
 
 #include "mirall/folder.h"
 #include "mirall/folderwatcher.h"
@@ -26,11 +27,11 @@
 
 class QSignalMapper;
 
-class SyncResult;
-
 namespace Mirall {
 
 class Application;
+class SyncResult;
+class SocketApi;
 
 class FolderMan : public QObject
 {
@@ -146,6 +147,7 @@ private:
     bool           _syncEnabled;
     QQueue<QString> _scheduleQueue;
     QMap<QString, FolderWatcher*> _folderWatchers;
+    QPointer<SocketApi> _socketApi;
 
     static FolderMan *_instance;
     explicit FolderMan(QObject *parent = 0);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git