improve restore pane

messagelist/pane.cpp

@@ -1054,7 +1054,7 @@ void Pane::writeConfig(bool restoreSession)
 
 void Pane::readConfig(bool restoreSession)
 {
-    if(restoreSession && MessageList::Core::Settings::self()->config()->hasGroup(QLatin1String("MessageListPane"))) {
+    if(MessageList::Core::Settings::self()->config()->hasGroup(QLatin1String("MessageListPane"))) {
         KConfigGroup conf( MessageList::Core::Settings::self()->config(),"MessageListPane");
         const int numberOfTab = conf.readEntry(QLatin1String("tabNumber"),0);
         if(numberOfTab == 0) {
@@ -1063,19 +1063,21 @@ void Pane::readConfig(bool restoreSession)
             for(int i = 0; i<numberOfTab; ++i) {
                 createNewTab();
                 restoreHeaderSettings(i);
-#if 0
-                Akonadi::Collection::Id id = grp.readEntry(QLatin1String("collectionId"),-1);
-                ETMViewStateSaver *saver = new ETMViewStateSaver;
-                saver->setSelectionModel(selectionModel);
-
-                if(id != -1) {
+                if (restoreSession) {
+#if 0 //TODO fix me
+                    Akonadi::Collection::Id id = grp.readEntry(QLatin1String("collectionId"),-1);
                     ETMViewStateSaver *saver = new ETMViewStateSaver;
                     saver->setSelectionModel(selectionModel);
-                    saver->restoreState( grp );
-                    saver->selectCollections(Akonadi::Collection::List()<<Akonadi::Collection(id));
-                    saver->restoreCurrentItem( QString::fromLatin1("c%1").arg(id) );
-                }
+
+                    if(id != -1) {
+                        ETMViewStateSaver *saver = new ETMViewStateSaver;
+                        saver->setSelectionModel(selectionModel);
+                        saver->restoreState( grp );
+                        saver->selectCollections(Akonadi::Collection::List()<<Akonadi::Collection(id));
+                        saver->restoreCurrentItem( QString::fromLatin1("c%1").arg(id) );
+                    }
 #endif
+                }
             }
             setCurrentIndex(conf.readEntry(QLatin1String("currentIndex"),0));
         }