[Pkg-owncloud-commits] [owncloud-client] 212/332: SocketAPI: rename slot to send UPDATE_VIEW.

[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 0e9a08cbbf055ab1d77df6fbc75f4be2cd179cfe
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Tue Jul 15 13:34:32 2014 +0200

    SocketAPI: rename slot to send UPDATE_VIEW.
---
 .../UserInterfaceState.xcuserstate                  | Bin 33432 -> 33056 bytes
 src/mirall/folderman.cpp                            |   4 +++-
 src/mirall/socketapi.cpp                            |   8 ++++----
 src/mirall/socketapi.h                              |   4 +++-
 4 files changed, 10 insertions(+), 6 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
index a86c41f..0d18ea8 100644
Binary files a/shell_integration/MacOSX/LiferayNativity.xcworkspace/xcuserdata/mackie.xcuserdatad/UserInterfaceState.xcuserstate and b/shell_integration/MacOSX/LiferayNativity.xcworkspace/xcuserdata/mackie.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/src/mirall/folderman.cpp b/src/mirall/folderman.cpp
index ed34475..ee8aced 100644
--- a/src/mirall/folderman.cpp
+++ b/src/mirall/folderman.cpp
@@ -49,11 +49,12 @@ FolderMan::FolderMan(QObject *parent) :
             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;
+
+    _socketApi = new SocketApi(this, QUrl::fromLocalFile(cfg.configPathWithAppName().append(QLatin1String("socket"))));
 }
 
 FolderMan *FolderMan::instance()
@@ -429,6 +430,7 @@ void FolderMan::slotScheduleSync( const QString& alias )
                 f->prepareToSync();
             } else {
                 qDebug() << "Folder is not enabled, not scheduled!";
+                _socketApi->slotUpdateFolderView(f->alias());
                 return;
             }
         }
diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp
index baac107..a4f6965 100644
--- a/src/mirall/socketapi.cpp
+++ b/src/mirall/socketapi.cpp
@@ -155,7 +155,6 @@ SyncFileStatus fileStatus(Folder *folder, const QString& fileName )
 
 }
 
-
 SocketApi::SocketApi(QObject* parent, const QUrl& localFile)
     : QObject(parent)
     , _localServer(0)
@@ -166,8 +165,9 @@ SocketApi::SocketApi(QObject* parent, const QUrl& localFile)
     connect(_localServer, SIGNAL(newConnection()), this, SLOT(slotNewConnection()));
 
     // folder watcher
-    connect(FolderMan::instance(), SIGNAL(folderSyncStateChange(QString)), SLOT(slotSyncStateChanged(QString)));
-    connect(ProgressDispatcher::instance(), SIGNAL(jobCompleted(QString,SyncFileItem)), SLOT(slotJobCompleted(QString,SyncFileItem)));
+    connect(FolderMan::instance(), SIGNAL(folderSyncStateChange(QString)), this, SLOT(slotUpdateFolderView(QString)));
+    connect(ProgressDispatcher::instance(), SIGNAL(jobCompleted(QString,SyncFileItem)),
+            SLOT(slotJobCompleted(QString,SyncFileItem)));
 }
 
 SocketApi::~SocketApi()
@@ -222,7 +222,7 @@ void SocketApi::slotReadSocket()
     }
 }
 
-void SocketApi::slotSyncStateChanged(const QString& alias)
+void SocketApi::slotUpdateFolderView(const QString& alias)
 {
     QString msg = QLatin1String("UPDATE_VIEW");
 
diff --git a/src/mirall/socketapi.h b/src/mirall/socketapi.h
index 6bf28bb..9bf2c01 100644
--- a/src/mirall/socketapi.h
+++ b/src/mirall/socketapi.h
@@ -36,11 +36,13 @@ public:
     SocketApi(QObject* parent, const QUrl& localFile);
     virtual ~SocketApi();
 
+public slots:
+    void slotUpdateFolderView(const QString&);
+
 private slots:
     void slotNewConnection();
     void onLostConnection();
     void slotReadSocket();
-    void slotSyncStateChanged(const QString&);
     void slotJobCompleted(const QString &, const SyncFileItem &);
 
 private:

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