summaryrefslogtreecommitdiffstats
path: root/kate
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-12-14 16:55:33 -0600
committerTimothy Pearson <[email protected]>2013-12-14 16:55:33 -0600
commitd7defbb78cad4aeddb7be0fbe36f93624c62a5d9 (patch)
treefbde4d98c35b2f470cf3dc1f7ee8c5980e51bb30 /kate
parentf534a63b03828cb81eaaf676a404bfa862a4e0c1 (diff)
parent6523942e553ef2854f32b245aaffa49b743beac7 (diff)
downloadtdebase-d7defbb78cad4aeddb7be0fbe36f93624c62a5d9.tar.gz
tdebase-d7defbb78cad4aeddb7be0fbe36f93624c62a5d9.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kate')
-rw-r--r--kate/app/katemainwindow.cpp11
-rw-r--r--kate/app/katepluginmanager.cpp1
2 files changed, 3 insertions, 9 deletions
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 14a5341c5..4cd3c358e 100644
--- a/kate/app/katemainwindow.cpp
+++ b/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 ()
diff --git a/kate/app/katepluginmanager.cpp b/kate/app/katepluginmanager.cpp
index 455866a0b..3e0a93f69 100644
--- a/kate/app/katepluginmanager.cpp
+++ b/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;