diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index 4300e2c54..ab685afcd 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -115,12 +115,9 @@ AccountSettings::AccountSettings(QWidget *parent) : slotAccountChanged(AccountManager::instance()->account(), 0); FolderMan *folderMan = FolderMan::instance(); - connect(folderMan, SIGNAL(folderSyncStateChange(QString)), - this, SLOT(slotSyncStateChange(QString))); connect(folderMan, SIGNAL(folderListLoaded(Folder::Map)), this, SLOT(setFolderList(Folder::Map))); setFolderList(FolderMan::instance()->map()); - slotSyncStateChange(); } void AccountSettings::slotAccountChanged(Account *newAccount, Account *oldAccount) @@ -790,7 +787,6 @@ void AccountSettings::slotAccountStateChanged(int state) foreach (Folder *folder, folderMan->map().values()) { slotUpdateFolderState(folder); } - slotSyncStateChange(); if (state == Account::Connected) { QString user; if (AbstractCredentials *cred = _account->credentials()) { @@ -816,21 +812,6 @@ void AccountSettings::slotAccountStateChanged(int state) } } -void AccountSettings::slotSyncStateChange(const QString& alias) -{ - Q_UNUSED(alias); - - QIcon icon; - if (_account && _account->state() == Account::Connected) { - FolderMan *folderMan = FolderMan::instance(); - SyncResult state = folderMan->accountStatus(folderMan->map().values()); - icon = Theme::instance()->syncStateIcon(state.status()); - } else { - icon = Theme::instance()->folderOfflineIcon(); - } - emit accountIconChanged(icon); -} - AccountSettings::~AccountSettings() { delete ui; diff --git a/src/gui/accountsettings.h b/src/gui/accountsettings.h index 1be0af7e8..f6c8fb1a0 100644 --- a/src/gui/accountsettings.h +++ b/src/gui/accountsettings.h @@ -54,7 +54,6 @@ signals: void openProtocol(); void openFolderAlias( const QString& ); void infoFolderAlias( const QString& ); - void accountIconChanged( const QIcon& ); public slots: void slotFolderActivated( const QModelIndex& ); @@ -63,7 +62,6 @@ public slots: void slotDoubleClicked( const QModelIndex& ); void slotSetProgress(const QString& folder, const Progress::Info& progress); void slotButtonsSetEnabled(); - void slotSyncStateChange(const QString& alias = QString()); void slotUpdateQuota( qint64,qint64 ); void slotIgnoreFilesEditor(); diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp index 550faa067..94e2a3fb5 100644 --- a/src/gui/settingsdialog.cpp +++ b/src/gui/settingsdialog.cpp @@ -105,7 +105,6 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) : connect(group, SIGNAL(triggered(QAction*)), SLOT(slotSwitchPage(QAction*))); connect( _accountSettings, SIGNAL(folderChanged()), gui, SLOT(slotFoldersChanged())); - connect( _accountSettings, SIGNAL(accountIconChanged(QIcon)), SLOT(slotUpdateAccountIcon(QIcon))); connect( _accountSettings, SIGNAL(openFolderAlias(const QString&)), gui, SLOT(slotFolderOpenAction(QString)));