core, bridge: renamed getProfileName to profileNameGet according to new conventions

This commit is contained in:
Goffi 2017-03-05 21:36:01 +01:00
commit 085ed041e7
4 changed files with 27 additions and 27 deletions

View file

@ -187,7 +187,7 @@ doc_return=dictionary of available features:
plugin import name is used as key, data is an other dict managed by the plugin
async=
[getProfileName]
[profileNameGet]
type=method
category=core
sig_in=s

View file

@ -18,7 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from sat.core.i18n import _
from bridge_frontend import BridgeFrontend, BridgeException
from bridge_frontend import BridgeException
import dbus
from sat.core.log import getLogger
log = getLogger(__name__)
@ -59,7 +59,7 @@ def dbus_to_bridge_exception(dbus_e):
return BridgeException(name, message, condition)
class Bridge(BridgeFrontend):
class Bridge(object):
def bridgeConnect(self, callback, errback):
try:

View file

@ -317,12 +317,6 @@ class DbusObject(dbus.service.Object):
def getPresenceStatuses(self, profile_key="@DEFAULT@"):
return self._callback("getPresenceStatuses", unicode(profile_key))
@dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
in_signature='s', out_signature='s',
async_callbacks=None)
def getProfileName(self, profile_key="@DEFAULT@"):
return self._callback("getProfileName", unicode(profile_key))
@dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
in_signature='', out_signature='',
async_callbacks=('callback', 'errback'))
@ -407,6 +401,12 @@ class DbusObject(dbus.service.Object):
def profileIsSessionStarted(self, profile_key="@DEFAULT@"):
return self._callback("profileIsSessionStarted", unicode(profile_key))
@dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
in_signature='s', out_signature='s',
async_callbacks=None)
def profileNameGet(self, profile_key="@DEFAULT@"):
return self._callback("profileNameGet", unicode(profile_key))
@dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
in_signature='s', out_signature='',
async_callbacks=None)

View file

@ -74,7 +74,7 @@ class SAT(service.Service):
self.bridge.register_method("getReady", lambda: self.initialised)
self.bridge.register_method("getVersion", lambda: self.full_version)
self.bridge.register_method("getFeatures", self.getFeatures)
self.bridge.register_method("getProfileName", self.memory.getProfileName)
self.bridge.register_method("profileNameGet", self.memory.getProfileName)
self.bridge.register_method("profilesListGet", self.memory.getProfilesList)
self.bridge.register_method("getEntityData", lambda jid_, keys, profile: self.memory.getEntityData(jid.JID(jid_), keys, profile))
self.bridge.register_method("getEntitiesData", self.memory._getEntitiesData)