# HG changeset patch
# User souliane <souliane@mailoo.org>
# Date 1424637734 -3600
# Node ID 4f7550a083b4a63ad5e562063f96055ebf3657f7
# Parent  2c41ce0c3b3f1f9c7470e0c28be763a95009b8e6
server and browser sides: fixes bad call to "subscription" bridge method

diff -r 2c41ce0c3b3f -r 4f7550a083b4 src/browser/libervia_main.py
--- a/src/browser/libervia_main.py	Fri Feb 20 22:05:14 2015 +0100
+++ b/src/browser/libervia_main.py	Sun Feb 22 21:42:14 2015 +0100
@@ -815,7 +815,8 @@
             msg = HTML('The contact <b>%s</b> want to add you in his/her contact list, do you accept ?' % html_tools.html_sanitize(entity))
 
             def ok_cb(ignore):
-                self.bridge.call('subscription', None, "subscribed", entity, '', _dialog.getSelectedGroups())
+                self.bridge.call('subscription', None, "subscribed", entity)
+                self.bridge.updateContact(entity, '', _dialog.getSelectedGroups())
 
             def cancel_cb(ignore):
                 self.bridge.call('subscription', None, "unsubscribed", entity, '', '')
diff -r 2c41ce0c3b3f -r 4f7550a083b4 src/server/server.py
--- a/src/server/server.py	Fri Feb 20 22:05:14 2015 +0100
+++ b/src/server/server.py	Sun Feb 22 21:42:14 2015 +0100
@@ -212,13 +212,11 @@
         profile = ISATSession(self.session).profile
         self.sat_host.bridge.updateContact(entity, name, groups, profile)
 
-    def jsonrpc_subscription(self, sub_type, entity, name, groups):
+    def jsonrpc_subscription(self, sub_type, entity):
         """Confirm (or infirm) subscription,
         and setup user roster in case of subscription"""
         profile = ISATSession(self.session).profile
         self.sat_host.bridge.subscription(sub_type, entity, profile)
-        if sub_type == 'subscribed':
-            self.sat_host.bridge.updateContact(entity, name, groups, profile)
 
     def jsonrpc_getWaitingSub(self):
         """Return list of room already joined by user"""