Make sure activities list is added again to the GUI after toolbars are edited

BUG: 269727

ChangeLog

@@ -10,6 +10,7 @@ Changes in 4.2:
 Changes in 4.1.1:
 - Make sure that libktorrent translation catalog is inserted (269515)
 - Fix wrong tooltip in QM preference page
+- Make sure activities list is added again to the GUI after toolbars are edited (269727)
 
 Changes in 4.1:
 - Check if source files are missing before moving them (265607)

ktorrent/gui.cpp

@@ -76,10 +76,6 @@
 #include <interfaces/functions.h>
 
 
-
-
-
-
 namespace kt
 {
 	GUI::GUI() : core(0),pref_dlg(0)
@@ -380,17 +376,21 @@ namespace kt
 		KShortcutsDialog::configure(actionCollection());
 	}
 
-	void GUI::configureToolBars()
+	void GUI::configureToolbars()
 	{
-		saveMainWindowSettings( KGlobal::config()->group("MainWindow"));
+		saveMainWindowSettings(KGlobal::config()->group("MainWindow"));
 		KEditToolBar dlg(factory());
 		connect(&dlg,SIGNAL(newToolBarConfig()),this,SLOT(newToolBarConfig()));
 		dlg.exec();
+		
+		// Replug action list
+		unplugActionList("activities_list");
+		plugActionList("activities_list",central->activitySwitchingActions());
 	}
 
 	void GUI::newToolBarConfig() // This is called when OK, Apply or Defaults is clicked
 	{
-		applyMainWindowSettings( KGlobal::config()->group("MainWindow") );
+		applyMainWindowSettings(KGlobal::config()->group("MainWindow"));
 	}
 	
 	void GUI::import()
@@ -420,7 +420,7 @@ namespace kt
 		KStandardAction::preferences(this, SLOT(showPrefDialog()),ac);
 		KStandardAction::keyBindings(this, SLOT(configureKeys()),ac);
 		
-		KStandardAction::configureToolbars(this,SLOT(configureToolBars()),ac);
+		KStandardAction::configureToolbars(this,SLOT(configureToolbars()),ac);
 		KStandardAction::configureNotifications(this,SLOT(configureNotifications()),ac);		
 		
 		

ktorrent/gui.h

@@ -104,7 +104,7 @@ namespace kt
 		void showMenuBar();
 		void showIPFilter();
 		void configureKeys();
-		void configureToolBars();
+		void configureToolbars();
 		void newToolBarConfig();
 		void import();
 		void update();