diff src/plugins/plugin_xep_0045.py @ 1552:e0bde0d0b321

core (disco): use of “profile” instead of “profile_key” in several disco methods
author Goffi <goffi@goffi.org>
date Mon, 02 Nov 2015 22:02:41 +0100
parents 55967cf161b1
children 0502a1fbe8b5
line wrap: on
line diff
--- a/src/plugins/plugin_xep_0045.py	Mon Nov 02 22:02:41 2015 +0100
+++ b/src/plugins/plugin_xep_0045.py	Mon Nov 02 22:02:41 2015 +0100
@@ -100,7 +100,7 @@
         def assign_service(service):
             client = self.host.getClient(profile)
             client.muc_service = service
-        return self.getMUCService(profile_key=profile).addCallback(assign_service)
+        return self.getMUCService(profile=profile).addCallback(assign_service)
 
     def checkClient(self, profile):
         """Check if the profile is connected and has used the MUC feature.
@@ -304,14 +304,14 @@
         return self.clients[profile].rec_subjects.values()
 
     @defer.inlineCallbacks
-    def getMUCService(self, jid_=None, profile_key=C.PROF_KEY_NONE):
+    def getMUCService(self, jid_=None, profile=C.PROF_KEY_NONE):
         """Return first found MUC service of an entity
 
         @param jid_: entity which may have a MUC service, or None for our own server
-        @param profile_key: %(doc_profile_key)s
+        @param profile: %(doc_profile)s
         """
         muc_service = None
-        services = yield self.host.findServiceEntities("conference", "text", jid_, profile_key=profile_key)
+        services = yield self.host.findServiceEntities("conference", "text", jid_, profile=profile)
         for service in services:
             if ".irc." not in service.userhost():
                 # FIXME: