Bridge: rename connection_error to connectionError for function name consistency

This commit is contained in:
Goffi 2011-01-25 15:24:31 +01:00
commit cf5ee72a52
4 changed files with 8 additions and 8 deletions

View file

@ -46,7 +46,7 @@ class QuickApp():
sys.exit(1) sys.exit(1)
self.bridge.register("connected", self.connected) self.bridge.register("connected", self.connected)
self.bridge.register("disconnected", self.disconnected) self.bridge.register("disconnected", self.disconnected)
self.bridge.register("connection_error", self.connection_error) self.bridge.register("connectionError", self.connectionError)
self.bridge.register("newContact", self.newContact) self.bridge.register("newContact", self.newContact)
self.bridge.register("newMessage", self.newMessage) self.bridge.register("newMessage", self.newMessage)
self.bridge.register("newAlert", self.newAlert) self.bridge.register("newAlert", self.newAlert)
@ -188,7 +188,7 @@ class QuickApp():
self.contactList.clear_contacts() self.contactList.clear_contacts()
self.setStatusOnline(False) self.setStatusOnline(False)
def connection_error(self, error_type, profile): def connectionError(self, error_type, profile):
"""called when something goest wrong with the connection""" """called when something goest wrong with the connection"""
if not self.check_profile(profile): if not self.check_profile(profile):
return return

View file

@ -64,8 +64,8 @@ class DbusObject(dbus.service.Object):
@dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
signature='ss') signature='ss')
def connection_error(self, error_type, profile): def connectionError(self, error_type, profile):
debug ("connection_error") debug ("connectionError")
@dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX, @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
signature='ss') signature='ss')
@ -375,8 +375,8 @@ class DBusBridge(Bridge):
def connected(self, profile): def connected(self, profile):
self.dbus_bridge.connected(profile) self.dbus_bridge.connected(profile)
def connection_error(self, error_type, profile): def connectionError(self, error_type, profile):
self.dbus_bridge.connection_error(error_type, profile) self.dbus_bridge.connectionError(error_type, profile)
def contactDeleted(self, entity, profile): def contactDeleted(self, entity, profile):
self.dbus_bridge.contactDeleted(entity, profile) self.dbus_bridge.contactDeleted(entity, profile)

View file

@ -18,7 +18,7 @@ sig_in=s
doc=Connection is finished or lost doc=Connection is finished or lost
doc_param_0=%(doc_profile)s doc_param_0=%(doc_profile)s
[connection_error] [connectionError]
type=signal type=signal
category=communication category=communication
sig_in=ss sig_in=ss

View file

@ -108,7 +108,7 @@ class SatXMPPClient(client.XMPPClient):
def initializationFailed(self, reason): def initializationFailed(self, reason):
print ("initializationFailed: %s" % reason) print ("initializationFailed: %s" % reason)
self.host_app.bridge.connection_error("AUTH_ERROR", self.profile) self.host_app.bridge.connectionError("AUTH_ERROR", self.profile)
try: try:
client.XMPPClient.initializationFailed(self, reason) client.XMPPClient.initializationFailed(self, reason)
except: except: