# HG changeset patch
# User souliane <souliane@mailoo.org>
# Date 1412411300 -7200
# Node ID 8a607044ecfa0b06c5c34b2903b7f02447f518a8
# Parent  0090285a5689de3e58b839d155fc86c5da9e2d31
server_side: adapt to the new signatures of bridge method getHistory

diff -r 0090285a5689 -r 8a607044ecfa src/server/server.py
--- a/src/server/server.py	Sat Oct 04 10:32:52 2014 +0200
+++ b/src/server/server.py	Sat Oct 04 10:28:20 2014 +0200
@@ -353,7 +353,7 @@
         profile = ISATSession(self.session).profile
         return self.sat_host.bridge.getPresenceStatuses(profile)
 
-    def jsonrpc_getHistory(self, from_jid, to_jid, size, between):
+    def jsonrpc_getHistory(self, from_jid, to_jid, size, between, search=''):
         """Return history for the from_jid/to_jid couple"""
         sat_session = ISATSession(self.session)
         profile = sat_session.profile
@@ -364,7 +364,7 @@
         if JID(from_jid).userhost() != sat_jid.userhost() and JID(to_jid).userhost() != sat_jid.userhost():
             log.error("Trying to get history from a different jid, maybe a hack attempt ?")
             return {}
-        d = self.asyncBridgeCall("getHistory", from_jid, to_jid, size, between, profile)
+        d = self.asyncBridgeCall("getHistory", from_jid, to_jid, size, between, search, profile)
 
         def show(result_dbus):
             result = []