don't send interface instance to PopupNotificationWindow

This commit is contained in:
Yann Leboulanger 2005-10-20 11:40:29 +00:00
parent 726640ef4b
commit 9a2fcf9ec1
1 changed files with 14 additions and 14 deletions

View File

@ -353,8 +353,8 @@ class Interface:
elif gajim.connections[account].connected in (2, 3): # we're online or chat
show_notification = True
if show_notification:
instance = dialogs.PopupNotificationWindow(self,
_('Contact Signed In'), jid, account)
instance = dialogs.PopupNotificationWindow(\
_('Contact Signed In'), jid, account)
self.roster.popup_notification_windows.append(instance)
if self.remote and self.remote.is_enabled():
self.remote.raise_signal('ContactPresence',
@ -378,7 +378,7 @@ class Interface:
elif gajim.connections[account].connected in (2, 3): # we're online or chat
show_notification = True
if show_notification:
instance = dialogs.PopupNotificationWindow(self,
instance = dialogs.PopupNotificationWindow(\
_('Contact Signed Out'), jid, account)
self.roster.popup_notification_windows.append(instance)
if self.remote and self.remote.is_enabled():
@ -414,7 +414,7 @@ class Interface:
if not self.windows[account]['chats'].has_key(fjid) and \
not gajim.awaiting_events[account].has_key(fjid):
if show_notification:
instance = dialogs.PopupNotificationWindow(self,
instance = dialogs.PopupNotificationWindow(\
_('New Private Message'), fjid, account, 'pm')
self.roster.popup_notification_windows.append(instance)
@ -461,10 +461,10 @@ class Interface:
show_notification = True
if show_notification:
if msg_type == 'normal': # single message
instance = dialogs.PopupNotificationWindow(self,
instance = dialogs.PopupNotificationWindow(\
_('New Single Message'), jid, account, msg_type)
else: # chat message
instance = dialogs.PopupNotificationWindow(self,
instance = dialogs.PopupNotificationWindow(\
_('New Message'), jid, account, msg_type)
self.roster.popup_notification_windows.append(instance)
@ -794,8 +794,8 @@ class Interface:
self.add_event(account, jid, 'file-send-error', file_props)
if gajim.show_notification(account):
instance = dialogs.PopupNotificationWindow(self,
_('File Transfer Error'), jid, account, 'file-send-error', file_props)
instance = dialogs.PopupNotificationWindow(_('File Transfer Error'), jid,
account, 'file-send-error', file_props)
self.roster.popup_notification_windows.append(instance)
def add_event(self, account, jid, typ, args):
@ -852,8 +852,8 @@ class Interface:
if gajim.show_notification(account):
# check if we should be notified
instance = dialogs.PopupNotificationWindow(self,
_('File Transfer Error'), jid, account, msg_type, file_props)
instance = dialogs.PopupNotificationWindow(_('File Transfer Error'), jid,
account, msg_type, file_props)
self.roster.popup_notification_windows.append(instance)
def handle_event_file_request(self, account, array):
@ -871,8 +871,8 @@ class Interface:
self.add_event(account, jid, 'file-request', file_props)
if gajim.show_notification(account):
instance = dialogs.PopupNotificationWindow(self,
_('File Transfer Request'), jid, account, 'file-request')
instance = dialogs.PopupNotificationWindow(_('File Transfer Request'),
jid, account, 'file-request')
self.roster.popup_notification_windows.append(instance)
def handle_event_file_progress(self, account, file_props):
@ -910,8 +910,8 @@ class Interface:
if gajim.config.get('notify_on_file_complete') and \
gajim.config.get('autopopupaway') or \
gajim.connections[account].connected in (2, 3):
instance = dialogs.PopupNotificationWindow(event_type,
jid, account, msg_type, file_props)
instance = dialogs.PopupNotificationWindow(event_type, jid, account,
msg_type, file_props)
self.roster.popup_notification_windows.append(instance)
def handle_event_stanza_arrived(self, account, stanza):