Logging sms/dial; logging device info; added Ctrl+r; fixing a bug with shutdown/settings

git-svn-id: file:///svnroot/gc-dialer/trunk@580 c39d3808-3fe2-4d86-a59f-b7f623ee9f21

diff --git a/src/backends/browser_emu.py b/src/backends/browser_emu.py
index 056f204..8deb568 100644 (file)
--- a/src/backends/browser_emu.py
+++ b/src/backends/browser_emu.py
@@ -66,7 +66,7 @@ class MozillaEmulator(object):
 
                @return: The raw HTML page data
                """
-               _moduleLogger.warning("Performing download of %s" % url)
+               _moduleLogger.info("Performing download of %s" % url)
 
                if extraheaders is None:
                        extraheaders = {}

diff --git a/src/constants.py b/src/constants.py
index 28004ff..a4b2baf 100644 (file)
--- a/src/constants.py
+++ b/src/constants.py
@@ -3,7 +3,7 @@ import os
 __pretty_app_name__ = "DialCentral"
 __app_name__ = "dialcentral"
 __version__ = "1.0.8"
-__build__ = 6
+__build__ = 7
 __app_magic__ = 0xdeadbeef
 _data_path_ = os.path.join(os.path.expanduser("~"), ".dialcentral")
 _user_settings_ = "%s/settings.ini" % _data_path_

diff --git a/src/dc_glade.py b/src/dc_glade.py
index 9cc9899..fd02822 100755 (executable)
--- a/src/dc_glade.py
+++ b/src/dc_glade.py
@@ -82,6 +82,7 @@ class Dialcentral(object):
                self._initDone = False
                self._connection = None
                self._osso = None
+               self._deviceState = None
                self._clipboard = gtk.clipboard_get()
 
                self._credentials = ("", "")
@@ -213,10 +214,11 @@ class Dialcentral(object):
                        except (ImportError, OSError):
                                osso = None
                        self._osso = None
+                       self._deviceState = None
                        if osso is not None:
                                self._osso = osso.Context(constants.__app_name__, constants.__version__, False)
-                               device = osso.DeviceState(self._osso)
-                               device.set_device_state_callback(self._on_device_state_change, 0)
+                               self._deviceState = osso.DeviceState(self._osso)
+                               self._deviceState.set_device_state_callback(self._on_device_state_change, 0)
                        else:
                                _moduleLogger.warning("No device state support")
 
@@ -642,13 +644,20 @@ class Dialcentral(object):
                        if self._ledHandler is not None:
                                self._ledHandler.off()
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_close(self, *args, **kwds):
                try:
-                       if self._osso is not None:
-                               self._osso.close()
-
                        if self._initDone:
                                self._save_settings()
+
+                       try:
+                               self._deviceState.close()
+                       except AttributeError:
+                               pass # Either None or close was removed (in Fremantle)
+                       try:
+                               self._osso.close()
+                       except AttributeError:
+                               pass # Either None or close was removed (in Fremantle)
                finally:
                        gtk.main_quit()
 
@@ -724,6 +733,8 @@ class Dialcentral(object):
                                        logLines = f.xreadlines()
                                        log = "".join(logLines)
                                        self._clipboard.set_text(str(log))
+                       elif event.keyval == ord("r") and event.get_state() & gtk.gdk.CONTROL_MASK:
+                               self._refresh_active_tab()
                except Exception, e:
                        self._errorDisplay.push_exception()
 
@@ -809,6 +820,7 @@ class Dialcentral(object):
                        try:
                                self._phoneBackends[self._selectedBackendId].send_sms(number, message)
                                hildonize.show_information_banner(self._window, "Sending to %s" % number)
+                               _moduleLogger.info("Sending SMS to %s" % number)
                                dialed = True
                        except Exception, e:
                                self._errorDisplay.push_exception()
@@ -839,6 +851,7 @@ class Dialcentral(object):
                                assert self._phoneBackends[self._selectedBackendId].get_callback_number() != "", "No callback number specified"
                                self._phoneBackends[self._selectedBackendId].dial(number)
                                hildonize.show_information_banner(self._window, "Calling %s" % number)
+                               _moduleLogger.info("Calling %s" % number)
                                dialed = True
                        except Exception, e:
                                self._errorDisplay.push_exception()

diff --git a/src/dialcentral.py b/src/dialcentral.py
index 0bc3eab..bfc0f26 100755 (executable)
--- a/src/dialcentral.py
+++ b/src/dialcentral.py
@@ -21,6 +21,9 @@ except OSError, e:
 
 logging.basicConfig(level=logging.DEBUG, filename=constants._user_logpath_)
 _moduleLogger.info("Dialcentral %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])
 
 try:
        dc_glade.run_dialpad()

diff --git a/src/gv_views.py b/src/gv_views.py
index 4424566..51fd55b 100644 (file)
--- a/src/gv_views.py
+++ b/src/gv_views.py
@@ -663,6 +663,7 @@ class AccountInfo(object):
                                )
                                self._set_callback_label(number)
                        else:
+                               if number.startswith("1747"): number = "+" + number
                                self._backend.set_callback_number(number)
                                assert make_ugly(number) == make_ugly(self._backend.get_callback_number()), "Callback number should be %s but instead is %s" % (
                                        make_pretty(number), make_pretty(self._backend.get_callback_number())

diff --git a/support/builddeb.py b/support/builddeb.py
index 91cf21d..92ef6ff 100755 (executable)
--- a/support/builddeb.py
+++ b/support/builddeb.py
@@ -14,9 +14,13 @@ import constants
 __appname__ = constants.__app_name__
 __description__ = """Touch screen enhanced interface to the GoogleVoice phone service"
 Features:
+.
 * Dialpad for quick call
+.
 * Checking voicemails, texts, call history
+.
 * Sending texts
+.
 * Notification support for texts, voicemail, and/or missed calls
 .
 Homepage: http://gc-dialer.garage.maemo.org/