From 2c9364addf839013396af9efbb3561d6cadffbc5 Mon Sep 17 00:00:00 2001 From: Goffi Date: Mon, 27 Dec 2010 21:56:12 +0100 Subject: [PATCH] bridge: fixed newAlert parameters order --- frontends/quick_frontend/quick_app.py | 6 +++--- sat_bridge/DBus.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frontends/quick_frontend/quick_app.py b/frontends/quick_frontend/quick_app.py index 50c0ec7e..a3cdff3e 100644 --- a/frontends/quick_frontend/quick_app.py +++ b/frontends/quick_frontend/quick_app.py @@ -204,11 +204,11 @@ class QuickApp(): 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): diff --git a/sat_bridge/DBus.py b/sat_bridge/DBus.py index 3f365a8e..22fa3112 100755 --- a/sat_bridge/DBus.py +++ b/sat_bridge/DBus.py @@ -351,8 +351,8 @@ class DBusBridge(Bridge): 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 @@ class DBusBridge(Bridge): 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)