[prev in list] [next in list] [prev in thread] [next in thread]
List: kmail-devel
Subject: [PATCH] don't use uninitialized variables
From: Dirk Mueller <mueller () kde ! org>
Date: 2007-02-27 15:35:06
Message-ID: 200702271635.06919.mueller () kde ! org
[Download RAW message or body]
HI,
Kmail's mainwindow construction is vrey complicated and relies on undefined
values. The patch below fixes this. ok?
(3.5 branch, no plus).
Dirk
-- kmmainwidget.cpp (revision 637385)
+++ kmmainwidget.cpp (working copy)
@@ -264,12 +264,17 @@ void KMMainWidget::destruct()
//-----------------------------------------------------------------------------
void KMMainWidget::readPreConfig(void)
{
- const KConfigGroup geometry( KMKernel::config(), "Geometry" );
- const KConfigGroup general( KMKernel::config(), "General" );
+ KConfigGroup geometry( KMKernel::config(), "Geometry" );
+ KConfigGroup general( KMKernel::config(), "General" );
+ KConfigGroup reader( KMKernel::config(), "Reader" );
mLongFolderList = geometry.readEntry( "FolderList", "long" ) != "short";
mReaderWindowActive =
geometry.readEntry( "readerWindowMode", "below" ) != "hide";
mReaderWindowBelow = geometry.readEntry( "readerWindowMode", "below" )
== "below";
+ mThreadPref = geometry.readBoolEntry( "nestedMessages", false );
+
+ mHtmlPref = reader.readBoolEntry( "htmlMail", false );
+ mHtmlLoadExtPref = reader.readBoolEntry( "htmlLoadExternal", false );
}
@@ -336,14 +341,8 @@ void KMMainWidget::readConfig(void)
}
- // read "Reader" config options
- KConfigGroup readerConfig( config, "Reader" );
- mHtmlPref = readerConfig.readBoolEntry( "htmlMail", false );
- mHtmlLoadExtPref = readerConfig.readBoolEntry( "htmlLoadExternal", false );
-
{ // area for config group "Geometry"
KConfigGroupSaver saver(config, "Geometry");
- mThreadPref = config->readBoolEntry( "nestedMessages", false );
// size of the mainwin
QSize defaultSize(750,560);
siz = config->readSizeEntry("MainWin", &defaultSize);
_______________________________________________
KMail developers mailing list
KMail-devel@kde.org
https://mail.kde.org/mailman/listinfo/kmail-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic