From 3ab46c284ac385a0f95a5f5ba5d99a43dc611e6a Mon Sep 17 00:00:00 2001 From: epage Date: Tue, 8 Dec 2009 01:10:07 +0000 Subject: [PATCH] Fixed a bug with fremantle and contexts plus logging device to file git-svn-id: file:///svnroot/quicknote/trunk@81 bb7704e3-badb-4cfa-9ab3-9374dc87eaa2 --- src/constants.py | 2 +- src/quicknote.py | 3 +++ src/quicknote_gtk.py | 11 +++++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/constants.py b/src/constants.py index 9a49b82..fdfce8f 100644 --- a/src/constants.py +++ b/src/constants.py @@ -3,7 +3,7 @@ import os __pretty_app_name__ = "Quicknote" __app_name__ = "quicknote" __version__ = "0.7.8" -__build__ = 7 +__build__ = 8 _data_path_ = os.path.join(os.path.expanduser("~"), ".quicknote") __app_magic__ = 0xdeadbeef _user_logpath_ = "%s/quicknote.log" % _data_path_ diff --git a/src/quicknote.py b/src/quicknote.py index 2bc9412..e57ce0d 100755 --- a/src/quicknote.py +++ b/src/quicknote.py @@ -31,5 +31,8 @@ if __name__ == "__main__": logging.basicConfig(level=logging.DEBUG, filename=constants._user_logpath_) _moduleLogger.info("quicknote %s-%s" % (constants.__version__, constants.__build__)) + _moduleLogger.info("OS: %s" % (os.uname()[0], )) + _moduleLogger.info("Kernel: %s (%s) for %s" % os.uname()[2:]) + _moduleLogger.info("Hostname: %s" % os.uname()[1]) quicknote_gtk.run_quicknote() diff --git a/src/quicknote_gtk.py b/src/quicknote_gtk.py index 49fb897..1e7e14e 100644 --- a/src/quicknote_gtk.py +++ b/src/quicknote_gtk.py @@ -427,10 +427,17 @@ class QuicknoteProgram(hildonize.get_app_class()): @gtk_toolbox.log_exception(_moduleLogger) def _on_destroy(self, widget = None, data = None): try: - self._save_settings() self._db.close() - if self._osso_c: + self._save_settings() + + try: + self._deviceState.close() + except AttributeError: + pass # Either None or close was removed (in Fremantle) + try: self._osso_c.close() + except AttributeError: + pass # Either None or close was removed (in Fremantle) finally: gtk.main_quit() -- 1.7.9.5