# HG changeset patch # User Goffi # Date 1551013926 -3600 # Node ID a26b1ad2d3a4cdf659538eac0e7b0af5a4d9adeb # Parent c161a294fffdd93d4e310e0e3ebe14e365dae622 plugin OTR: disabled menu as the new generic encryption menu allows to start/stop OTR or display the trust UI. diff -r c161a294fffd -r a26b1ad2d3a4 sat/plugins/plugin_sec_otr.py --- a/sat/plugins/plugin_sec_otr.py Sun Feb 24 14:11:08 2019 +0100 +++ b/sat/plugins/plugin_sec_otr.py Sun Feb 24 14:12:06 2019 +0100 @@ -325,33 +325,35 @@ host.bridge.addSignal( "otrState", ".plugin", signature="sss" ) # args: state, destinee_jid, profile - host.importMenu( - (OTR_MENU, D_(u"Start/Refresh")), - self._otrStartRefresh, - security_limit=0, - help_string=D_(u"Start or refresh an OTR session"), - type_=C.MENU_SINGLE, - ) - host.importMenu( - (OTR_MENU, D_(u"End session")), - self._otrSessionEnd, - security_limit=0, - help_string=D_(u"Finish an OTR session"), - type_=C.MENU_SINGLE, - ) - host.importMenu( - (OTR_MENU, D_(u"Authenticate")), - self._otrAuthenticate, - security_limit=0, - help_string=D_(u"Authenticate user/see your fingerprint"), - type_=C.MENU_SINGLE, - ) - host.importMenu( - (OTR_MENU, D_(u"Drop private key")), - self._dropPrivKey, - security_limit=0, - type_=C.MENU_SINGLE, - ) + # XXX: menus are disabled in favor to the new more generic encryption menu + # there are let here commented for a little while as a reference + # host.importMenu( + # (OTR_MENU, D_(u"Start/Refresh")), + # self._otrStartRefresh, + # security_limit=0, + # help_string=D_(u"Start or refresh an OTR session"), + # type_=C.MENU_SINGLE, + # ) + # host.importMenu( + # (OTR_MENU, D_(u"End session")), + # self._otrSessionEnd, + # security_limit=0, + # help_string=D_(u"Finish an OTR session"), + # type_=C.MENU_SINGLE, + # ) + # host.importMenu( + # (OTR_MENU, D_(u"Authenticate")), + # self._otrAuthenticate, + # security_limit=0, + # help_string=D_(u"Authenticate user/see your fingerprint"), + # type_=C.MENU_SINGLE, + # ) + # host.importMenu( + # (OTR_MENU, D_(u"Drop private key")), + # self._dropPrivKey, + # security_limit=0, + # type_=C.MENU_SINGLE, + # ) host.trigger.add("presenceReceived", self._presenceReceivedTrigger) self.host.registerEncryptionPlugin(self, u"OTR", NS_OTR, directed=True)