[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenetwork/kopete/kopete
From:       Olivier Goffart <ogoffart () kde ! org>
Date:       2005-02-11 8:59:12
Message-ID: 20050211085912.5B0EE1D029 () office ! kde ! org
[Download RAW message or body]

CVS commit by ogoffart: 

Fix Bug 99047: Status shortcuts with different name imply the same action
BUG: 99047

There was an old aciton not user anymore but still created.


  M +7 -3      kopetewindow.cpp   1.226
  M +2 -2      kopetewindow.h   1.79


--- kdenetwork/kopete/kopete/kopetewindow.cpp  #1.225:1.226
@@ -139,7 +139,9 @@ void KopeteWindow::initActions()
                 actionCollection(), "AddContact" );
 
+        /* ConnectAll is now obsolete.  "Go online" has replaced it.
         actionConnect = new KAction( i18n( "&Connect Accounts" ), \
"connect_creating",  0, Kopete::AccountManager::self(), SLOT( connectAll() ),
                 actionCollection(), "ConnectAll" );
+        */
 
         actionDisconnect = new KAction( i18n( "O&ffline" ), "connect_no",
@@ -151,4 +153,5 @@ void KopeteWindow::initActions()
                                                                                      \
actionCollection(), "ExportContacts" );  
+        /* the connection menu has been replaced by the set status menu
         actionConnectionMenu = new KActionMenu( \
                i18n("Connection"),"connect_established",
                                                         actionCollection(), \
"Connection" ); @@ -158,4 +161,5 @@ void KopeteWindow::initActions()
         actionConnectionMenu->insert(actionDisconnect);
         actionConnect->setEnabled(false);
+        */
         actionDisconnect->setEnabled(false);
 
@@ -495,5 +499,5 @@ void KopeteWindow::slotPluginLoaded( Kop
 void KopeteWindow::slotAllPluginsLoaded()
 {
-        actionConnect->setEnabled(true);
+//      actionConnect->setEnabled(true);
         actionDisconnect->setEnabled(true);
 }
@@ -506,5 +510,5 @@ void KopeteWindow::slotAccountRegistered
 
         //enable the connect all toolbar button
-        actionConnect->setEnabled(true);
+//      actionConnect->setEnabled(true);
         actionDisconnect->setEnabled(true);
 
@@ -543,5 +547,5 @@ void KopeteWindow::slotAccountUnregister
         if (accounts.isEmpty())
         {
-                actionConnect->setEnabled(false);
+//              actionConnect->setEnabled(false);
                 actionDisconnect->setEnabled(false);
         }

--- kdenetwork/kopete/kopete/kopetewindow.h  #1.78:1.79
@@ -162,6 +162,6 @@ public:
         KAction* actionAddContact;
 
-        KActionMenu* actionConnectionMenu;
-        KAction* actionConnect;
+        //KActionMenu* actionConnectionMenu;
+        //KAction* actionConnect;
         KAction* actionDisconnect;
         KAction* actionExportContacts;


[prev in list] [next in list] [prev in thread] [next in thread]