Fixing random bugs

diff --git a/src/channel/call.py b/src/channel/call.py
index 0d3373f..7535a12 100644 (file)
--- a/src/channel/call.py
+++ b/src/channel/call.py
@@ -45,7 +45,7 @@ class CallChannel(
                raise telepathy.errors.NotImplemented("Cannot change directions")
 
        @gtk_toolbox.log_exception(_moduleLogger)
-       def RequestStreams(self, contact, streamTypes):
+       def RequestStreams(self, contactId, streamTypes):
                """
                For org.freedesktop.Telepathy.Channel.Type.StreamedMedia
 
@@ -55,7 +55,8 @@ class CallChannel(
                        if streamType != telepathy.constants.MEDIA_STREAM_TYPE_AUDIO:
                                raise telepathy.errors.NotImplemented("Audio is the only stream type supported")
 
-               print self._contactHandle, contact
+               contact = self._conn.handle(telepathy.constants.HANDLE_TYPE_CONTACT, contactId)
+               assert self._contactHandle == contact, "%r != %r" % (self._contactHandle, contact)
                contactId, contactNumber = handle.ContactHandle.from_handle_name(contact.name)
 
                self._conn.session.backend.call(contactNumber)

diff --git a/src/gvoice/backend.py b/src/gvoice/backend.py
index 18eb7f3..143ad2f 100755 (executable)
--- a/src/gvoice/backend.py
+++ b/src/gvoice/backend.py
@@ -246,16 +246,20 @@ class GVoiceBackend(object):
                subscriberNumber = None
                phoneType = guess_phone_type(self._callbackNumber) # @todo Fix this hack
 
-               page = self._get_page_with_token(
-                       self._callUrl,
-                       {
+               callData = {
                                'outgoingNumber': outgoingNumber,
                                'forwardingNumber': self._callbackNumber,
                                'subscriberNumber': subscriberNumber or 'undefined',
-                               'phoneType': phoneType,
-                               'remember': '1'
-                       },
+                               'phoneType': str(phoneType),
+                               'remember': '1',
+               }
+               _moduleLogger.info("%r" % callData)
+
+               page = self._get_page_with_token(
+                       self._callUrl,
+                       callData,
                )
+               _moduleLogger.info(page)
                self._parse_with_validation(page)
                return True
 
@@ -607,9 +611,9 @@ class GVoiceBackend(object):
                return page
 
        def _parse_with_validation(self, page):
-               json, html = extract_payload(page)
+               json = parse_json(page)
                validate_response(json)
-               return json, html
+               return json
 
 
 def itergroup(iterator, count, padValue = None):
@@ -692,9 +696,9 @@ def validate_response(response):
 
 def guess_phone_type(number):
        if number.startswith("747") or number.startswith("1747"):
-               return GVDialer.PHONE_TYPE_GIZMO
+               return GVoiceBackend.PHONE_TYPE_GIZMO
        else:
-               return GVDialer.PHONE_TYPE_MOBILE
+               return GVoiceBackend.PHONE_TYPE_MOBILE
 
 
 def set_sane_callback(backend):