Commits March 2010

commits@gajim.org

4 participants
98 discussions

gajim: don't send change_nick presnece (without NS_MUC) after a ...
by Yann Leboulanger 25 Mar '10

25 Mar '10

changeset 84a75dabe7f4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=84a75dabe7f4 description: don't send change_nick presnece (without NS_MUC) after a nick conflict diffstat: src/dialogs.py | 20 +++++++++++++------- src/groupchat_control.py | 4 ++-- 2 files changed, 15 insertions(+), 9 deletions(-) diffs (67 lines): diff -r 3ba775fbc884 -r 84a75dabe7f4 src/dialogs.py --- a/src/dialogs.py Thu Mar 25 07:50:32 2010 +0100 +++ b/src/dialogs.py Thu Mar 25 19:52:27 2010 +0100 @@ -1870,10 +1870,15 @@ Class for changing room nickname in case of conflict """ - def __init__(self, account, room_jid, title, prompt, check_text=None): + def __init__(self, account, room_jid, title, prompt, check_text=None, + change_nick=False): + """ + change_nick must be set to True when we are already occupant of the room + and we are changing our nick + """ InputDialogCheck.__init__(self, title, '', checktext=check_text, input_str='', is_modal=True, ok_handler=None, cancel_handler=None) - self.room_queue = [(account, room_jid, prompt)] + self.room_queue = [(account, room_jid, prompt, change_nick)] self.check_next() def on_input_dialog_delete_event(self, widget, event): @@ -1902,7 +1907,8 @@ if 'change_nick_dialog' in gajim.interface.instances: del gajim.interface.instances['change_nick_dialog'] return - self.account, self.room_jid, self.prompt = self.room_queue.pop(0) + self.account, self.room_jid, self.prompt, self.change_nick = \ + self.room_queue.pop(0) self.setup_dialog() if gajim.new_room_nick is not None and not gajim.gc_connected[ @@ -1931,7 +1937,7 @@ if is_checked: gajim.new_room_nick = nick gajim.connections[self.account].join_gc(nick, self.room_jid, None, - change_nick=True) + change_nick=self.change_nick) if gajim.gc_connected[self.account][self.room_jid]: # We are changing nick, we will change self.nick when we receive # presence that inform that it works @@ -1946,9 +1952,9 @@ self.gc_control.new_nick = '' self.check_next() - def add_room(self, account, room_jid, prompt): - if (account, room_jid, prompt) not in self.room_queue: - self.room_queue.append((account, room_jid, prompt)) + def add_room(self, account, room_jid, prompt, change_nick=False): + if (account, room_jid, prompt, change_nick) not in self.room_queue: + self.room_queue.append((account, room_jid, prompt, change_nick)) class InputTextDialog(CommonInputDialog): """ diff -r 3ba775fbc884 -r 84a75dabe7f4 src/groupchat_control.py --- a/src/groupchat_control.py Thu Mar 25 07:50:32 2010 +0100 +++ b/src/groupchat_control.py Thu Mar 25 19:52:27 2010 +0100 @@ -1735,8 +1735,8 @@ title = _('Changing Nickname') prompt = _('Please specify the new nickname you want to use:') gajim.interface.instances['change_nick_dialog'] = \ - dialogs.ChangeNickDialog(self.account, self.room_jid, title, - prompt) + dialogs.ChangeNickDialog(self.account, self.room_jid, title, + prompt, change_nick=True) def _on_configure_room_menuitem_activate(self, widget): c = gajim.contacts.get_gc_contact(self.account, self.room_jid, self.nick)

1 0

gajim: correctly add contacts to roster when we get a roster set...
by Yann Leboulanger 25 Mar '10

25 Mar '10

changeset 3ba775fbc884 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3ba775fbc884 description: correctly add contacts to roster when we get a roster set <iq>, even in case we have a Contact instance already. Fixes #5595 diffstat: src/gui_interface.py | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diffs (39 lines): diff -r 84d5061176fc -r 3ba775fbc884 src/gui_interface.py --- a/src/gui_interface.py Wed Mar 24 21:30:05 2010 +0000 +++ b/src/gui_interface.py Thu Mar 25 07:50:32 2010 +0100 @@ -1250,8 +1250,6 @@ gajim.contacts.add_contact(account, contact) self.roster.add_contact(jid, account) else: - # it is an existing contact that might has changed - re_place = False # If contact has changed (sub, ask or group) update roster # Mind about observer status changes: # According to xep 0162, a contact is not an observer anymore when @@ -1259,7 +1257,6 @@ old_groups = contacts[0].groups if contacts[0].sub != sub or contacts[0].ask != ask\ or old_groups != groups: - re_place = True # c.get_shown_groups() has changed. Reflect that in # roster_winodow self.roster.remove_contact(jid, account, force=True) @@ -1268,13 +1265,11 @@ contact.sub = sub contact.ask = ask contact.groups = groups or [] - if re_place: - self.roster.add_contact(jid, account) - # Refilter and update old groups - for group in old_groups: - self.roster.draw_group(group, account) - else: - self.roster.draw_contact(jid, account) + self.roster.add_contact(jid, account) + # Refilter and update old groups + for group in old_groups: + self.roster.draw_group(group, account) + self.roster.draw_contact(jid, account) if self.remote_ctrl: self.remote_ctrl.raise_signal('RosterInfo', (account, array))

1 0

gajim: correctly set server in join groupcht dialog, even if it'...
by Yann Leboulanger 23 Mar '10

23 Mar '10

changeset 1ded4028a59d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1ded4028a59d description: correctly set server in join groupcht dialog, even if it's an IRC room diffstat: src/dialogs.py | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diffs (23 lines): diff -r 4d63c8a6a836 -r 1ded4028a59d src/dialogs.py --- a/src/dialogs.py Tue Mar 23 13:30:57 2010 +0000 +++ b/src/dialogs.py Tue Mar 23 17:58:48 2010 +0100 @@ -2246,18 +2246,10 @@ self.account = model[iter_][0].decode('utf-8') self.on_required_entry_changed(self._nickname_entry) - def _select_server(self, server): - i = 0 - for s in self.server_model: - if s[0] == server: - self.server_comboboxentry.set_active(i) - break - i += 1 - def _set_room_jid(self, room_jid): room, server = gajim.get_name_and_server_from_jid(room_jid) - self._select_server(server) self._room_jid_entry.set_text(room) + self.server_comboboxentry.child.set_text(server) def on_recently_combobox_changed(self, widget): model = widget.get_model()

1 0

gajim: [halfmoon] fix missing translated strings in ui files. Fi...
by Yann Leboulanger 23 Mar '10

23 Mar '10

changeset c3328ec572d9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c3328ec572d9 description: [halfmoon] fix missing translated strings in ui files. Fixes #5673 diffstat: data/gui/account_context_menu.ui | 16 ++++++++-------- data/gui/advanced_menuitem_menu.ui | 4 ++-- data/gui/blocked_contacts_window.ui | 2 +- data/gui/chat_context_menu.ui | 14 +++++++------- data/gui/filetransfers.ui | 6 +++--- data/gui/gc_control_popup_menu.ui | 14 +++++++------- data/gui/gc_occupants_menu.ui | 12 ++++++------ data/gui/history_manager.ui | 2 +- data/gui/popup_notification_window.ui | 4 ++-- data/gui/roster_window.ui | 24 ++++++++++++------------ data/gui/subscription_request_popup_menu.ui | 2 +- data/gui/systray_context_menu.ui | 8 ++++---- data/gui/zeroconf_context_menu.ui | 4 ++-- 13 files changed, 56 insertions(+), 56 deletions(-) diffs (truncated from 543 to 300 lines): diff -r 6babba0f1e3c -r c3328ec572d9 data/gui/account_context_menu.ui --- a/data/gui/account_context_menu.ui Tue Mar 23 11:45:58 2010 +0200 +++ b/data/gui/account_context_menu.ui Tue Mar 23 13:49:41 2010 +0100 @@ -5,7 +5,7 @@ <object class="GtkMenu" id="account_context_menu"> <child> <object class="GtkImageMenuItem" id="status_menuitem"> - <property name="label">_Status</property> + <property name="label" translatable="yes">_Status</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image1</property> @@ -14,7 +14,7 @@ </child> <child> <object class="GtkImageMenuItem" id="pep_menuitem"> - <property name="label">_Personal Events</property> + <property name="label" translatable="yes">_Personal Events</property> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="use_underline">True</property> @@ -30,7 +30,7 @@ </child> <child> <object class="GtkImageMenuItem" id="start_chat_menuitem"> - <property name="label">_Start Chat...</property> + <property name="label" translatable="yes">_Start Chat...</property> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="use_underline">True</property> @@ -40,7 +40,7 @@ </child> <child> <object class="GtkImageMenuItem" id="join_group_chat_menuitem"> - <property name="label">Join _Group Chat...</property> + <property name="label" translatable="yes">Join _Group Chat...</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image4</property> @@ -54,7 +54,7 @@ </child> <child> <object class="GtkImageMenuItem" id="add_contact_menuitem"> - <property name="label">_Add Contact...</property> + <property name="label" translatable="yes">_Add Contact...</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image5</property> @@ -63,7 +63,7 @@ </child> <child> <object class="GtkImageMenuItem" id="service_discovery_menuitem"> - <property name="label">_Discover Services</property> + <property name="label" translatable="yes">_Discover Services</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image6</property> @@ -72,7 +72,7 @@ </child> <child> <object class="GtkImageMenuItem" id="execute_command_menuitem"> - <property name="label">_Execute Command...</property> + <property name="label" translatable="yes">_Execute Command...</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image7</property> @@ -93,7 +93,7 @@ </child> <child> <object class="GtkImageMenuItem" id="edit_account_menuitem"> - <property name="label">_Modify Account</property> + <property name="label" translatable="yes">_Modify Account</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image8</property> diff -r 6babba0f1e3c -r c3328ec572d9 data/gui/advanced_menuitem_menu.ui --- a/data/gui/advanced_menuitem_menu.ui Tue Mar 23 11:45:58 2010 +0200 +++ b/data/gui/advanced_menuitem_menu.ui Tue Mar 23 13:49:41 2010 +0100 @@ -26,7 +26,7 @@ <object class="GtkMenu" id="administrator_menuitem_menu"> <child> <object class="GtkImageMenuItem" id="send_server_message_menuitem"> - <property name="label">_Send Server Message...</property> + <property name="label" translatable="yes">_Send Server Message...</property> <property name="tooltip_text" translatable="yes">Sends a message to users currently connected to this server</property> <property name="use_underline">True</property> <property name="image">image1</property> @@ -54,7 +54,7 @@ </child> <child> <object class="GtkImageMenuItem" id="delete_motd_menuitem"> - <property name="label">Delete MOTD</property> + <property name="label" translatable="yes">Delete MOTD</property> <property name="tooltip_text" translatable="yes">Deletes Message of the Day</property> <property name="image">image2</property> <property name="use_stock">False</property> diff -r 6babba0f1e3c -r c3328ec572d9 data/gui/blocked_contacts_window.ui --- a/data/gui/blocked_contacts_window.ui Tue Mar 23 11:45:58 2010 +0200 +++ b/data/gui/blocked_contacts_window.ui Tue Mar 23 13:49:41 2010 +0100 @@ -65,7 +65,7 @@ <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="label">_Unblock</property> + <property name="label" translatable="yes">_Unblock</property> <property name="use_underline">True</property> </object> <packing> diff -r 6babba0f1e3c -r c3328ec572d9 data/gui/chat_context_menu.ui --- a/data/gui/chat_context_menu.ui Tue Mar 23 11:45:58 2010 +0200 +++ b/data/gui/chat_context_menu.ui Tue Mar 23 13:49:41 2010 +0100 @@ -5,7 +5,7 @@ <object class="GtkMenu" id="chat_context_menu"> <child> <object class="GtkImageMenuItem" id="copy_link_location_menuitem"> - <property name="label">_Copy Link Location</property> + <property name="label" translatable="yes">_Copy Link Location</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image1</property> @@ -14,7 +14,7 @@ </child> <child> <object class="GtkImageMenuItem" id="open_link_in_browser_menuitem"> - <property name="label">_Open Link in Browser</property> + <property name="label" translatable="yes">_Open Link in Browser</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image2</property> @@ -23,7 +23,7 @@ </child> <child> <object class="GtkImageMenuItem" id="copy_email_address_menuitem"> - <property name="label">_Copy JID/Email Address</property> + <property name="label" translatable="yes">_Copy JID/Email Address</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image3</property> @@ -32,7 +32,7 @@ </child> <child> <object class="GtkImageMenuItem" id="open_email_composer_menuitem"> - <property name="label">_Open Email Composer</property> + <property name="label" translatable="yes">_Open Email Composer</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image4</property> @@ -46,7 +46,7 @@ </child> <child> <object class="GtkImageMenuItem" id="start_chat_menuitem"> - <property name="label">_Start Chat</property> + <property name="label" translatable="yes">_Start Chat</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image5</property> @@ -55,7 +55,7 @@ </child> <child> <object class="GtkImageMenuItem" id="join_group_chat_menuitem"> - <property name="label">Join _Group Chat</property> + <property name="label" translatable="yes">Join _Group Chat</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image6</property> @@ -65,7 +65,7 @@ </child> <child> <object class="GtkImageMenuItem" id="add_to_roster_menuitem"> - <property name="label">_Add to Roster...</property> + <property name="label" translatable="yes">_Add to Roster...</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image7</property> diff -r 6babba0f1e3c -r c3328ec572d9 data/gui/filetransfers.ui --- a/data/gui/filetransfers.ui Tue Mar 23 11:45:58 2010 +0200 +++ b/data/gui/filetransfers.ui Tue Mar 23 13:49:41 2010 +0100 @@ -251,7 +251,7 @@ </child> <child> <object class="GtkImageMenuItem" id="continue_menuitem"> - <property name="label">_Continue</property> + <property name="label" translatable="yes">_Continue</property> <property name="no_show_all">True</property> <property name="use_underline">True</property> <property name="use_stock">True</property> @@ -261,7 +261,7 @@ </child> <child> <object class="GtkImageMenuItem" id="pause_menuitem"> - <property name="label">_Pause</property> + <property name="label" translatable="yes">_Pause</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <property name="accel_group">accelgroup1</property> @@ -284,7 +284,7 @@ </child> <child> <object class="GtkImageMenuItem" id="open_folder_menuitem"> - <property name="label">_Open Containing Folder</property> + <property name="label" translatable="yes">_Open Containing Folder</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <property name="accel_group">accelgroup1</property> diff -r 6babba0f1e3c -r c3328ec572d9 data/gui/gc_control_popup_menu.ui --- a/data/gui/gc_control_popup_menu.ui Tue Mar 23 11:45:58 2010 +0200 +++ b/data/gui/gc_control_popup_menu.ui Tue Mar 23 13:49:41 2010 +0100 @@ -5,7 +5,7 @@ <object class="GtkMenu" id="gc_control_popup_menu"> <child> <object class="GtkImageMenuItem" id="change_nick_menuitem"> - <property name="label">Change _Nickname...</property> + <property name="label" translatable="yes">Change _Nickname...</property> <property name="no_show_all">True</property> <property name="use_underline">True</property> <property name="image">image1</property> @@ -14,7 +14,7 @@ </child> <child> <object class="GtkImageMenuItem" id="manage_room_menuitem"> - <property name="label">_Manage Room</property> + <property name="label" translatable="yes">_Manage Room</property> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="use_underline">True</property> @@ -26,7 +26,7 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> <object class="GtkImageMenuItem" id="change_subject_menuitem"> - <property name="label">Change _Subject...</property> + <property name="label" translatable="yes">Change _Subject...</property> <property name="no_show_all">True</property> <property name="use_underline">True</property> <property name="image">image2</property> @@ -35,7 +35,7 @@ </child> <child> <object class="GtkImageMenuItem" id="configure_room_menuitem"> - <property name="label">Configure _Room...</property> + <property name="label" translatable="yes">Configure _Room...</property> <property name="use_underline">True</property> <property name="image">image3</property> <property name="use_stock">False</property> @@ -48,7 +48,7 @@ </child> <child> <object class="GtkImageMenuItem" id="destroy_room_menuitem"> - <property name="label">_Destroy Room</property> + <property name="label" translatable="yes">_Destroy Room</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image4</property> @@ -73,7 +73,7 @@ </child> <child> <object class="GtkImageMenuItem" id="bookmark_room_menuitem"> - <property name="label">_Bookmark</property> + <property name="label" translatable="yes">_Bookmark</property> <property name="no_show_all">True</property> <property name="use_underline">True</property> <property name="image">image6</property> @@ -87,7 +87,7 @@ </child> <child> <object class="GtkImageMenuItem" id="history_menuitem"> - <property name="label">_History</property> + <property name="label" translatable="yes">_History</property> <property name="no_show_all">True</property> <property name="use_underline">True</property> <property name="image">image7</property> diff -r 6babba0f1e3c -r c3328ec572d9 data/gui/gc_occupants_menu.ui --- a/data/gui/gc_occupants_menu.ui Tue Mar 23 11:45:58 2010 +0200 +++ b/data/gui/gc_occupants_menu.ui Tue Mar 23 13:49:41 2010 +0100 @@ -5,7 +5,7 @@ <object class="GtkMenu" id="gc_occupants_menu"> <child> <object class="GtkImageMenuItem" id="send_private_message_menuitem"> - <property name="label">_Send Private Message</property> + <property name="label" translatable="yes">_Send Private Message</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image1</property> @@ -15,7 +15,7 @@ </child> <child> <object class="GtkImageMenuItem" id="send_file_menuitem"> - <property name="label">Send _File</property> + <property name="label" translatable="yes">Send _File</property> <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="use_underline">True</property> @@ -101,7 +101,7 @@ </child> <child> <object class="GtkImageMenuItem" id="add_to_roster_menuitem"> - <property name="label">_Add to Roster</property> + <property name="label" translatable="yes">_Add to Roster</property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="image">image3</property>

1 0

gajim: Switched DTMF batch implementation to use deque
by Alexander Cherniuk 23 Mar '10

23 Mar '10

changeset 6babba0f1e3c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6babba0f1e3c description: Switched DTMF batch implementation to use deque diffstat: src/common/jingle_rtp.py | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diffs (31 lines): diff -r 5072be999b1e -r 6babba0f1e3c src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Tue Mar 23 09:31:52 2010 +0200 +++ b/src/common/jingle_rtp.py Tue Mar 23 11:45:58 2010 +0200 @@ -15,6 +15,8 @@ Handles Jingle RTP sessions (XEP 0167) """ +from collections import deque + import gobject import socket @@ -122,15 +124,15 @@ """ if self._dtmf_running: raise Exception("There is a DTMF batch already running") - events = list(events) + events = deque(events) self._dtmf_running = True - self._start_dtmf(events.pop(0)) + self._start_dtmf(events.popleft()) gobject.timeout_add(500, self._next_dtmf, events) def _next_dtmf(self, events): self._stop_dtmf() if events: - self._start_dtmf(events.pop(0)) + self._start_dtmf(events.popleft()) gobject.timeout_add(500, self._next_dtmf, events) else: self._dtmf_running = False

1 0

gajim: Improved sending a DTMF batch
by Alexander Cherniuk 23 Mar '10

23 Mar '10

changeset 5072be999b1e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5072be999b1e description: Improved sending a DTMF batch diffstat: src/common/jingle_rtp.py | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diffs (26 lines): diff -r e1079d000674 -r 5072be999b1e src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Mon Mar 22 21:49:25 2010 +0000 +++ b/src/common/jingle_rtp.py Tue Mar 23 09:31:52 2010 +0200 @@ -121,16 +121,17 @@ Send several DTMF tones """ if self._dtmf_running: - raise Exception # TODO: Proper exception + raise Exception("There is a DTMF batch already running") + events = list(events) self._dtmf_running = True - self._start_dtmf(events[-1]) - gobject.timeout_add(500, self._next_dtmf, events[:-1]) + self._start_dtmf(events.pop(0)) + gobject.timeout_add(500, self._next_dtmf, events) def _next_dtmf(self, events): self._stop_dtmf() if events: - self._start_dtmf(events[-1]) - gobject.timeout_add(500, self._next_dtmf, events[:-1]) + self._start_dtmf(events.pop(0)) + gobject.timeout_add(500, self._next_dtmf, events) else: self._dtmf_running = False

1 0

gajim: Fix /dtmf command
by Thibaut GIRKA 21 Mar '10

21 Mar '10

changeset 91a9c6b56d03 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=91a9c6b56d03 description: Fix /dtmf command diffstat: src/common/jingle_rtp.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (22 lines): diff -r 382768403548 -r 91a9c6b56d03 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Sun Mar 21 21:50:07 2010 +0100 +++ b/src/common/jingle_rtp.py Sun Mar 21 22:06:10 2010 +0100 @@ -123,14 +123,14 @@ if self._dtmf_running: raise Exception # TODO: Proper exception self._dtmf_running = True - self._start_dtmf(events.pop(0)) - gobject.timeout_add(500, self._next_dtmf, events) + self._start_dtmf(events[-1]) + gobject.timeout_add(500, self._next_dtmf, events[:-1]) def _next_dtmf(self, events): self._stop_dtmf() if events: - self._start_dtmf(events.pop(0)) - gobject.timeout_add(500, self._next_dtmf, events) + self._start_dtmf(events[-1]) + gobject.timeout_add(500, self._next_dtmf, events[:-1]) else: self._dtmf_running = False

1 0

gajim: restore combobox in disco window. Fixes #5656
by Yann Leboulanger 21 Mar '10

21 Mar '10

changeset 382768403548 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=382768403548 description: restore combobox in disco window. Fixes #5656 diffstat: data/gui/service_discovery_window.ui | 7 +------ src/disco.py | 4 +--- 2 files changed, 2 insertions(+), 9 deletions(-) diffs (33 lines): diff -r 5ec1e89a49e8 -r 382768403548 data/gui/service_discovery_window.ui --- a/data/gui/service_discovery_window.ui Sun Mar 21 21:47:34 2010 +0100 +++ b/data/gui/service_discovery_window.ui Sun Mar 21 21:50:07 2010 +0100 @@ -70,13 +70,8 @@ <object class="GtkComboBoxEntry" id="address_comboboxentry"> <property name="visible">True</property> <property name="model">liststore1</property> + <property name="text_column">0</property> <signal name="changed" handler="on_address_comboboxentry_changed"/> - <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> </object> <packing> <property name="left_attach">1</property> diff -r 5ec1e89a49e8 -r 382768403548 src/disco.py --- a/src/disco.py Sun Mar 21 21:47:34 2010 +0100 +++ b/src/disco.py Sun Mar 21 21:50:07 2010 +0100 @@ -549,10 +549,8 @@ self.address_comboboxentry_entry = self.address_comboboxentry.child self.address_comboboxentry_entry.set_activates_default(True) - liststore = gtk.ListStore(str) - self.address_comboboxentry.set_model(liststore) self.latest_addresses = gajim.config.get( - 'latest_disco_addresses').split() + 'latest_disco_addresses').split() if jid in self.latest_addresses: self.latest_addresses.remove(jid) self.latest_addresses.insert(0, jid)

1 0

gajim: Merged local changes
by Thibaut GIRKA 21 Mar '10

21 Mar '10

changeset 5ec1e89a49e8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5ec1e89a49e8 description: Merged local changes diffstat: po/LINGUAS | 1 + po/kk.po | 9687 ++++++++++++++++++++++++++++++++++++++++++++++ po/tr.po | 3902 +++++++++++------ src/chat_control.py | 1 + src/common/connection.py | 90 +- 5 files changed, 12225 insertions(+), 1456 deletions(-) diffs (truncated from 19727 to 300 lines): diff -r 50f73a29c439 -r 5ec1e89a49e8 po/LINGUAS --- a/po/LINGUAS Sun Mar 21 21:45:45 2010 +0100 +++ b/po/LINGUAS Sun Mar 21 21:47:34 2010 +0100 @@ -30,3 +30,4 @@ da uk ja +kk diff -r 50f73a29c439 -r 5ec1e89a49e8 po/kk.po --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/po/kk.po Sun Mar 21 21:47:34 2010 +0100 @@ -0,0 +1,9687 @@ +# gajim to kazakh +# Copyright (C) 2009 gajim team +# This file is distributed under the same license as the PACKAGE package. +# Baurzhan Muftakhidinov <baurthefirst(a)gmail.com>, 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: gajim.trunk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-20 21:33+0100\n" +"PO-Revision-Date: 2010-03-20 13:29+0600\n" +"Last-Translator: Baurzhan Muftakhidinov <baurthefirst(a)gmail.com>\n" +"Language-Team: Kazakh <kk_KZ(a)googlegroups.com>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../data/gui/account_context_menu.ui.h:1 +msgid "_Open Gmail Inbox" +msgstr "Gmail е-жәшігін а_шу" + +#: ../data/gui/account_creation_wizard_window.ui.h:1 +msgid "" +"Connecting to server\n" +"\n" +"Please wait..." +msgstr "" +"Сервермен байланыс орнату\n" +"\n" +"Күте тұрыңыз..." + +#: ../data/gui/account_creation_wizard_window.ui.h:4 +msgid "Please choose one of the options below:" +msgstr "Төмендегі нұсқалардың біреуін таңдаңыз:" + +#: ../data/gui/account_creation_wizard_window.ui.h:5 +msgid "Please fill in the data for your existing account" +msgstr "Сізде бар тіркелгі үшін ақпаратты толтырыңыз" + +#: ../data/gui/account_creation_wizard_window.ui.h:6 +msgid "Please select a server" +msgstr "Серверді таңдаңыз" + +#: ../data/gui/account_creation_wizard_window.ui.h:7 +msgid "@" +msgstr "@" + +#: ../data/gui/account_creation_wizard_window.ui.h:8 +msgid "" +"Add this certificate to the list of trusted certificates.\n" +"SHA1 fingerprint of the certificate:\n" +msgstr "" +"Бұл сертификатты сенімділер тізіміне қосу.\n" +"Сертификаттың SHA1 баспасы:\n" + +#: ../data/gui/account_creation_wizard_window.ui.h:11 +msgid "Anon_ymous authentication" +msgstr "" + +#: ../data/gui/account_creation_wizard_window.ui.h:12 +msgid "Connect when I press Finish" +msgstr "Аяқтау басқан кезде, байланыс орнату" + +#: ../data/gui/account_creation_wizard_window.ui.h:13 +msgid "Gajim: Account Creation Wizard" +msgstr "Gajim: Тіркелгілерді жасау шебері" + +#: ../data/gui/account_creation_wizard_window.ui.h:14 +msgid "I already have an account I want to _use" +msgstr "Менде қолданғ_ым келетін тіркелгім бар" + +#: ../data/gui/account_creation_wizard_window.ui.h:15 +msgid "I want to _register for a new account" +msgstr "Жаңа ті_ркелгіні жасауды қалаймын" + +#: ../data/gui/account_creation_wizard_window.ui.h:16 +#: ../data/gui/accounts_window.ui.h:25 +msgid "If checked, Gajim will remember the password for this account" +msgstr "Белгіленген болса, Gajim бұл тіркелгі үшін парольді сақтап отырады" + +#: ../data/gui/account_creation_wizard_window.ui.h:17 +msgid "Manage..." +msgstr "Басқару..." + +#: ../data/gui/account_creation_wizard_window.ui.h:18 +#: ../data/gui/accounts_window.ui.h:36 ../data/gui/change_mood_dialog.ui.h:3 +#: ../src/config.py:1256 ../src/config.py:1359 ../src/config.py:1652 +#: ../src/config.py:1657 ../src/config.py:2208 ../src/config.py:2287 +#: ../src/config.py:2300 ../src/config.py:3538 ../src/config.py:3611 +#: ../src/dialogs.py:308 ../src/dialogs.py:310 ../src/dialogs.py:513 +#: ../src/dialogs.py:526 ../src/roster_window.py:2887 +#: ../src/roster_window.py:2893 ../src/roster_window.py:2898 +msgid "None" +msgstr "Ешнәрсе" + +#: ../data/gui/account_creation_wizard_window.ui.h:19 +msgid "Prox_y:" +msgstr "Прокс_и:" + +#: ../data/gui/account_creation_wizard_window.ui.h:20 +#: ../data/gui/accounts_window.ui.h:45 +msgid "Save pass_word" +msgstr "Пар_ольді сақтау" + +#: ../data/gui/account_creation_wizard_window.ui.h:21 +msgid "Set my profile when I connect" +msgstr "Мен қосылғанда, профайлымды орнату" + +#: ../data/gui/account_creation_wizard_window.ui.h:22 +msgid "Use custom hostname/port" +msgstr "Пайдаланушы хост аты/порт қолдану" + +#: ../data/gui/account_creation_wizard_window.ui.h:23 +msgid "" +"You need to have an account in order to connect\n" +"to the Jabber network." +msgstr "" +"Jabber желісіне байланыс орнату үшін сізде\n" +"тіркелгіңіз болуы керек." + +#: ../data/gui/account_creation_wizard_window.ui.h:25 +#: ../data/gui/roster_window.ui.h:9 +msgid "_Advanced" +msgstr "Кеңейтіл_ген" + +#: ../data/gui/account_creation_wizard_window.ui.h:26 +msgid "_Finish" +msgstr "_Аяқтау" + +#: ../data/gui/account_creation_wizard_window.ui.h:27 +msgid "_Hostname:" +msgstr "_Хост аты:" + +#: ../data/gui/account_creation_wizard_window.ui.h:28 +#: ../data/gui/accounts_window.ui.h:57 +msgid "_Jabber ID:" +msgstr "_Jabber ID:" + +#: ../data/gui/account_creation_wizard_window.ui.h:29 +#: ../data/gui/accounts_window.ui.h:59 +msgid "_Password:" +msgstr "_Пароль:" + +#: ../data/gui/account_creation_wizard_window.ui.h:30 +msgid "_Port:" +msgstr "_Порт:" + +#: ../data/gui/account_creation_wizard_window.ui.h:31 +msgid "_Server:" +msgstr "_Сервер:" + +#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13 +msgid "Miscellaneous" +msgstr "Таңдамалы" + +#: ../data/gui/accounts_window.ui.h:2 +msgid "OpenPGP" +msgstr "OpenPGP" + +#: ../data/gui/accounts_window.ui.h:3 +msgid "Personal Information" +msgstr "Жеке ақпарат" + +#: ../data/gui/accounts_window.ui.h:4 +msgid "Proxy" +msgstr "Прокси" + +#: ../data/gui/accounts_window.ui.h:5 +msgid "A_djust to status" +msgstr "" + +#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1 +msgid "Account" +msgstr "Тіркелгі" + +#: ../data/gui/accounts_window.ui.h:7 +msgid "Accounts" +msgstr "Тіркелгілер" + +#: ../data/gui/accounts_window.ui.h:8 +msgid "Administration operations" +msgstr "Әкімшілік әрекеттер" + +#: ../data/gui/accounts_window.ui.h:9 +msgid "Anonymous authentication" +msgstr "" + +#: ../data/gui/accounts_window.ui.h:10 +msgid "Auto-reconnect when connection is lost" +msgstr "Байланыс үзілсе, оны қалпына келтіру" + +#: ../data/gui/accounts_window.ui.h:11 +msgid "C_onnect on Gajim startup" +msgstr "Gajim қосылғанда, байланыс _орнату" + +#: ../data/gui/accounts_window.ui.h:12 +msgid "Chan_ge Password" +msgstr "Парольді өз_герту" + +#: ../data/gui/accounts_window.ui.h:13 +msgid "" +"Check this so Gajim will ask you before sending your password over an " +"insecure connection." +msgstr "" + +#: ../data/gui/accounts_window.ui.h:14 +msgid "Choose _Key..." +msgstr "_Кілтті таңдау..." + +#: ../data/gui/accounts_window.ui.h:15 +msgid "Click to change account's password" +msgstr "Тіркелгі паролін өзгерту үшін шертіңіз" + +#: ../data/gui/accounts_window.ui.h:16 +msgid "Click to request authorization to all contacts of another account" +msgstr "" +"Басқа тіркелгінің барлық контакттарынан авторизация сұрау үшін шертіңіз" + +#: ../data/gui/accounts_window.ui.h:17 +msgid "Co_nnect on Gajim startup" +msgstr "" + +#: ../data/gui/accounts_window.ui.h:18 +msgid "Connection" +msgstr "Байланыс" + +#: ../data/gui/accounts_window.ui.h:19 +#: ../data/gui/zeroconf_information_window.ui.h:2 +msgid "E-Mail:" +msgstr "E-Mail:" + +#: ../data/gui/accounts_window.ui.h:20 +#: ../data/gui/zeroconf_information_window.ui.h:3 +msgid "First Name:" +msgstr "Аты:" + +#. No configured account +#: ../data/gui/accounts_window.ui.h:21 ../data/gui/roster_window.ui.h:2 +#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171 +#: ../src/notify.py:558 ../src/notify.py:581 ../src/notify.py:622 +#: ../src/notify.py:638 +msgid "Gajim" +msgstr "Gajim" + +#. FIXME: Ugly workaround. +#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General) +#. General group cannot be changed +#: ../data/gui/accounts_window.ui.h:22 ../data/gui/preferences_window.ui.h:61 +#: ../src/common/contacts.py:141 ../src/dialogs.py:111 ../src/dialogs.py:121 +#: ../src/roster_window.py:2829 ../src/roster_window.py:5376 +msgid "General" +msgstr "Жалпы" + +#: ../data/gui/accounts_window.ui.h:23 +msgid "" +"If checked, Gajim will also broadcast some more IPs except from just your " +"IP, so file transfer has higher chances of working." +msgstr "" + +#: ../data/gui/accounts_window.ui.h:24 +msgid "If checked, Gajim will get the password from a GPG agent like seahorse" +msgstr "" + +#: ../data/gui/accounts_window.ui.h:26 +msgid "" +"If checked, Gajim will send keep-alive packets to prevent connection timeout " +"which results in disconnection" +msgstr "" + +#: ../data/gui/accounts_window.ui.h:27 +msgid "" +"If checked, Gajim, when launched, will automatically connect to jabber using " +"this account" +msgstr "" + +#: ../data/gui/accounts_window.ui.h:28 +msgid "" +"If checked, any change to the global status (handled by the combobox at the " +"bottom of the roster window) will change the status of this account " +"accordingly" +msgstr "" + +#: ../data/gui/accounts_window.ui.h:29 +msgid "" +"If the default port that is used for incoming messages is unfitting for your " +"setup you can select another one here.\n" +"You might consider to change possible firewall settings."

1 0

gajim: Delete invalid jingle sessions. Kick audio/video availabi...
by Thibaut GIRKA 21 Mar '10

21 Mar '10

changeset 50f73a29c439 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=50f73a29c439 description: Delete invalid jingle sessions. Kick audio/video availability from jingle states. Fixes #5668, #5651 diffstat: src/chat_control.py | 81 +++++++++++---------------- src/command_system/implementation/standard.py | 6 +- src/common/jingle.py | 5 +- src/common/jingle_session.py | 2 - src/dialogs.py | 9 +++ src/gui_interface.py | 26 ++++---- 6 files changed, 63 insertions(+), 66 deletions(-) diffs (truncated from 302 to 300 lines): diff -r 1be252d1caa4 -r 50f73a29c439 src/chat_control.py --- a/src/chat_control.py Fri Mar 19 20:46:05 2010 +0000 +++ b/src/chat_control.py Sun Mar 21 21:45:45 2010 +0100 @@ -1259,13 +1259,12 @@ A control for standard 1-1 chat """ ( - JINGLE_STATE_NOT_AVAILABLE, - JINGLE_STATE_AVAILABLE, + JINGLE_STATE_NULL, JINGLE_STATE_CONNECTING, JINGLE_STATE_CONNECTION_RECEIVED, JINGLE_STATE_CONNECTED, JINGLE_STATE_ERROR - ) = range(6) + ) = range(5) TYPE_ID = message_control.TYPE_CHAT old_msg_kind = None # last kind of the printed message @@ -1352,9 +1351,11 @@ self._audio_banner_image = self.xml.get_object('audio_banner_image') self._video_banner_image = self.xml.get_object('video_banner_image') self.audio_sid = None - self.audio_state = self.JINGLE_STATE_NOT_AVAILABLE + self.audio_state = self.JINGLE_STATE_NULL + self.audio_available = False self.video_sid = None - self.video_state = self.JINGLE_STATE_NOT_AVAILABLE + self.video_state = self.JINGLE_STATE_NULL + self.video_available = False self.update_toolbar() @@ -1480,34 +1481,19 @@ # Jingle detection if self.contact.supports(NS_JINGLE_ICE_UDP) and \ gajim.HAVE_FARSIGHT and self.contact.resource: - if self.contact.supports(NS_JINGLE_RTP_AUDIO): - if self.audio_state == self.JINGLE_STATE_NOT_AVAILABLE: - self.set_audio_state('available') - else: - self.set_audio_state('not_available') - - if self.contact.supports(NS_JINGLE_RTP_VIDEO): - if self.video_state == self.JINGLE_STATE_NOT_AVAILABLE: - self.set_video_state('available') - else: - self.set_video_state('not_available') + self.audio_available = self.contact.supports(NS_JINGLE_RTP_AUDIO) + self.video_available = self.contact.supports(NS_JINGLE_RTP_VIDEO) else: - if self.audio_state != self.JINGLE_STATE_NOT_AVAILABLE: - self.set_audio_state('not_available') - if self.video_state != self.JINGLE_STATE_NOT_AVAILABLE: - self.set_video_state('not_available') + if self.video_available or self.audio_available: + self.stop_jingle() + self.video_available = False + self.audio_available = False # Audio buttons - if self.audio_state == self.JINGLE_STATE_NOT_AVAILABLE: - self._audio_button.set_sensitive(False) - else: - self._audio_button.set_sensitive(True) + self._audio_button.set_sensitive(self.audio_available) # Video buttons - if self.video_state == self.JINGLE_STATE_NOT_AVAILABLE: - self._video_button.set_sensitive(False) - else: - self._video_button.set_sensitive(True) + self._video_button.set_sensitive(self.video_available) # Send file if self.contact.supports(NS_FILE) and self.contact.resource: @@ -1551,8 +1537,7 @@ return banner_image = getattr(self, '_' + jingle_type + '_banner_image') state = getattr(self, jingle_type + '_state') - if state in (self.JINGLE_STATE_NOT_AVAILABLE, - self.JINGLE_STATE_AVAILABLE): + if state == self.JINGLE_STATE_NULL: banner_image.hide() else: banner_image.show() @@ -1604,24 +1589,29 @@ # update MessageWindow._controls self.parent_win.change_jid(self.account, old_full_jid, new_full_jid) + def stop_jingle(self, sid=None, reason=None): + if self.audio_sid and sid in (self.audio_sid, None): + self.close_jingle_content('audio') + if self.video_sid and sid in (self.video_sid, None): + self.close_jingle_content('video') + + def _set_jingle_state(self, jingle_type, state, sid=None, reason=None): if jingle_type not in ('audio', 'video'): return - if state in ('connecting', 'connected', 'stop') and reason: + if state in ('connecting', 'connected', 'stop', 'error') and reason: str = _('%(type)s state : %(state)s, reason: %(reason)s') % { 'type': jingle_type.capitalize(), 'state': state, 'reason': reason} self.print_conversation(str, 'info') - states = {'not_available': self.JINGLE_STATE_NOT_AVAILABLE, - 'available': self.JINGLE_STATE_AVAILABLE, - 'connecting': self.JINGLE_STATE_CONNECTING, + states = {'connecting': self.JINGLE_STATE_CONNECTING, 'connection_received': self.JINGLE_STATE_CONNECTION_RECEIVED, 'connected': self.JINGLE_STATE_CONNECTED, - 'stop': self.JINGLE_STATE_AVAILABLE, + 'stop': self.JINGLE_STATE_NULL, 'error': self.JINGLE_STATE_ERROR} jingle_state = states[state] - if getattr(self, jingle_type + '_state') == jingle_state: + if getattr(self, jingle_type + '_state') == jingle_state or state == 'error': return if state == 'stop' and getattr(self, jingle_type + '_sid') not in (None, sid): @@ -1629,21 +1619,12 @@ setattr(self, jingle_type + '_state', jingle_state) - # Destroy existing session with the user when he signs off - # We need to do that before modifying the sid - if state == 'not_available': - gajim.connections[self.account].delete_jingle_session( - getattr(self, jingle_type + '_sid')) - - if state in ('not_available', 'available', 'stop'): + if jingle_state == self.JINGLE_STATE_NULL: setattr(self, jingle_type + '_sid', None) if state in ('connection_received', 'connecting'): setattr(self, jingle_type + '_sid', sid) - if state in ('connecting', 'connected', 'connection_received'): - getattr(self, '_' + jingle_type + '_button').set_active(True) - elif state in ('not_available', 'stop'): - getattr(self, '_' + jingle_type + '_button').set_active(False) + getattr(self, '_' + jingle_type + '_button').set_active(jingle_state != self.JINGLE_STATE_NULL) getattr(self, 'update_' + jingle_type)() @@ -1892,12 +1873,16 @@ sid = getattr(self, jingle_type + '_sid') if not sid: return + setattr(self, jingle_type + '_sid', None) + setattr(self, jingle_type + '_state', self.JINGLE_STATE_NULL) session = gajim.connections[self.account].get_jingle_session( self.contact.get_full_jid(), sid) if session: content = session.get_content(jingle_type) if content: session.remove_content(content.creator, content.name) + getattr(self, '_' + jingle_type + '_button').set_active(False) + getattr(self, 'update_' + jingle_type)() def on_jingle_button_toggled(self, widget, jingle_type): img_name = 'gajim-%s_%s' % ({'audio': 'mic', 'video': 'cam'}[jingle_type], @@ -1906,7 +1891,7 @@ if widget.get_active(): if getattr(self, jingle_type + '_state') == \ - self.JINGLE_STATE_AVAILABLE: + self.JINGLE_STATE_NULL: sid = getattr(gajim.connections[self.account], 'start_' + jingle_type)(self.contact.get_full_jid()) getattr(self, 'set_' + jingle_type + '_state')('connecting', sid) diff -r 1be252d1caa4 -r 50f73a29c439 src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Fri Mar 19 20:46:05 2010 +0000 +++ b/src/command_system/implementation/standard.py Sun Mar 21 21:45:45 2010 +0100 @@ -195,8 +195,8 @@ @command @doc(_("Toggle audio session")) def audio(self): - if self.audio_state == self.JINGLE_STATE_NOT_AVAILABLE: - raise CommandError(_("Video sessions are not available")) + if not self.audio_available: + raise CommandError(_("Audio sessions are not available")) else: # A state of an audio session is toggled by inverting a state of the # appropriate button. @@ -206,7 +206,7 @@ @command @doc(_("Toggle video session")) def video(self): - if self.video_state == self.JINGLE_STATE_NOT_AVAILABLE: + if not self.video_available: raise CommandError(_("Video sessions are not available")) else: # A state of a video session is toggled by inverting a state of the diff -r 1be252d1caa4 -r 50f73a29c439 src/common/jingle.py --- a/src/common/jingle.py Fri Mar 19 20:46:05 2010 +0000 +++ b/src/common/jingle.py Sun Mar 21 21:45:45 2010 +0100 @@ -33,7 +33,7 @@ import xmpp import helpers -from jingle_session import JingleSession +from jingle_session import JingleSession, JingleStates from jingle_rtp import JingleAudio, JingleVideo @@ -92,6 +92,9 @@ # we already have such session in dispatcher... self.__sessions[sid].on_stanza(stanza) + # Delete invalid/unneeded sessions + if sid in self.__sessions and self.__sessions[sid].state == JingleStates.ended: + self.delete_jingle_session(sid) raise xmpp.NodeProcessed diff -r 1be252d1caa4 -r 50f73a29c439 src/common/jingle_session.py --- a/src/common/jingle_session.py Fri Mar 19 20:46:05 2010 +0000 +++ b/src/common/jingle_session.py Sun Mar 21 21:45:45 2010 +0100 @@ -320,8 +320,6 @@ xmpp_error = child.getName() self.__dispatch_error(xmpp_error, jingle_error, text) # FIXME: Not sure when we would want to do that... - if xmpp_error == 'item-not-found': - self.connection.delete_jingle_session(self.sid) def __on_transport_replace(self, stanza, jingle, error, action): for content in jingle.iterTags('content'): diff -r 1be252d1caa4 -r 50f73a29c439 src/dialogs.py --- a/src/dialogs.py Fri Mar 19 20:46:05 2010 +0000 +++ b/src/dialogs.py Sun Mar 21 21:45:45 2010 +0100 @@ -4907,6 +4907,15 @@ self.content_types.add(type_) self.set_secondary_text() + def remove_contents(self, content_types): + for type_ in content_types: + if type_ in self.content_types: + self.content_types.remove(type_) + if not self.content_types: + self.dialog.destroy() + else: + self.set_secondary_text() + def on_voip_call_received_messagedialog_destroy(self, dialog): if (self.fjid, self.sid) in self.instances: del self.instances[(self.fjid, self.sid)] diff -r 1be252d1caa4 -r 50f73a29c439 src/gui_interface.py --- a/src/gui_interface.py Fri Mar 19 20:46:05 2010 +0000 +++ b/src/gui_interface.py Sun Mar 21 21:45:45 2010 +0100 @@ -1810,9 +1810,8 @@ if media in ('audio', 'video'): jid = gajim.get_jid_without_resource(peerjid) resource = gajim.get_resource_from_jid(peerjid) - ctrl = self.msg_win_mgr.get_control(peerjid, account) - if not ctrl: - ctrl = self.msg_win_mgr.get_control(jid, account) + ctrl = (self.msg_win_mgr.get_control(peerjid, account) + or self.msg_win_mgr.get_control(jid, account)) if ctrl: if media == 'audio': ctrl.set_audio_state('connected', sid) @@ -1824,26 +1823,29 @@ peerjid, sid, media, reason = data jid = gajim.get_jid_without_resource(peerjid) resource = gajim.get_resource_from_jid(peerjid) - ctrl = self.msg_win_mgr.get_control(peerjid, account) - if not ctrl: - ctrl = self.msg_win_mgr.get_control(jid, account) + ctrl = (self.msg_win_mgr.get_control(peerjid, account) + or self.msg_win_mgr.get_control(jid, account)) if ctrl: - if media in ('audio', None): + if media is None: + ctrl.stop_jingle(sid=sid, reason=reason) + elif media == 'audio': ctrl.set_audio_state('stop', sid=sid, reason=reason) - if media in ('video', None): + elif media == 'video': ctrl.set_video_state('stop', sid=sid, reason=reason) dialog = dialogs.VoIPCallReceivedDialog.get_dialog(peerjid, sid) if dialog: - dialog.dialog.destroy() + if media is None: + dialog.dialog.destroy() + else: + dialog.remove_contents((media, )) def handle_event_jingle_error(self, account, data): # ('JINGLE_ERROR', account, (peerjid, sid, reason)) peerjid, sid, reason = data jid = gajim.get_jid_without_resource(peerjid) resource = gajim.get_resource_from_jid(peerjid) - ctrl = self.msg_win_mgr.get_control(peerjid, account) - if not ctrl: - ctrl = self.msg_win_mgr.get_control(jid, account) + ctrl = (self.msg_win_mgr.get_control(peerjid, account) + or self.msg_win_mgr.get_control(jid, account)) if ctrl:

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2010