Bump to -18

[theonering] / src / gvoice / backend.py

diff --git a/src/gvoice/backend.py b/src/gvoice/backend.py
index a02ed76..2457af5 100755 (executable)
--- a/src/gvoice/backend.py
+++ b/src/gvoice/backend.py
@@ -477,22 +477,21 @@ class GVoiceBackend(object):
                        if contactId != "0":
                                yield contactId, contactDetails
 
-       def get_conversations(self):
+       def get_voicemails(self):
                voicemailPage = self._get_page(self._XML_VOICEMAIL_URL)
                voicemailHtml = self._grab_html(voicemailPage)
                voicemailJson = self._grab_json(voicemailPage)
                parsedVoicemail = self._parse_voicemail(voicemailHtml)
                voicemails = self._merge_conversation_sources(parsedVoicemail, voicemailJson)
+               return voicemails
 
+       def get_texts(self):
                smsPage = self._get_page(self._XML_SMS_URL)
                smsHtml = self._grab_html(smsPage)
                smsJson = self._grab_json(smsPage)
                parsedSms = self._parse_sms(smsHtml)
                smss = self._merge_conversation_sources(parsedSms, smsJson)
-               decoratedSms = self._decorate_sms(smss)
-
-               allConversations = itertools.chain(voicemails, decoratedSms)
-               return allConversations
+               return smss
 
        def mark_message(self, messageId, asRead):
                postData = {
@@ -683,9 +682,6 @@ class GVoiceBackend(object):
 
                        yield conv
 
-       def _decorate_sms(self, parsedTexts):
-               return parsedTexts
-
        @staticmethod
        def _merge_conversation_sources(parsedMessages, json):
                for message in parsedMessages:
@@ -811,7 +807,7 @@ def guess_phone_type(number):
                return GVoiceBackend.PHONE_TYPE_MOBILE
 
 
-def set_sane_callback(backend):
+def get_sane_callback(backend):
        """
        Try to set a sane default callback number on these preferences
        1) 1747 numbers ( Gizmo )
@@ -835,8 +831,19 @@ def set_sane_callback(backend):
                                continue
                        if descriptionCriteria is not None and re.compile(descriptionCriteria).match(description) is None:
                                continue
-                       backend.set_callback_number(number)
-                       return
+                       return number
+
+
+def set_sane_callback(backend):
+       """
+       Try to set a sane default callback number on these preferences
+       1) 1747 numbers ( Gizmo )
+       2) anything with gizmo in the name
+       3) anything with computer in the name
+       4) the first value
+       """
+       number = get_sane_callback(backend)
+       backend.set_callback_number(number)
 
 
 def _is_not_special(name):