bridge, bridge constructor: fixed mix stuff

src/bridge/bridge_constructor/bridge_contructor.py

@@ -407,9 +407,11 @@ class DbusConstructor(Constructor):
             if function["type"] == "method":
                 completion['debug'] = "" if not self.options.debug else 'debug ("%s")\n%s' % (section,8*' ')
                 completion['args_result'] = self.getArguments(function['sig_in'], name=arg_doc)
+                result = "self.db_%(category)s_iface.%(name)s(%(args_result)s)" % completion
+                completion['result'] = ("unicode(%s)" if self.options.unicode and function['sig_out'] == 's' else "%s") % result
                 methods_part.append("""\
     def %(name)s(self, %(args)s):
-        %(debug)sreturn self.db_%(category)s_iface.%(name)s(%(args_result)s)
+        %(debug)sreturn %(result)s
 """ % completion)
 
         #at this point, methods_part should be filled,

src/bridge/bridge_constructor/bridge_template.ini

@@ -161,6 +161,7 @@ sig_out=s
 param_0_default="@DEFAULT@"
 doc=Get real profile name from profile key
 doc_param_0=%(doc_profile_key)s
+doc_return=Real profile name, or empty string if the profile doesn't exist
 
 [getProfilesList]
 type=method

src/sat.tac

@@ -141,7 +141,7 @@ class SatMessageProtocol(xmppim.MessageProtocol):
       for e in message.elements():
         if e.name == "body":
           mess_type = message['type'] if message.hasAttribute('type') else 'normal'
-          self.host.bridge.newMessage(message["from"], e.children[0], mess_type, profile=self.parent.profile)
+          self.host.bridge.newMessage(message["from"], e.children[0], mess_type, message['to'], profile=self.parent.profile)
           self.host.memory.addToHistory(self.parent.jid, jid.JID(message["from"]), self.parent.jid, "chat", e.children[0])
           break
     
@@ -616,7 +616,7 @@ class SAT(service.Service):
         self.profiles[profile].xmlstream.send(message)
         self.memory.addToHistory(current_jid, current_jid, jid.JID(to), message["type"], unicode(msg))
         if type!="groupchat":
-            self.bridge.newMessage(message['from'], unicode(msg), to=message['to'], type=type, profile=profile) #We send back the message, so all clients are aware of it
+            self.bridge.newMessage(message['from'], unicode(msg), mess_type=type, to_jid=message['to'], profile=profile) #We send back the message, so all clients are aware of it
 
 
     def setPresence(self, to="", show="", priority = 0, statuses={}, profile_key='@DEFAULT@'):

src/tools/memory.py

@@ -244,7 +244,7 @@ class Param():
         profile = self.getProfileName(profile_key)
         if not profile:
             error(_('Requesting a param for an non-existant profile'))
-            return None
+            return ""
 
         if attr == "value": 
             return self.__getParam(profile, category, name) or node[1].getAttribute(attr)