8 files changed, 1 insertions, 33 deletions

diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp
index c8944f2a7..4c88214ee 100644
--- a/src/mirall/accountsettings.cpp
+++ b/src/mirall/accountsettings.cpp
@@ -72,7 +72,6 @@ AccountSettings::AccountSettings(QWidget *parent) :
 
     ui->_buttonRemove->setEnabled(false);
     ui->_buttonEnable->setEnabled(false);
-    ui->_buttonInfo->setEnabled(false);
     ui->_buttonAdd->setEnabled(true);
 
     QAction *resetFolderAction = new QAction(this);
@@ -87,7 +86,6 @@ AccountSettings::AccountSettings(QWidget *parent) :
 
     connect(ui->_buttonRemove, SIGNAL(clicked()), this, SLOT(slotRemoveCurrentFolder()));
     connect(ui->_buttonEnable, SIGNAL(clicked()), this, SLOT(slotEnableCurrentFolder()));
-    connect(ui->_buttonInfo,   SIGNAL(clicked()), this, SLOT(slotInfoAboutCurrentFolder()));
     connect(ui->_buttonAdd,    SIGNAL(clicked()), this, SLOT(slotAddFolder()));
     connect(ui->modifyAccountButton, SIGNAL(clicked()), SLOT(slotOpenAccountWizard()));
     connect(ui->ignoredFilesButton, SIGNAL(clicked()), SLOT(slotIgnoreFilesEditor()));;
@@ -126,7 +124,6 @@ void AccountSettings::slotFolderActivated( const QModelIndex& indx )
       ui->_buttonAdd->setEnabled( state );
   }
   ui->_buttonEnable->setEnabled( state );
-  ui->_buttonInfo->setEnabled( state );
 
   if ( state ) {
     bool folderEnabled = _model->data( indx, FolderStatusDelegate::FolderSyncEnabled).toBool();
@@ -805,11 +802,6 @@ void AccountSettings::slotAccountStateChanged(int state)
     }
 }
 
-void AccountSettings::slotInfoAboutCurrentFolder()
-{
-    emit(openProtocol());
-}
-
 AccountSettings::~AccountSettings()
 {
     delete ui;
diff --git a/src/mirall/accountsettings.h b/src/mirall/accountsettings.h
index ed9f462f3..daff6ae1c 100644
--- a/src/mirall/accountsettings.h
+++ b/src/mirall/accountsettings.h
@@ -78,7 +78,6 @@ protected slots:
     void slotEnableCurrentFolder();
     void slotSyncCurrentFolderNow();
     void slotRemoveCurrentFolder();
-    void slotInfoAboutCurrentFolder();
     void slotResetCurrentFolder();
     void slotFolderWizardAccepted();
     void slotFolderWizardRejected();
diff --git a/src/mirall/accountsettings.ui b/src/mirall/accountsettings.ui
index 5d9bc23f4..e195c7682 100644
--- a/src/mirall/accountsettings.ui
+++ b/src/mirall/accountsettings.ui
@@ -92,13 +92,6 @@
           </property>
          </spacer>
         </item>
-        <item>
-         <widget class="QPushButton" name="_buttonInfo">
-          <property name="text">
-           <string>Info...</string>
-          </property>
-         </widget>
-        </item>
        </layout>
       </item>
      </layout>
diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp
index 1d0316834..ebee6ce6e 100644
--- a/src/mirall/owncloudgui.cpp
+++ b/src/mirall/owncloudgui.cpp
@@ -488,13 +488,6 @@ void ownCloudGui::slotShowSettings()
     _settingsDialog->slotRefreshResultList();
 }
 
-// open sync protocol widget
-void ownCloudGui::slotShowSyncProtocol()
-{
-    slotShowSettings();  // FIXME: Show the protocol tab.
-    _settingsDialog->slotShowProtocol();
-}
-
 void ownCloudGui::slotShutdown()
 {
     // those do delete on close
diff --git a/src/mirall/owncloudgui.h b/src/mirall/owncloudgui.h
index 19c4aaff1..bf88a6fee 100644
--- a/src/mirall/owncloudgui.h
+++ b/src/mirall/owncloudgui.h
@@ -58,7 +58,6 @@ public slots:
     void slotUpdateProgress(const QString &folder, const Progress::Info& progress);
     void slotShowGuiMessage(const QString &title, const QString &message);
     void slotFoldersChanged();
-    void slotShowSyncProtocol();
     void slotShowSettings();
     void slotShutdown();
     void slotSyncStateChange( const QString& alias );
diff --git a/src/mirall/settingsdialog.cpp b/src/mirall/settingsdialog.cpp
index c1e8c6501..9f9f3d905 100644
--- a/src/mirall/settingsdialog.cpp
+++ b/src/mirall/settingsdialog.cpp
@@ -86,7 +86,6 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) :
     connect( _accountSettings, SIGNAL(folderChanged()), gui, SLOT(slotFoldersChanged()));
     connect( _accountSettings, SIGNAL(openFolderAlias(const QString&)),
              gui, SLOT(slotFolderOpenAction(QString)));
-    connect( _accountSettings, SIGNAL(openProtocol()), SLOT(slotShowProtocol()));
 
     connect( ProgressDispatcher::instance(), SIGNAL(progressInfo(QString, Progress::Info)),
              _accountSettings, SLOT(slotSetProgress(QString, Progress::Info)) );
@@ -153,12 +152,6 @@ void SettingsDialog::slotSyncStateChange(const QString& alias)
     }
 }
 
-void SettingsDialog::slotShowProtocol()
-{
-    qDebug() << "Show protocol window!";
-    _ui->labelWidget->setCurrentRow(_protocolIdx);
-}
-
 void SettingsDialog::setGeneralErrors(const QStringList &errors)
 {
     if( _accountSettings ) {
diff --git a/src/mirall/settingsdialog.h b/src/mirall/settingsdialog.h
index 05fc0d862..194023ba2 100644
--- a/src/mirall/settingsdialog.h
+++ b/src/mirall/settingsdialog.h
@@ -46,7 +46,6 @@ public:
 
 public slots:
     void slotSyncStateChange(const QString& alias);
-    void slotShowProtocol();
     void slotRefreshResultList();
 
 protected:
diff --git a/src/mirall/theme.cpp b/src/mirall/theme.cpp
index 485afda6a..d331f21dc 100644
--- a/src/mirall/theme.cpp
+++ b/src/mirall/theme.cpp
@@ -60,7 +60,7 @@ QString Theme::statusHeaderText( SyncResult::Status status ) const
         resultStr = QCoreApplication::translate("theme", "Sync Success, problems with individual files.");
         break;
     case SyncResult::Error:
-        resultStr = QCoreApplication::translate("theme", "Sync Error - Click info button for details.");
+        resultStr = QCoreApplication::translate("theme", "Sync Error");
         break;
     case SyncResult::SetupError:
         resultStr = QCoreApplication::translate("theme", "Setup Error" );