Merge pull request #494 from ederag/remove-external

Remove external stuff

src/hamster-service

@@ -12,7 +12,7 @@ from hamster.lib import i18n
 i18n.setup_i18n()
 
 from hamster.storage import db
-from hamster.lib import default_logger, desktop, Fact, stuff
+from hamster.lib import default_logger, Fact, stuff
 from hamster.lib.dbus import (
     DBusMainLoop,
     dbus,
@@ -51,10 +51,6 @@ class Storage(db.Storage, dbus.service.Object):
                                                   None)
         self.__monitor.connect("changed", self._on_us_change)
 
-        # central place were we plug in all the notifications and such
-        self.integrations = desktop.DesktopIntegrations(self)
-
-
     def run_fixtures(self):
         """we start with an empty database and then populate with default
            values. This way defaults can be localized!"""

src/hamster/lib/configuration.py

@@ -199,16 +199,11 @@ class GConfStore(gobject.GObject, Singleton):
     GCONF_DIR = "/apps/hamster/"
     VALID_KEY_TYPES = (bool, str, int, list, tuple)
     DEFAULTS = {
-        'enable_timeout'              :   False,       # Should hamster stop tracking on idle
-        'stop_on_shutdown'            :   False,       # Should hamster stop tracking on shutdown
-        'notify_on_idle'              :   False,       # Remind also if no activity is set
-        'notify_interval'             :   27,          # Remind of current activity every X minutes
         'day_start_minutes'           :   5 * 60 + 30, # At what time does the day start (5:30AM)
         'overview_window_box'         :   [],          # X, Y, W, H
         'overview_window_maximized'   :   False,       # Is overview window maximized
         'standalone_window_box'       :   [],          # X, Y, W, H
         'standalone_window_maximized' :   False,       # Is overview window maximized
-        'activities_source'           :   "",          # Source of TODO items ("", "evo", "gtg")
         'last_report_folder'          :   "~",         # Path to directory where the last report was saved
     }