Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase

kate/app/katemainwindow.cpp

@@ -422,7 +422,6 @@ void KateMainWindow::readOptions ()
 void KateMainWindow::saveOptions ()
 {
   TDEConfig *config = KateApp::self()->config ();
-
   config->setGroup("General");
 
   if (console)
@@ -431,20 +430,16 @@ void KateMainWindow::saveOptions ()
     config->writeEntry("Show Console", false);
 
   config->writeEntry("Save Meta Infos", KateDocManager::self()->getSaveMetaInfos());
-
   config->writeEntry("Days Meta Infos", KateDocManager::self()->getDaysMetaInfos());
-
   config->writeEntry("Show Full Path in Title", m_viewManager->getShowFullPath());
-
   config->writeEntry("Sync Konsole", syncKonsole);
-
   config->writeEntry("UseInstance", useInstance);
   
   fileOpenRecent->saveEntries(config, "Recent Files");
-
   fileselector->writeConfig(config, "fileselector");
-
   filelist->writeConfig(config, "Filelist");
+
+  config->sync();
 }
 
 void KateMainWindow::slotWindowActivated ()

kate/app/katepluginmanager.cpp

@@ -65,7 +65,6 @@ void KatePluginManager::setupPluginList ()
 
     TQString pVersion = ptr->property("X-Kate-Version").toString();
 
-//    if ((pVersion >= "2.5") && (pVersion <= KateApp::kateVersion(false)))
     if (pVersion == "2.5")
     {
       KatePluginInfo info;

kcontrol/kicker/menutab_impl.cpp

@@ -229,10 +229,13 @@ void MenuTab::save()
         }
     }
     c->writeEntry("Extensions", ext);
-    c->setGroup("General");
 
+    c->setGroup("General");
     bool kmenusetting = m_comboMenuStyle->currentItem()==1;
     bool oldkmenusetting = c->readBoolEntry("LegacyKMenu", true);
+    c->writeEntry("LegacyKMenu", kmenusetting);
+    c->writeEntry("OpenOnHover", m_openOnHover->isChecked());
+    c->sync();
 
     c->setGroup("KMenu");
     bool oldmenutextenabledsetting = c->readBoolEntry("ShowText", true);
@@ -241,10 +244,6 @@ void MenuTab::save()
     c->setGroup("buttons");
     TQFont oldmenufontsetting = c->readFontEntry("Font");
 
-    c->writeEntry("LegacyKMenu", kmenusetting);
-    c->writeEntry("OpenOnHover", m_openOnHover->isChecked());
-    c->sync();
-
     if (kmenusetting != oldkmenusetting) {
         forceRestart = true;
     }

kicker/kicker/ui/k_mnu.cpp

@@ -409,7 +409,7 @@ void PanelKMenu::initialize()
 #endif
 
     if (displayRepaired == FALSE) {
-        displayRepairTimer->start(0, FALSE);
+        displayRepairTimer->start(5, FALSE);
         displayRepaired = TRUE;
     }