Creating a hollow shell of a UI

[gc-dialer] / src / backends / gv_backend.py

diff --git a/src/backends/gv_backend.py b/src/backends/gv_backend.py
index 16aef65..49294e7 100644 (file)
--- a/src/backends/gv_backend.py
+++ b/src/backends/gv_backend.py
@@ -27,12 +27,13 @@ Resources
 
 from __future__ import with_statement
 
+import itertools
 import logging
 
-import gvoice
+from gvoice import gvoice
 
 
-_moduleLogger = logging.getLogger("gv_backend")
+_moduleLogger = logging.getLogger(__name__)
 
 
 class GVDialer(object):
@@ -85,8 +86,8 @@ class GVDialer(object):
                """
                return self._gvoice.cancel(outgoingNumber)
 
-       def send_sms(self, phoneNumber, message):
-               self._gvoice.send_sms(phoneNumber, message)
+       def send_sms(self, phoneNumbers, message):
+               self._gvoice.send_sms(phoneNumbers, message)
 
        def search(self, query):
                """
@@ -175,7 +176,9 @@ class GVDialer(object):
                )
 
        def get_messages(self):
-               conversations = self._gvoice.get_conversations()
+               voicemails = self._gvoice.get_voicemails()
+               smss = self._gvoice.get_texts()
+               conversations = itertools.chain(voicemails, smss)
                for conversation in conversations:
                        messages = conversation.messages
                        messageParts = (