Mercurial > libervia-backend

changeset 274:c1ad04586edf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bridge: rename connection_error to connectionError for function name consistency
author Goffi <goffi@goffi.org>
date Tue, 25 Jan 2011 15:24:31 +0100
parents 3b5e856b3a32
children 01a0bd6e7fae
files frontends/src/quick_frontend/quick_app.py src/bridge/DBus.py src/bridge/bridge_constructor/bridge_template.ini src/sat.tac
diffstat 4 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/frontends/src/quick_frontend/quick_app.py	Tue Jan 25 01:37:02 2011 +0100
+++ b/frontends/src/quick_frontend/quick_app.py	Tue Jan 25 15:24:31 2011 +0100
@@ -46,7 +46,7 @@
             sys.exit(1)
         self.bridge.register("connected", self.connected)
         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("newMessage", self.newMessage)
         self.bridge.register("newAlert", self.newAlert)
@@ -188,7 +188,7 @@
         self.contactList.clear_contacts()
         self.setStatusOnline(False)
     
-    def connection_error(self, error_type, profile):
+    def connectionError(self, error_type, profile):
         """called when something goest wrong with the connection"""
         if not self.check_profile(profile):
             return
--- a/src/bridge/DBus.py	Tue Jan 25 01:37:02 2011 +0100
+++ b/src/bridge/DBus.py	Tue Jan 25 15:24:31 2011 +0100
@@ -64,8 +64,8 @@
 
     @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
                          signature='ss')
-    def connection_error(self, error_type, profile):
-        debug ("connection_error")
+    def connectionError(self, error_type, profile):
+        debug ("connectionError")
 
     @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
                          signature='ss')
@@ -375,8 +375,8 @@
     def connected(self, profile):
         self.dbus_bridge.connected(profile)
 
-    def connection_error(self, error_type, profile):
-        self.dbus_bridge.connection_error(error_type, profile)
+    def connectionError(self, error_type, profile):
+        self.dbus_bridge.connectionError(error_type, profile)
 
     def contactDeleted(self, entity, profile):
         self.dbus_bridge.contactDeleted(entity, profile)
--- a/src/bridge/bridge_constructor/bridge_template.ini	Tue Jan 25 01:37:02 2011 +0100
+++ b/src/bridge/bridge_constructor/bridge_template.ini	Tue Jan 25 15:24:31 2011 +0100
@@ -18,7 +18,7 @@
 doc=Connection is finished or lost
 doc_param_0=%(doc_profile)s
 
-[connection_error]
+[connectionError]
 type=signal
 category=communication
 sig_in=ss
--- a/src/sat.tac	Tue Jan 25 01:37:02 2011 +0100
+++ b/src/sat.tac	Tue Jan 25 15:24:31 2011 +0100
@@ -108,7 +108,7 @@
 
     def initializationFailed(self, 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:
             client.XMPPClient.initializationFailed(self, reason)
         except: