changeset 221:96186f36d8cb

bridge: fixed newAlert parameters order
author Goffi <goffi@goffi.org>
date Mon, 27 Dec 2010 21:56:12 +0100 (2010-12-27)
parents c5274bf5e18b
children 3198bfd66daa
files frontends/quick_frontend/quick_app.py sat_bridge/DBus.py
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/frontends/quick_frontend/quick_app.py	Mon Dec 27 21:36:02 2010 +0100
+++ b/frontends/quick_frontend/quick_app.py	Mon Dec 27 21:56:12 2010 +0100
@@ -204,11 +204,11 @@
         self.current_action_ids_cb = {}
         self.chat_wins[win.short].printMessage(sender, msg, profile)
 
-    def newAlert(self, msg, title, type, profile):
+    def newAlert(self, msg, title, alert_type, profile):
         if not self.check_profile(profile):
             return
-        assert type in ['INFO','ERROR']
-        self.showDialog(unicode(msg),unicode(title),type.lower())
+        assert alert_type in ['INFO','ERROR']
+        self.showDialog(unicode(msg),unicode(title),alert_type.lower())
 
     
     def setStatusOnline(self, online=True):
--- a/sat_bridge/DBus.py	Mon Dec 27 21:36:02 2010 +0100
+++ b/sat_bridge/DBus.py	Mon Dec 27 21:56:12 2010 +0100
@@ -351,8 +351,8 @@
         debug("sending message...")
         self.dbus_bridge.newMessage(from_jid, msg, type, to, profile)
 
-    def newAlert(self, msg, title="", type="INFO", profile='@NONE@'):
-        self.dbus_bridge.newAlert(type, title, msg, profile)
+    def newAlert(self, msg, title="", alert_type="INFO", profile='@NONE@'):
+        self.dbus_bridge.newAlert(msg, title, alert_type, profile)
     
     def presenceUpdate(self, entity, show, priority, statuses, profile):
         debug("updating presence for %s",entity)
@@ -361,9 +361,9 @@
     def roomJoined(self, room_id, room_service, room_nicks, user_nick, profile):
         self.dbus_bridge.roomJoined(room_id, room_service, room_nicks, user_nick, profile)
 
-    def subscribe(self, type, entity, profile):
+    def subscribe(self, sub_type, entity, profile):
         debug("subscribe request for %s",entity)
-        self.dbus_bridge.subscribe(type, entity, profile)
+        self.dbus_bridge.subscribe(sub_type, entity, profile)
 
     def paramUpdate(self, name, value, category, profile):
         debug("updating param [%s] %s ", category, name)