# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1489443433 -3600
# Node ID d65275ac39b3cf20057cd88e8c3796c4ae91649e
# Parent  322948499db08f27130ccf12946641a989ce9878
plugin XEP-0060: renamed psGet bridge method to psItemGet

diff -r 322948499db0 -r d65275ac39b3 frontends/src/jp/cmd_pubsub.py
--- a/frontends/src/jp/cmd_pubsub.py	Mon Mar 13 23:15:06 2017 +0100
+++ b/frontends/src/jp/cmd_pubsub.py	Mon Mar 13 23:17:13 2017 +0100
@@ -28,7 +28,7 @@
 class Get(base.CommandBase):
 
     def __init__(self, host):
-        base.CommandBase.__init__(self, host, 'get', use_verbose=True, use_output=C.OUTPUT_LIST_XML, help=_(u'get pubsub item(s)'))
+        base.CommandBase.__init__(self, host, 'get', use_output=C.OUTPUT_LIST_XML, help=_(u'get pubsub item(s)'))
         self.need_loop=True
 
     def add_parser_options(self):
@@ -44,17 +44,17 @@
         # TODO: add MAM filters
 
 
-    def psGetCb(self, ps_result):
+    def psItemGetCb(self, ps_result):
         self.output(ps_result[0])
         self.host.quit(C.EXIT_OK)
 
-    def psGetEb(self, failure_):
+    def psItemGetEb(self, failure_):
         self.disp(u"can't get pubsub items: {reason}".format(
             reason=failure_), error=True)
         self.host.quit(C.EXIT_BRIDGE_ERRBACK)
 
     def start(self):
-        self.host.bridge.psGet(
+        self.host.bridge.psItemGet(
             self.args.service,
             self.args.node,
             self.args.max,
@@ -62,8 +62,8 @@
             self.args.sub_id,
             {},
             self.profile,
-            callback=self.psGetCb,
-            errback=self.psGetEb)
+            callback=self.psItemGetCb,
+            errback=self.psItemGetEb)
 
 
 class Pubsub(base.CommandBase):
diff -r 322948499db0 -r d65275ac39b3 src/plugins/plugin_xep_0060.py
--- a/src/plugins/plugin_xep_0060.py	Mon Mar 13 23:15:06 2017 +0100
+++ b/src/plugins/plugin_xep_0060.py	Mon Mar 13 23:17:13 2017 +0100
@@ -85,8 +85,8 @@
         self._mam = host.plugins.get('XEP-0313')
         self._node_cb = {} # dictionnary of callbacks for node (key: node, value: list of callbacks)
         self.rt_sessions = sat_defer.RTDeferredSessions()
-        host.bridge.addMethod("psGet", ".plugin", in_sign='ssiassa{ss}s', out_sign='(asa{ss})', method=self._getItems, async=True)
         host.bridge.addMethod("psDeleteNode", ".plugin", in_sign='sss', out_sign='', method=self._deleteNode, async=True)
+        host.bridge.addMethod("psItemGet", ".plugin", in_sign='ssiassa{ss}s', out_sign='(asa{ss})', method=self._getItems, async=True)
         host.bridge.addMethod("psRetractItem", ".plugin", in_sign='sssbs', out_sign='', method=self._retractItem, async=True)
         host.bridge.addMethod("psRetractItems", ".plugin", in_sign='ssasbs', out_sign='', method=self._retractItems, async=True)
         host.bridge.addMethod("psSubscribeToMany", ".plugin", in_sign='a(ss)sa{ss}s', out_sign='s', method=self._subscribeToMany)