From 46ca0e447e9017a5fe50f3c8464c9472aab87ef1 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 16 Feb 2015 21:31:25 +0100
Subject: [PATCH] Get rid of the save-session setting for now.

With the way quitting is handled currently, it's hard to save the session on
quit as the windows will already be closed.
---
 doc/help/settings.asciidoc       | 12 ------------
 qutebrowser/config/configdata.py |  4 ----
 qutebrowser/misc/sessions.py     |  5 -----
 3 files changed, 21 deletions(-)

diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 803418403..6da68cf54 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -20,7 +20,6 @@
 |<<general-default-encoding,default-encoding>>|Default encoding to use for websites.
 |<<general-new-instance-open-target,new-instance-open-target>>|How to open links in an existing instance if a new one is launched.
 |<<general-log-javascript-console,log-javascript-console>>|Whether to log javascript console messages.
-|<<general-save-session,save-session>>|Whether to always save the open pages.
 |==============
 
 .Quick reference for section ``ui''
@@ -387,17 +386,6 @@ Valid values:
 
 Default: +pass:[false]+
 
-[[general-save-session]]
-=== save-session
-Whether to always save the open pages.
-
-Valid values:
-
- * +true+
- * +false+
-
-Default: +pass:[false]+
-
 == ui
 General options related to the user interface.
 
diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py
index 546cb0db9..4befbc03c 100644
--- a/qutebrowser/config/configdata.py
+++ b/qutebrowser/config/configdata.py
@@ -193,10 +193,6 @@ DATA = collections.OrderedDict([
         ('log-javascript-console',
          SettingValue(typ.Bool(), 'false'),
          "Whether to log javascript console messages."),
-
-        ('save-session',
-         SettingValue(typ.Bool(), 'false'),
-         "Whether to always save the open pages."),
     )),
 
     ('ui', sect.KeyValue(
diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py
index b6ed46d39..240c37e51 100644
--- a/qutebrowser/misc/sessions.py
+++ b/qutebrowser/misc/sessions.py
@@ -21,7 +21,6 @@
 
 import os
 import os.path
-import functools
 
 from PyQt5.QtCore import (pyqtSignal, QStandardPaths, QUrl, QObject, QPoint,
                           QTimer)
@@ -64,10 +63,6 @@ class SessionManager(QObject):
 
     def __init__(self, parent=None):
         super().__init__(parent)
-        save_manager = objreg.get('save-manager')
-        save_manager.add_saveable(
-            'default-session', functools.partial(self.save, 'default'),
-            config_opt=('general', 'save-session'))
         self._base_path = os.path.join(
             standarddir.get(QStandardPaths.DataLocation), 'sessions')
         if not os.path.exists(self._base_path):