copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove duplicated code...

Browse source
This commit is contained in:
Thibaut GIRKA 2009-12-19 22:24:15 +01:00
parent a4c122e74a
commit d5e3c6a935
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gui_interface.py
View file

@ -2265,7 +2265,8 @@ class Interface:
w = ctrl.parent_win w = ctrl.parent_win
elif type_ in ('normal', 'file-request', 'file-request-error', elif type_ in ('normal', 'file-request', 'file-request-error',
'file-send-error', 'file-error', 'file-stopped', 'file-completed'): 'file-send-error', 'file-error', 'file-stopped', 'file-completed',
'jingle-incoming'):
# Get the first single message event # Get the first single message event
event = gajim.events.get_first_event(account, fjid, type_) event = gajim.events.get_first_event(account, fjid, type_)
if not event: if not event:
@ -2301,11 +2302,6 @@ class Interface:
self.show_unsubscribed_dialog(account, contact) self.show_unsubscribed_dialog(account, contact)
gajim.events.remove_events(account, jid, event) gajim.events.remove_events(account, jid, event)
self.roster.draw_contact(jid, account) self.roster.draw_contact(jid, account)
elif type_ == 'jingle-incoming':
event = gajim.events.get_first_event(account, jid, type_)
peerjid, sid, content_types = event.parameters
dialogs.VoIPCallReceivedDialog(account, peerjid, sid, content_types)
gajim.events.remove_events(account, jid, event)
if w: if w:
w.set_active_tab(ctrl) w.set_active_tab(ctrl)
w.window.window.focus(gtk.get_current_event_time()) w.window.window.focus(gtk.get_current_event_time())