From b6459b06f1fc53ae698472f014b636c77e414772 Mon Sep 17 00:00:00 2001
From: Larry Shaffer <larrys@dakotacarto.com>
Date: Thu, 24 Sep 2015 12:54:39 -0600
Subject: [PATCH] [auth] Remove Authentication action from Settings menu

---
 src/app/qgisapp.cpp |  8 --------
 src/app/qgisapp.h   |  3 ---
 src/ui/qgisapp.ui   | 10 ----------
 3 files changed, 21 deletions(-)

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index ebb855563e4..a4e435c0f71 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -563,7 +563,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
   QgsAuthManager::instance()->init( QgsApplication::pluginPath() );
   if ( QgsAuthManager::instance()->isDisabled() )
   {
-    mActionAuthentication->setEnabled( false );
     QMessageBox::warning( this, tr( "Authentication System" ),
                           QgsAuthManager::instance()->disabledMessage() + "\n\n" +
                           tr( "Resources authenticating via the system can not be accessed." ) );
@@ -1252,8 +1251,6 @@ void QgisApp::createActions()
   connect( mActionExit, SIGNAL( triggered() ), this, SLOT( fileExit() ) );
   connect( mActionDxfExport, SIGNAL( triggered() ), this, SLOT( dxfExport() ) );
 
-  connect( mActionAuthentication, SIGNAL( triggered() ), this, SLOT( editAuthenticationConfigs() ) );
-
   // Edit Menu Items
 
   connect( mActionUndo, SIGNAL( triggered() ), mUndoWidget, SLOT( undo() ) );
@@ -10646,11 +10643,6 @@ void QgisApp::masterPasswordSetup()
            this, SLOT( eraseAuthenticationDatabase() ) );
 }
 
-void QgisApp::editAuthenticationConfigs()
-{
-  showOptionsDialog( this, QString( "mOptionsPageAuth" ) );
-}
-
 void QgisApp::eraseAuthenticationDatabase()
 {
   // First check if now is a good time to interact with the user, e.g. project is done loading.
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
index 468fee87137..9a22aec5d8e 100644
--- a/src/app/qgisapp.h
+++ b/src/app/qgisapp.h
@@ -620,9 +620,6 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
 #endif
     void namRequestTimedOut( QNetworkReply *reply );
 
-    //! Open authentication configs editor (in Options)
-    void editAuthenticationConfigs();
-
     //! Schedule and erase of the authentication database upon confirmation
     void eraseAuthenticationDatabase();
 
diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
index 9aacd41514c..f575c8f931f 100644
--- a/src/ui/qgisapp.ui
+++ b/src/ui/qgisapp.ui
@@ -218,7 +218,6 @@
     <addaction name="mActionConfigureShortcuts"/>
     <addaction name="mActionCustomization"/>
     <addaction name="mActionOptions"/>
-    <addaction name="mActionAuthentication"/>
     <addaction name="mActionSnappingOptions"/>
    </widget>
    <widget class="QMenu" name="mRasterMenu">
@@ -2377,15 +2376,6 @@ Acts on currently active editable layer</string>
     <string>Add circular string by radius</string>
    </property>
   </action>
-  <action name="mActionAuthentication">
-   <property name="icon">
-    <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/locked.svg</normaloff>:/images/themes/default/locked.svg</iconset>
-   </property>
-   <property name="text">
-    <string>Authentication...</string>
-   </property>
-  </action>
  </widget>
  <resources>
   <include location="../../images/images.qrc"/>