Commits

commits@gajim.org

17632 discussions

gajim: fix behaviour when we remove a contact for which we have ...
by Yann Leboulanger 22 Jan '12

22 Jan '12

changeset 47f4f35af77c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=47f4f35af77c description: fix behaviour when we remove a contact for which we have a chat tab opened (re-add it to not in roster group). Fixes #7078 diffstat: src/common/connection_handlers.py | 2 +- src/roster_window.py | 57 ++++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 28 deletions(-) diffs (89 lines): diff -r 79296520f295 -r 47f4f35af77c src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Jan 21 09:17:09 2012 +0100 +++ b/src/common/connection_handlers.py Sat Jan 21 16:32:52 2012 +0100 @@ -865,7 +865,7 @@ elif obj.contact.show in statuss: obj.old_show = statuss.index(obj.contact.show) if (resources != [''] and (len(obj.contact_list) != 1 or \ - obj.contact_list[0].show != 'offline')) and \ + obj.contact_list[0].show not in ('not in roster', 'offline'))) and \ not gajim.jid_is_transport(jid): # Another resource of an existing contact connected obj.old_show = 0 diff -r 79296520f295 -r 47f4f35af77c src/roster_window.py --- a/src/roster_window.py Sat Jan 21 09:17:09 2012 +0100 +++ b/src/roster_window.py Sat Jan 21 16:32:52 2012 +0100 @@ -726,17 +726,9 @@ if not contact: return - if not force and (self.contact_has_pending_roster_events(contact, - account) or gajim.interface.msg_win_mgr.get_control(jid, account)): - # Contact has pending events or window - #TODO: or single message windows? Bur they are not listed for the - # moment - key = (jid, account) - if not key in self.contacts_to_be_removed: - self.contacts_to_be_removed[key] = {'backend': backend} - # if more pending event, don't remove from roster - if self.contact_has_pending_roster_events(contact, account): - return False + if not force and self.contact_has_pending_roster_events(contact, + account): + return False iters = self._get_contact_iter(jid, account, contact, self.model) if iters: @@ -749,25 +741,36 @@ else: self._remove_entity(contact, account) - if backend and (not gajim.interface.msg_win_mgr.get_control(jid, - account) or force): - # If a window is still opened: don't remove contact instance - # Remove contact before redrawing, otherwise the old - # numbers will still be show - gajim.contacts.remove_jid(account, jid, remove_meta=True) - if iters: - rest_of_family = [data for data in family - if account != data['account'] or jid != data['jid']] - if rest_of_family: - # reshow the rest of the family - brothers = self._add_metacontact_family(rest_of_family, - account) - for c, acc in brothers: - self.draw_completely(c.jid, acc) + old_grps = [] + if backend: + if not gajim.interface.msg_win_mgr.get_control(jid, account) or \ + force: + # If a window is still opened: don't remove contact instance + # Remove contact before redrawing, otherwise the old + # numbers will still be show + gajim.contacts.remove_jid(account, jid, remove_meta=True) + if iters: + rest_of_family = [data for data in family + if account != data['account'] or jid != data['jid']] + if rest_of_family: + # reshow the rest of the family + brothers = self._add_metacontact_family(rest_of_family, + account) + for c, acc in brothers: + self.draw_completely(c.jid, acc) + else: + for c in gajim.contacts.get_contacts(account, jid): + c.sub = 'none' + c.show = 'not in roster' + c.status = '' + old_grps = c.get_shown_groups() + c.groups = [_('Not in Roster')] + self._add_entity(c, account) + self.draw_contact(jid, account) if iters: # Draw all groups of the contact - for group in contact.get_shown_groups(): + for group in contact.get_shown_groups() + old_grps: self.draw_group(group, account) self.draw_account(account)

1 0

gajim: prevent traceback. Fixes #7080
by Yann Leboulanger 22 Jan '12

22 Jan '12

changeset ff41575b0b0e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ff41575b0b0e description: prevent traceback. Fixes #7080 diffstat: src/common/helpers.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (19 lines): diff -r 47f4f35af77c -r ff41575b0b0e src/common/helpers.py --- a/src/common/helpers.py Sat Jan 21 16:32:52 2012 +0100 +++ b/src/common/helpers.py Sun Jan 22 00:28:14 2012 +0100 @@ -1432,6 +1432,8 @@ if p: proxy = {} proxyptr = gajim.config.get_per('proxies', p) + if not proxyptr: + return proxy for key in proxyptr.keys(): proxy[key] = proxyptr[key][1] return proxy @@ -1542,4 +1544,4 @@ proxy = get_proxy_info(account) if proxy and proxy['type'] in ('http', 'socks5'): return _get_img_proxy(attrs, proxy) - return _get_img_direct(attrs) \ No newline at end of file + return _get_img_direct(attrs)

1 0

gajim: strip spaces arround server and room name in join groupch...
by Yann Leboulanger 22 Jan '12

22 Jan '12

changeset 79296520f295 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=79296520f295 description: strip spaces arround server and room name in join groupchat dialog. Fixes #7081 diffstat: src/dialogs.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 8080681cc0c6 -r 79296520f295 src/dialogs.py --- a/src/dialogs.py Mon Jan 16 21:11:16 2012 +0100 +++ b/src/dialogs.py Sat Jan 21 09:17:09 2012 +0100 @@ -2464,8 +2464,9 @@ 'groupchat.')) return nickname = self._nickname_entry.get_text().decode('utf-8') - server = self.server_comboboxentry.child.get_text().decode('utf-8') - room = self._room_jid_entry.get_text().decode('utf-8') + server = self.server_comboboxentry.child.get_text().decode('utf-8').\ + strip() + room = self._room_jid_entry.get_text().decode('utf-8').strip() room_jid = room + '@' + server password = self._password_entry.get_text().decode('utf-8') try:

1 0

gajim: fix restoring expanded / collapsed metacontacts when we f...
by Yann Leboulanger 22 Jan '12

22 Jan '12

changeset 8080681cc0c6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8080681cc0c6 description: fix restoring expanded / collapsed metacontacts when we finish using roster filter. Fixes #7060 diffstat: src/roster_window.py | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diffs (47 lines): diff -r c63539ae74ed -r 8080681cc0c6 src/roster_window.py --- a/src/roster_window.py Thu Jan 12 21:44:53 2012 +0100 +++ b/src/roster_window.py Mon Jan 16 21:11:16 2012 +0100 @@ -1451,10 +1451,27 @@ self.tree.set_cursor(path) def _readjust_expand_collapse_state(self): - for account in gajim.connections: - self._adjust_account_expand_collapse_state(account) - for group in gajim.groups[account]: - self._adjust_group_expand_collapse_state(group, account) + def func(model, path, iter_): + type_ = model[iter_][C_TYPE] + acct = model[iter_][C_ACCOUNT].decode('utf-8') + jid = model[iter_][C_JID].decode('utf-8') + key = None + if type_ == 'account': + key = acct + elif type_ == 'group': + key = acct + jid + elif type_ == 'contact': + parent_iter = model.iter_parent(iter_) + ptype = model[parent_iter][C_TYPE] + if ptype == 'group': + grp = model[parent_iter][C_JID].decode('utf-8') + key = acct + grp + jid + if key: + if key in self.collapsed_rows: + self.tree.collapse_row(path) + else: + self.tree.expand_row(path, False) + self.modelfilter.foreach(func) def _adjust_account_expand_collapse_state(self, account): """ @@ -4123,7 +4140,10 @@ jid = model[titer][C_JID].decode('utf-8') account = model[titer][C_ACCOUNT].decode('utf-8') contact = gajim.contacts.get_contact(account, jid) - for group in contact.groups: + groups = contact.groups + if not groups: + groups = [_('General')] + for group in groups: if account + group + jid not in self.collapsed_rows: self.collapsed_rows.append(account + group + jid) family = gajim.contacts.get_metacontacts_family(account, jid)

1 0

gajim: update bonjour for windows string to link to bonjour SDK....
by Yann Leboulanger 22 Jan '12

22 Jan '12

changeset c63539ae74ed in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c63539ae74ed description: update bonjour for windows string to link to bonjour SDK. Fixes #7072 diffstat: src/features_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5405450fd687 -r c63539ae74ed src/features_window.py --- a/src/features_window.py Wed Jan 11 22:28:56 2012 +0100 +++ b/src/features_window.py Thu Jan 12 21:44:53 2012 +0100 @@ -54,7 +54,7 @@ _('Bonjour / Zeroconf'): (self.zeroconf_available, _('Serverless chatting with autodetected clients in a local network.'), _('Requires python-avahi.'), - _('Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour).')), + _('Requires pybonjour and bonjour SDK running (http://developer.apple.com/opensource/).')), _('Command line'): (self.dbus_available, _('A script to control Gajim via commandline.'), _('Requires python-dbus.'),

1 0

gajim: don't allow to open information window when we are offlin...
by Yann Leboulanger 22 Jan '12

22 Jan '12

changeset fd9b3c14f832 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fd9b3c14f832 description: don't allow to open information window when we are offline. Fixes #7082 diffstat: src/chat_control.py | 68 ++++++++++++++++++++++++++---------------------- src/gui_menu_builder.py | 5 ++- 2 files changed, 40 insertions(+), 33 deletions(-) diffs (196 lines): diff -r 191e7d74f635 -r fd9b3c14f832 src/chat_control.py --- a/src/chat_control.py Sun Jan 22 00:28:14 2012 +0100 +++ b/src/chat_control.py Sun Jan 22 11:25:22 2012 +0100 @@ -1437,22 +1437,22 @@ def __init__(self, parent_win, contact, acct, session, resource=None): ChatControlBase.__init__(self, self.TYPE_ID, parent_win, - 'chat_control', contact, acct, resource) + 'chat_control', contact, acct, resource) self.gpg_is_active = False # for muc use: # widget = self.xml.get_object('muc_window_actions_button') self.actions_button = self.xml.get_object('message_window_actions_button') id_ = self.actions_button.connect('clicked', - self.on_actions_button_clicked) + self.on_actions_button_clicked) self.handlers[id_] = self.actions_button self._formattings_button = self.xml.get_object('formattings_button') self._add_to_roster_button = self.xml.get_object( - 'add_to_roster_button') + 'add_to_roster_button') id_ = self._add_to_roster_button.connect('clicked', - self._on_add_to_roster_menuitem_activate) + self._on_add_to_roster_menuitem_activate) self.handlers[id_] = self._add_to_roster_button self._audio_button = self.xml.get_object('audio_togglebutton') @@ -1460,14 +1460,14 @@ self.handlers[id_] = self._audio_button # add a special img gtkgui_helpers.add_image_to_button(self._audio_button, - 'gajim-mic_inactive') + 'gajim-mic_inactive') self._video_button = self.xml.get_object('video_togglebutton') id_ = self._video_button.connect('toggled', self.on_video_button_toggled) self.handlers[id_] = self._video_button # add a special img gtkgui_helpers.add_image_to_button(self._video_button, - 'gajim-cam_inactive') + 'gajim-cam_inactive') self._send_file_button = self.xml.get_object('send_file_button') # add a special img for send file button @@ -1476,30 +1476,30 @@ img.set_from_file(path_to_upload_img) self._send_file_button.set_image(img) id_ = self._send_file_button.connect('clicked', - self._on_send_file_menuitem_activate) + self._on_send_file_menuitem_activate) self.handlers[id_] = self._send_file_button self._convert_to_gc_button = self.xml.get_object( - 'convert_to_gc_button') + 'convert_to_gc_button') id_ = self._convert_to_gc_button.connect('clicked', - self._on_convert_to_gc_menuitem_activate) + self._on_convert_to_gc_menuitem_activate) self.handlers[id_] = self._convert_to_gc_button - contact_information_button = self.xml.get_object( - 'contact_information_button') - id_ = contact_information_button.connect('clicked', - self._on_contact_information_menuitem_activate) - self.handlers[id_] = contact_information_button + self._contact_information_button = self.xml.get_object( + 'contact_information_button') + id_ = self._contact_information_button.connect('clicked', + self._on_contact_information_menuitem_activate) + self.handlers[id_] = self._contact_information_button compact_view = gajim.config.get('compact_view') self.chat_buttons_set_visible(compact_view) self.widget_set_visible(self.xml.get_object('banner_eventbox'), - gajim.config.get('hide_chat_banner')) + gajim.config.get('hide_chat_banner')) self.authentication_button = self.xml.get_object( - 'authentication_button') + 'authentication_button') id_ = self.authentication_button.connect('clicked', - self._on_authentication_button_clicked) + self._on_authentication_button_clicked) self.handlers[id_] = self.authentication_button # Add lock image to show chat encryption @@ -1541,31 +1541,31 @@ # Hook up signals id_ = self.parent_win.window.connect('motion-notify-event', - self._on_window_motion_notify) + self._on_window_motion_notify) self.handlers[id_] = self.parent_win.window message_tv_buffer = self.msg_textview.get_buffer() id_ = message_tv_buffer.connect('changed', - self._on_message_tv_buffer_changed) + self._on_message_tv_buffer_changed) self.handlers[id_] = message_tv_buffer widget = self.xml.get_object('avatar_eventbox') widget.set_property('height-request', gajim.config.get( - 'chat_avatar_height')) + 'chat_avatar_height')) id_ = widget.connect('enter-notify-event', - self.on_avatar_eventbox_enter_notify_event) + self.on_avatar_eventbox_enter_notify_event) self.handlers[id_] = widget id_ = widget.connect('leave-notify-event', - self.on_avatar_eventbox_leave_notify_event) + self.on_avatar_eventbox_leave_notify_event) self.handlers[id_] = widget id_ = widget.connect('button-press-event', - self.on_avatar_eventbox_button_press_event) + self.on_avatar_eventbox_button_press_event) self.handlers[id_] = widget widget = self.xml.get_object('location_eventbox') id_ = widget.connect('button-release-event', - self.on_location_eventbox_button_release_event) + self.on_location_eventbox_button_release_event) self.handlers[id_] = widget for key in ('1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '0', '#'): @@ -1614,7 +1614,7 @@ if not resource: resource = contact.resource session = gajim.connections[self.account].find_controlless_session( - self.contact.jid, resource) + self.contact.jid, resource) self.setup_seclabel(self.xml.get_object('label_selector')) if session: @@ -1627,8 +1627,7 @@ # Enable encryption if needed self.no_autonegotiation = False e2e_is_active = self.session and self.session.enable_encryption - gpg_pref = gajim.config.get_per('contacts', contact.jid, - 'gpg_enabled') + gpg_pref = gajim.config.get_per('contacts', contact.jid, 'gpg_enabled') # try GPG first if not e2e_is_active and gpg_pref and \ @@ -1637,15 +1636,15 @@ self.gpg_is_active = True gajim.encrypted_chats[self.account].append(contact.jid) msg = _('GPG encryption enabled') - ChatControlBase.print_conversation_line(self, msg, - 'status', '', None) + ChatControlBase.print_conversation_line(self, msg, 'status', '', + None) if self.session: self.session.loggable = gajim.config.get_per('accounts', - self.account, 'log_encrypted_sessions') + self.account, 'log_encrypted_sessions') # GPG is always authenticated as we use GPG's WoT self._show_lock_image(self.gpg_is_active, 'GPG', self.gpg_is_active, - self.session and self.session.is_loggable(), True) + self.session and self.session.is_loggable(), True) self.update_ui() # restore previous conversation @@ -1743,6 +1742,13 @@ else: self._convert_to_gc_button.set_sensitive(False) + # Information + if gajim.account_is_disconnected(self.account): + self._contact_information_button.set_sensitive(False) + else: + self._contact_information_button.set_sensitive(True) + + def update_all_pep_types(self): for pep_type in self._pep_images: self.update_pep(pep_type) diff -r 191e7d74f635 -r fd9b3c14f832 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Sun Jan 22 00:28:14 2012 +0100 +++ b/src/gui_menu_builder.py Sun Jan 22 11:25:22 2012 +0100 @@ -272,8 +272,9 @@ # Unsensitive many items when account is offline if gajim.account_is_disconnected(account): - for widget in (start_chat_menuitem, rename_menuitem, - edit_groups_menuitem, send_file_menuitem, convert_to_gc_menuitem): + for widget in (start_chat_menuitem, rename_menuitem, + edit_groups_menuitem, send_file_menuitem, convert_to_gc_menuitem, + information_menuitem): widget.set_sensitive(False) if not show_start_chat:

1 0

gajim: prevent traceback. Fixes #7080
by Yann Leboulanger 21 Jan '12

21 Jan '12

changeset 191e7d74f635 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=191e7d74f635 description: prevent traceback. Fixes #7080 diffstat: src/common/helpers.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (19 lines): diff -r 879184d7d82c -r 191e7d74f635 src/common/helpers.py --- a/src/common/helpers.py Sat Jan 21 16:32:52 2012 +0100 +++ b/src/common/helpers.py Sun Jan 22 00:28:14 2012 +0100 @@ -1432,6 +1432,8 @@ if p: proxy = {} proxyptr = gajim.config.get_per('proxies', p) + if not proxyptr: + return proxy for key in proxyptr.keys(): proxy[key] = proxyptr[key][1] return proxy @@ -1542,4 +1544,4 @@ proxy = get_proxy_info(account) if proxy and proxy['type'] in ('http', 'socks5'): return _get_img_proxy(attrs, proxy) - return _get_img_direct(attrs) \ No newline at end of file + return _get_img_direct(attrs)

1 0

gajim: fix behaviour when we remove a contact for which we have ...
by Yann Leboulanger 21 Jan '12

21 Jan '12

changeset 879184d7d82c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=879184d7d82c description: fix behaviour when we remove a contact for which we have a chat tab opened (re-add it to not in roster group). Fixes #7078 diffstat: src/common/connection_handlers.py | 2 +- src/roster_window.py | 57 ++++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 28 deletions(-) diffs (89 lines): diff -r 3ab4d2f441a1 -r 879184d7d82c src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Jan 21 09:17:09 2012 +0100 +++ b/src/common/connection_handlers.py Sat Jan 21 16:32:52 2012 +0100 @@ -865,7 +865,7 @@ elif obj.contact.show in statuss: obj.old_show = statuss.index(obj.contact.show) if (resources != [''] and (len(obj.contact_list) != 1 or \ - obj.contact_list[0].show != 'offline')) and \ + obj.contact_list[0].show not in ('not in roster', 'offline'))) and \ not gajim.jid_is_transport(jid): # Another resource of an existing contact connected obj.old_show = 0 diff -r 3ab4d2f441a1 -r 879184d7d82c src/roster_window.py --- a/src/roster_window.py Sat Jan 21 09:17:09 2012 +0100 +++ b/src/roster_window.py Sat Jan 21 16:32:52 2012 +0100 @@ -726,17 +726,9 @@ if not contact: return - if not force and (self.contact_has_pending_roster_events(contact, - account) or gajim.interface.msg_win_mgr.get_control(jid, account)): - # Contact has pending events or window - #TODO: or single message windows? Bur they are not listed for the - # moment - key = (jid, account) - if not key in self.contacts_to_be_removed: - self.contacts_to_be_removed[key] = {'backend': backend} - # if more pending event, don't remove from roster - if self.contact_has_pending_roster_events(contact, account): - return False + if not force and self.contact_has_pending_roster_events(contact, + account): + return False iters = self._get_contact_iter(jid, account, contact, self.model) if iters: @@ -749,25 +741,36 @@ else: self._remove_entity(contact, account) - if backend and (not gajim.interface.msg_win_mgr.get_control(jid, - account) or force): - # If a window is still opened: don't remove contact instance - # Remove contact before redrawing, otherwise the old - # numbers will still be show - gajim.contacts.remove_jid(account, jid, remove_meta=True) - if iters: - rest_of_family = [data for data in family - if account != data['account'] or jid != data['jid']] - if rest_of_family: - # reshow the rest of the family - brothers = self._add_metacontact_family(rest_of_family, - account) - for c, acc in brothers: - self.draw_completely(c.jid, acc) + old_grps = [] + if backend: + if not gajim.interface.msg_win_mgr.get_control(jid, account) or \ + force: + # If a window is still opened: don't remove contact instance + # Remove contact before redrawing, otherwise the old + # numbers will still be show + gajim.contacts.remove_jid(account, jid, remove_meta=True) + if iters: + rest_of_family = [data for data in family + if account != data['account'] or jid != data['jid']] + if rest_of_family: + # reshow the rest of the family + brothers = self._add_metacontact_family(rest_of_family, + account) + for c, acc in brothers: + self.draw_completely(c.jid, acc) + else: + for c in gajim.contacts.get_contacts(account, jid): + c.sub = 'none' + c.show = 'not in roster' + c.status = '' + old_grps = c.get_shown_groups() + c.groups = [_('Not in Roster')] + self._add_entity(c, account) + self.draw_contact(jid, account) if iters: # Draw all groups of the contact - for group in contact.get_shown_groups(): + for group in contact.get_shown_groups() + old_grps: self.draw_group(group, account) self.draw_account(account)

1 0

gajim: strip spaces arround server and room name in join groupch...
by Yann Leboulanger 21 Jan '12

21 Jan '12

changeset 3ab4d2f441a1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3ab4d2f441a1 description: strip spaces arround server and room name in join groupchat dialog. Fixes #7081 diffstat: src/dialogs.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 1d057f97712c -r 3ab4d2f441a1 src/dialogs.py --- a/src/dialogs.py Mon Jan 16 21:11:16 2012 +0100 +++ b/src/dialogs.py Sat Jan 21 09:17:09 2012 +0100 @@ -2465,8 +2465,9 @@ 'groupchat.')) return nickname = self._nickname_entry.get_text().decode('utf-8') - server = self.server_comboboxentry.child.get_text().decode('utf-8') - room = self._room_jid_entry.get_text().decode('utf-8') + server = self.server_comboboxentry.child.get_text().decode('utf-8').\ + strip() + room = self._room_jid_entry.get_text().decode('utf-8').strip() room_jid = room + '@' + server password = self._password_entry.get_text().decode('utf-8') try:

1 0

gajim: fix restoring expanded / collapsed metacontacts when we f...
by Yann Leboulanger 16 Jan '12

16 Jan '12

changeset 1d057f97712c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1d057f97712c description: fix restoring expanded / collapsed metacontacts when we finish using roster filter. Fixes #7060 diffstat: src/roster_window.py | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diffs (47 lines): diff -r 640494bb6414 -r 1d057f97712c src/roster_window.py --- a/src/roster_window.py Thu Jan 12 21:44:53 2012 +0100 +++ b/src/roster_window.py Mon Jan 16 21:11:16 2012 +0100 @@ -1451,10 +1451,27 @@ self.tree.set_cursor(path) def _readjust_expand_collapse_state(self): - for account in gajim.connections: - self._adjust_account_expand_collapse_state(account) - for group in gajim.groups[account]: - self._adjust_group_expand_collapse_state(group, account) + def func(model, path, iter_): + type_ = model[iter_][C_TYPE] + acct = model[iter_][C_ACCOUNT].decode('utf-8') + jid = model[iter_][C_JID].decode('utf-8') + key = None + if type_ == 'account': + key = acct + elif type_ == 'group': + key = acct + jid + elif type_ == 'contact': + parent_iter = model.iter_parent(iter_) + ptype = model[parent_iter][C_TYPE] + if ptype == 'group': + grp = model[parent_iter][C_JID].decode('utf-8') + key = acct + grp + jid + if key: + if key in self.collapsed_rows: + self.tree.collapse_row(path) + else: + self.tree.expand_row(path, False) + self.modelfilter.foreach(func) def _adjust_account_expand_collapse_state(self, account): """ @@ -4123,7 +4140,10 @@ jid = model[titer][C_JID].decode('utf-8') account = model[titer][C_ACCOUNT].decode('utf-8') contact = gajim.contacts.get_contact(account, jid) - for group in contact.groups: + groups = contact.groups + if not groups: + groups = [_('General')] + for group in groups: if account + group + jid not in self.collapsed_rows: self.collapsed_rows.append(account + group + jid) family = gajim.contacts.get_metacontacts_family(account, jid)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits