Commits April 2007

commits@gajim.org

4 participants
62 discussions

[commit-gajim] r8112 - in trunk/src: . common
by asterix＠gajim.org 26 Apr '07

26 Apr '07

Author: asterix Date: 2007-04-26 18:44:00 +0200 (Thu, 26 Apr 2007) New Revision: 8112 Modified: trunk/src/common/gajim.py trunk/src/gajim.py trunk/src/groupchat_control.py trunk/src/roster_window.py Log: [TheCurse] single-clicking ability. fixes #2072 Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2007-04-25 21:51:08 UTC (rev 8111) +++ trunk/src/common/gajim.py 2007-04-26 16:44:00 UTC (rev 8112) @@ -124,6 +124,8 @@ # be online transport_avatar = {} # {transport_jid: [jid_list]} +# Is Gnome configured to activate on single click ? +single_click = False SHOW_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd', 'invisible', 'error'] Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-04-25 21:51:08 UTC (rev 8111) +++ trunk/src/gajim.py 2007-04-26 16:44:00 UTC (rev 8112) @@ -2146,7 +2146,17 @@ if os.name != 'nt' and gajim.config.get('check_if_gajim_is_default'): gtkgui_helpers.possibly_set_gajim_as_xmpp_handler() - #add default status messages if there is not in the config file + # Is gnome configured to activate row on single click ? + try: + import gconf + client = gconf.client_get_default() + click_policy = client.get_string( + '/apps/nautilus/preferences/click_policy') + if click_policy == 'single': + gajim.single_click = True + except: + pass + # add default status messages if there is not in the config file if len(gajim.config.get_per('statusmsg')) == 0: for msg in gajim.config.statusmsg_default: gajim.config.add_per('statusmsg', msg) Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-04-25 21:51:08 UTC (rev 8111) +++ trunk/src/groupchat_control.py 2007-04-26 16:44:00 UTC (rev 8112) @@ -1757,8 +1757,9 @@ win.set_active_tab(nick_jid, self.account) win.window.present() - def on_list_treeview_row_activated(self, widget, path, col = 0): - '''When an iter is double clicked: open the chat window''' + def on_row_activated(self, widget, path): + '''When an iter is activated (dubblick or single click if gnome is set + this way''' model = widget.get_model() if len(path) == 1: # It's a group if (widget.row_expanded(path)): @@ -1768,6 +1769,11 @@ else: # We want to send a private message nick = model[path][C_NICK].decode('utf-8') self._start_private_message(nick) + + def on_list_treeview_row_activated(self, widget, path, col = 0): + '''When an iter is double clicked: open the chat window''' + if not gajim.single_click: + self.on_row_activated(widget, path) def on_list_treeview_button_press_event(self, widget, event): '''popup user's group's or agent menu''' @@ -1808,26 +1814,30 @@ widget.get_selection().unselect_all() return - model = widget.get_model() - iter = model.get_iter(path) - nick = model[iter][C_NICK].decode('utf-8') - if not nick in gajim.contacts.get_nick_list(self.account, - self.room_jid): - #it's a group - col = widget.get_column(0) - avatar_cell = col.get_cell_renderers()[0] - (pos, avatar_size) = col.cell_get_position(avatar_cell) - status_cell = col.get_cell_renderers()[1] - (pos, status_size) = col.cell_get_position(status_cell) - if x > avatar_size and x < avatar_size + status_size: - if (widget.row_expanded(path)): - widget.collapse_row(path) - else: - widget.expand_row(path, False) - elif event.state & gtk.gdk.SHIFT_MASK: - self.append_nick_in_msg_textview(self.msg_textview, nick) - self.msg_textview.grab_focus() + if gajim.single_click: + self.on_row_activated(widget, path) return True + else: + model = widget.get_model() + iter = model.get_iter(path) + nick = model[iter][C_NICK].decode('utf-8') + if not nick in gajim.contacts.get_nick_list(self.account, + self.room_jid): + #it's a group + col = widget.get_column(0) + avatar_cell = col.get_cell_renderers()[0] + (pos, avatar_size) = col.cell_get_position(avatar_cell) + status_cell = col.get_cell_renderers()[1] + (pos, status_size) = col.cell_get_position(status_cell) + if x > avatar_size and x < avatar_size + status_size: + if (widget.row_expanded(path)): + widget.collapse_row(path) + else: + widget.expand_row(path, False) + elif event.state & gtk.gdk.SHIFT_MASK: + self.append_nick_in_msg_textview(self.msg_textview, nick) + self.msg_textview.grab_focus() + return True def append_nick_in_msg_textview(self, widget, nick): message_buffer = self.msg_textview.get_buffer() Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-04-25 21:51:08 UTC (rev 8111) +++ trunk/src/roster_window.py 2007-04-26 16:44:00 UTC (rev 8112) @@ -2883,24 +2883,27 @@ elif event.button == 1: # Left click model = self.tree.get_model() type_ = model[path][C_TYPE] - if type_ == 'group' and x < 27: - # first cell in 1st column (the arrow SINGLE clicked) - if (self.tree.row_expanded(path)): - self.tree.collapse_row(path) - else: - self.tree.expand_row(path, False) - - elif type_ == 'contact' and x < 27: - account = model[path][C_ACCOUNT].decode('utf-8') - jid = model[path][C_JID].decode('utf-8') - # first cell in 1st column (the arrow SINGLE clicked) - iters = self.get_contact_iter(jid, account) - for iter in iters: - path = model.get_path(iter) + if gajim.single_click: + self.on_row_activated(widget, path) + else: + if type_ == 'group' and x < 27: + # first cell in 1st column (the arrow SINGLE clicked) if (self.tree.row_expanded(path)): self.tree.collapse_row(path) else: self.tree.expand_row(path, False) + + elif type_ == 'contact' and x < 27: + account = model[path][C_ACCOUNT].decode('utf-8') + jid = model[path][C_JID].decode('utf-8') + # first cell in 1st column (the arrow SINGLE clicked) + iters = self.get_contact_iter(jid, account) + for iter in iters: + path = model.get_path(iter) + if (self.tree.row_expanded(path)): + self.tree.collapse_row(path) + else: + self.tree.expand_row(path, False) def on_req_usub(self, widget, list_): '''Remove a contact. list_ is a list of (contact, account) tuples''' @@ -3785,8 +3788,9 @@ win.window.present() - def on_roster_treeview_row_activated(self, widget, path, col = 0): - '''When an iter is double clicked: open the first event window''' + def on_row_activated(self, widget, path): + '''When an iter is activated (dubblick or single click if gnome is set + this way''' model = self.tree.get_model() account = model[path][C_ACCOUNT].decode('utf-8') type_ = model[path][C_TYPE] @@ -3830,6 +3834,11 @@ resource = c.resource self.on_open_chat_window(widget, c, account, resource = resource) + def on_roster_treeview_row_activated(self, widget, path, col = 0): + '''When an iter is double clicked: open the first event window''' + if not gajim.single_click: + self.on_row_activated(widget, path) + def on_roster_treeview_row_expanded(self, widget, iter, path): '''When a row is expanded change the icon of the arrow''' model = self.tree.get_model()

1 0

[commit-gajim] r8111 - in trunk/src: . common
by asterix＠gajim.org 25 Apr '07

25 Apr '07

Author: asterix Date: 2007-04-25 23:51:08 +0200 (Wed, 25 Apr 2007) New Revision: 8111 Modified: trunk/src/common/config.py trunk/src/conversation_textview.py trunk/src/gajim.py Log: [thecurse] add latex support (run dvips and convert externaly) through use_latex ACE option. fixes #2796 Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2007-04-25 20:51:01 UTC (rev 8110) +++ trunk/src/common/config.py 2007-04-25 21:51:08 UTC (rev 8111) @@ -225,6 +225,7 @@ 'show_contacts_number': [opt_bool, True, _('If True, Gajim will show number of online and total contacts in account and group rows.')], 'treat_incoming_messages': [ opt_str, '', _('Can be empty, \'chat\' or \'normal\'. If not empty, treat all incoming messages as if they were of this type')], 'scroll_roster_to_last_message': [opt_bool, True, _('If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened.')], + 'use_latex': [opt_bool, False, _('If True, Gajim will convert string between $$ and $$ to an image using dvips and convert before insterting it in chat window.')], } __options_per_key = { Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2007-04-25 20:51:01 UTC (rev 8110) +++ trunk/src/conversation_textview.py 2007-04-25 21:51:08 UTC (rev 8111) @@ -14,6 +14,10 @@ ## GNU General Public License for more details. ## +import random +from tempfile import gettempdir +from subprocess import Popen + import gtk import pango import gobject @@ -572,6 +576,50 @@ return index # the position after *last* special text + def latex_to_image(self, str): + result = None + + str = str[2:len(str)-2] + + random.seed() + tmpfile = os.path.join(gettempdir(), "gajimtex_" + random.randint(0, 100).__str__()) + + # build latex string + texstr = "\\documentclass[12pt]{article}\\usepackage[dvips]{graphicx}\\usepackage{amsmath}\\usepackage{amssymb}\\pagestyle{empty}" + texstr += "\\begin{document}\\begin{large}\\begin{gather*}" + texstr += str + texstr += "\\end{gather*}\\end{large}\\end{document}" + + file = open(os.path.join(tmpfile + ".tex"), "w+") + file.write(texstr) + file.flush() + file.close() + + p = Popen(['latex', '--interaction=nonstopmode', tmpfile + '.tex'], cwd=gettempdir()) + exitcode = p.wait() + + if exitcode == 0: + p = Popen(['dvips', '-E', '-o', tmpfile + '.ps', tmpfile + '.dvi'], cwd=gettempdir()) + exitcode = p.wait() + + if exitcode == 0: + p = Popen(['convert', tmpfile + '.ps', tmpfile + '.png'], cwd=gettempdir()) + exitcode = p.wait() + + extensions = [".tex", ".log", ".aux", ".dvi", ".ps"] + + for ext in extensions: + try: + os.remove(tmpfile + ext) + except Exception: + pass + + if exitcode == 0: + result = tmpfile + '.png' + + return result + + def print_special_text(self, special_text, other_tags): '''is called by detect_and_print_special_text and prints special text (emots, links, formatting)''' @@ -656,6 +704,24 @@ else: if not show_ascii_formatting_chars: special_text = special_text[1:-1] # remove _ _ + elif special_text.startswith('$$') and special_text.endswith('$$'): + imagepath = self.latex_to_image(special_text) + end_iter = buffer.get_end_iter() + anchor = buffer.create_child_anchor(end_iter) + if imagepath != None: + img = gtk.Image() + img.set_from_file(imagepath) + img.show() + # add + self.tv.add_child_at_anchor(img, anchor) + # delete old file + try: + os.remove(imagepath) + except Exception: + pass + else: + buffer.insert(end_iter, special_text) + use_other_tags = False else: #it's a url tags.append('url') Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-04-25 20:51:01 UTC (rev 8110) +++ trunk/src/gajim.py 2007-04-25 21:51:08 UTC (rev 8111) @@ -1823,7 +1823,13 @@ r'(?<!\w|\<)' r'/[^\s/]' r'([^/]*[^\s/])?' r'/(?!\w)|'\ r'(?<!\w)' r'_[^\s_]' r'([^_]*[^\s_])?' r'_(?!\w)' + latex = r'|\$\$.*\$\$' + basic_pattern = links + mail + + if gajim.config.get('use_latex'): + basic_pattern += latex + if gajim.config.get('ascii_formatting'): basic_pattern += formatting self.basic_pattern_re = re.compile(basic_pattern, re.IGNORECASE)

1 0

[commit-gajim] r8110 - trunk/src
by asterix＠gajim.org 25 Apr '07

25 Apr '07

Author: asterix Date: 2007-04-25 22:51:01 +0200 (Wed, 25 Apr 2007) New Revision: 8110 Modified: trunk/src/dialogs.py trunk/src/roster_window.py Log: [roidelapluie] coding standards. see #253 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-04-25 17:34:14 UTC (rev 8109) +++ trunk/src/dialogs.py 2007-04-25 20:51:01 UTC (rev 8110) @@ -2335,7 +2335,7 @@ tags = [] rule_selected = self.store.get_path( self.contacts_treeview.get_selection().get_selected()[1])[0] - for i in range(0,len(self.global_rules)): + for i in range(0, len(self.global_rules)): if i != rule_selected: tags.append(self.global_rules[i]) else: Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-04-25 17:34:14 UTC (rev 8109) +++ trunk/src/roster_window.py 2007-04-25 20:51:01 UTC (rev 8110) @@ -1429,15 +1429,15 @@ self.dialog = dialogs.ConfirmationDialog(pritext, sectext, on_response_ok = (remove, list_)) - def on_block(self, widget, iter, blockedlist): + def on_block(self, widget, iter, group_list): ''' When clicked on the 'block' button in context menu. ''' model = self.tree.get_model() accounts = [] - if blockedlist == None: + msg = self.get_status_message('offline') + if group_list == None: jid = model[iter][C_JID].decode('utf-8') account = model[iter][C_ACCOUNT].decode('utf-8') accounts.append(account) - msg = self.get_status_message('offline') self.send_status(account, 'offline', msg, to = jid) new_rule = {'order': u'1', 'type': u'jid', 'action': u'deny', 'value' : jid, 'child': [u'message', u'iq', u'presence-out']} @@ -1446,14 +1446,13 @@ gajim.connections[account].blocked_contacts.append(jid) self.draw_contact(jid, account) else: - msg = self.get_status_message('offline') if iter == None: - for (contact, account) in blockedlist: + for (contact, account) in group_list: if account not in accounts: if not gajim.connections[account].privacy_rules_supported: continue accounts.append(account) - self.send_status(account, 'offline', msg, to = contact.jid) + self.send_status(account, 'offline', msg, to=contact.jid) new_rule = {'order': u'1', 'type': u'jid', 'action': u'deny', 'value' : contact.jid, 'child': [u'message', u'iq', u'presence-out']} @@ -1464,12 +1463,12 @@ else: group = model[iter][C_JID].decode('utf-8') msg = self.get_status_message('offline') - for (contact, account) in blockedlist: + for (contact, account) in group_list: if account not in accounts: if not gajim.connections[account].privacy_rules_supported: continue accounts.append(account) - self.send_status(account, 'offline', msg, to = contact.jid) + self.send_status(account, 'offline', msg, to=contact.jid) # needed for draw_contact: gajim.connections[account].blocked_contacts.append(contact.jid) self.draw_contact(contact.jid, account) @@ -1560,7 +1559,7 @@ show = gajim.SHOW_LIST[status] else: # accounts merged show = helpers.get_global_show() - self.send_status(jid_account, show, msg, to = jid) + self.send_status(jid_account, show, msg, to=jid) else: for (contact, account) in group_list: if not self.regroup: @@ -1571,10 +1570,10 @@ if gajim.connections[account].privacy_rules_supported: accounts.append(account) self.send_status(account, show, - gajim.connections[account].status, to = contact.jid) + gajim.connections[account].status, to=contact.jid) else: self.send_status(account, show, - gajim.connections[account].status, to = contact.jid) + gajim.connections[account].status, to=contact.jid) def on_rename(self, widget, iter, path): # this function is called either by F2 or by Rename menuitem

1 0

[commit-gajim] r8109 - trunk/src
by asterix＠gajim.org 25 Apr '07

25 Apr '07

Author: asterix Date: 2007-04-25 19:34:14 +0200 (Wed, 25 Apr 2007) New Revision: 8109 Modified: trunk/src/roster_window.py Log: use awn only if dbus is available Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-04-25 17:33:32 UTC (rev 8108) +++ trunk/src/roster_window.py 2007-04-25 17:34:14 UTC (rev 8109) @@ -21,7 +21,6 @@ import time import urllib -import dbus import common.sleepy import history_window import dialogs @@ -49,6 +48,7 @@ from common import dbus_support if dbus_support.supported: from music_track_listener import MusicTrackListener + import dbus #(icon, name, type, jid, account, editable, second pixbuf) ( @@ -3235,6 +3235,9 @@ self._music_track_changed(None, None) def _change_awn_icon_status(self, status): + if not dbus_support.supported: + # do nothing if user doesn't have D-Bus bindings + return iconset = gajim.config.get('iconset') prefix = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '32x32') if status in ('chat', 'away', 'xa', 'dnd', 'invisible', 'offline'):

1 0

[commit-gajim] r8108 - trunk/src
by asterix＠gajim.org 25 Apr '07

25 Apr '07

Author: asterix Date: 2007-04-25 19:33:32 +0200 (Wed, 25 Apr 2007) New Revision: 8108 Modified: trunk/src/dialogs.py Log: redraw contact when we unblock it from blocked contacts window Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-04-25 17:09:07 UTC (rev 8107) +++ trunk/src/dialogs.py 2007-04-25 17:33:32 UTC (rev 8108) @@ -2357,8 +2357,12 @@ msg = gajim.connections[self.account].status show = gajim.SHOW_LIST[gajim.connections[self.account].connected] if deleted_rule['type'] == 'jid': - gajim.connections[self.account].send_custom_status(show, msg, - deleted_rule['value']) + jid = deleted_rule['value'] + gajim.connections[self.account].send_custom_status(show, msg, jid) + # needed for draw_contact: + if jid in gajim.connections[self.account].blocked_contacts: + gajim.connections[self.account].blocked_contacts.remove(jid) + gajim.interface.roster.draw_contact(jid, self.account) else: for jid in gajim.contacts.get_jid_list(self.account): contact = gajim.contacts.get_contact_with_highest_priority( @@ -2366,6 +2370,12 @@ if deleted_rule['value'] in contact.groups: gajim.connections[self.account].send_custom_status(show, msg, contact.jid) + # needed for draw_contact: + if contact.jid in gajim.connections[self.account].\ + blocked_contacts: + gajim.connections[self.account].blocked_contacts.remove( + contact.jid) + gajim.interface.roster.draw_contact(contact.jid, self.account) def privacy_list_received(self, rules): self.store.clear()

1 0

[commit-gajim] r8107 - trunk/src
by asterix＠gajim.org 25 Apr '07

25 Apr '07

Author: asterix Date: 2007-04-25 19:09:07 +0200 (Wed, 25 Apr 2007) New Revision: 8107 Modified: trunk/src/roster_window.py trunk/src/tooltips.py Log: show blocked contacts name striked and add [blocked] in tooltip. fixes #3129 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-04-25 15:54:58 UTC (rev 8106) +++ trunk/src/roster_window.py 2007-04-25 17:09:07 UTC (rev 8107) @@ -560,6 +560,8 @@ if not contact: return name = gobject.markup_escape_text(contact.get_shown_name()) + if jid in gajim.connections[account].blocked_contacts: + name = '%s' % name nb_connected_contact = 0 for c in contact_instances: @@ -1315,6 +1317,7 @@ if not connected_contacts: # no connected contacts, show the ofline one connected_contacts = contacts + self.tooltip.account = account self.tooltip.timeout = gobject.timeout_add(500, self.show_tooltip, connected_contacts) elif model[iter][C_TYPE] == 'account': @@ -1323,6 +1326,7 @@ if account == 'all': if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: self.tooltip.id = row + self.tooltip.account = None self.tooltip.timeout = gobject.timeout_add(500, self.show_tooltip, []) return @@ -1364,6 +1368,7 @@ contacts.append(contact) if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: self.tooltip.id = row + self.tooltip.account = None self.tooltip.timeout = gobject.timeout_add(500, self.show_tooltip, contacts) @@ -1437,44 +1442,47 @@ new_rule = {'order': u'1', 'type': u'jid', 'action': u'deny', 'value' : jid, 'child': [u'message', u'iq', u'presence-out']} gajim.connections[account].blocked_list.append(new_rule) + # needed for draw_contact: + gajim.connections[account].blocked_contacts.append(jid) + self.draw_contact(jid, account) else: msg = self.get_status_message('offline') if iter == None: for (contact, account) in blockedlist: if account not in accounts: - if gajim.connections[account].privacy_rules_supported: - accounts.append(account) - self.send_status(account, 'offline', msg, to = contact.jid) - new_rule = {'order': u'1', 'type': u'jid', - 'action': u'deny', 'value' : contact.jid, - 'child': [u'message', u'iq', u'presence-out']} - gajim.connections[account].blocked_list.append(new_rule) - else: - self.send_status(account, 'offline', msg, to = contact.jid) - new_rule = {'order': u'1', 'type': u'jid', - 'action': u'deny', 'value' : contact.jid, - 'child': [u'message', u'iq', u'presence-out']} - gajim.connections[account].blocked_list.append(new_rule) + if not gajim.connections[account].privacy_rules_supported: + continue + accounts.append(account) + self.send_status(account, 'offline', msg, to = contact.jid) + new_rule = {'order': u'1', 'type': u'jid', + 'action': u'deny', 'value' : contact.jid, + 'child': [u'message', u'iq', u'presence-out']} + gajim.connections[account].blocked_list.append(new_rule) + # needed for draw_contact: + gajim.connections[account].blocked_contacts.append(contact.jid) + self.draw_contact(contact.jid, account) else: group = model[iter][C_JID].decode('utf-8') msg = self.get_status_message('offline') for (contact, account) in blockedlist: if account not in accounts: - if gajim.connections[account].privacy_rules_supported: - accounts.append(account) - self.send_status(account, 'offline', msg, to = contact.jid) - else: - self.send_status(account, 'offline', msg, to = contact.jid) + if not gajim.connections[account].privacy_rules_supported: + continue + accounts.append(account) + self.send_status(account, 'offline', msg, to = contact.jid) + # needed for draw_contact: + gajim.connections[account].blocked_contacts.append(contact.jid) + self.draw_contact(contact.jid, account) new_rule = {'order': u'1', 'type': u'group', 'action': u'deny', 'value' : group, 'child': [u'message', u'iq', u'presence-out']} gajim.connections[account].blocked_list.append(new_rule) - for account in accounts: - gajim.connections[account].set_privacy_list( - 'block', gajim.connections[account].blocked_list) - if len(gajim.connections[account].blocked_list) == 1: - gajim.connections[account].set_active_list('block') - gajim.connections[account].set_default_list('block') - gajim.connections[account].get_privacy_list('block') + for account in accounts: + gajim.connections[account].set_privacy_list( + 'block', gajim.connections[account].blocked_list) + if len(gajim.connections[account].blocked_list) == 1: + gajim.connections[account].set_active_list('block') + gajim.connections[account].set_default_list('block') + gajim.connections[account].get_privacy_list('block') def on_unblock(self, widget, iter, group_list): ''' When clicked on the 'unblock' button in context menu. ''' @@ -1487,8 +1495,12 @@ gajim.connections[jid_account].new_blocked_list = [] for rule in gajim.connections[jid_account].blocked_list: if rule['action'] != 'deny' or rule['type'] != 'jid' \ - or rule['value'] != jid: + or rule['value'] != jid: gajim.connections[jid_account].new_blocked_list.append(rule) + # needed for draw_contact: + if jid in gajim.connections[jid_account].blocked_contacts: + gajim.connections[jid_account].blocked_contacts.remove(jid) + self.draw_contact(jid, jid_account) else: if iter == None: for (contact, account) in group_list: @@ -1500,6 +1512,11 @@ gajim.connections[account].to_unblock.append(contact.jid) else: gajim.connections[account].to_unblock.append(contact.jid) + # needed for draw_contact: + if contact.jid in gajim.connections[account].blocked_contacts: + gajim.connections[account].blocked_contacts.remove( + contact.jid) + self.draw_contact(contact.jid, account) for account in accounts: for rule in gajim.connections[account].blocked_list: if rule['action'] != 'deny' or rule['type'] != 'jid' \ @@ -1514,8 +1531,14 @@ gajim.connections[account].new_blocked_list = [] for rule in gajim.connections[account].blocked_list: if rule['action'] != 'deny' or rule['type'] != 'group' \ - or rule['value'] != group: - gajim.connections[account].new_blocked_list.append(rule) + or rule['value'] != group: + gajim.connections[account].new_blocked_list.append( + rule) + # needed for draw_contact: + if contact.jid in gajim.connections[account].blocked_contacts: + gajim.connections[account].blocked_contacts.remove( + contact.jid) + self.draw_contact(contact.jid, account) for account in accounts: gajim.connections[account].set_privacy_list( 'block', gajim.connections[account].new_blocked_list) @@ -1552,9 +1575,7 @@ else: self.send_status(account, show, gajim.connections[account].status, to = contact.jid) - - def on_rename(self, widget, iter, path): # this function is called either by F2 or by Rename menuitem if gajim.interface.instances.has_key('rename'): Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2007-04-25 15:54:58 UTC (rev 8106) +++ trunk/src/tooltips.py 2007-04-25 17:09:07 UTC (rev 8107) @@ -372,7 +372,7 @@ def populate(self, contacts): self.create_window() - + self.create_table() if not contacts or len(contacts) == 0: # Tooltip for merged accounts row @@ -409,6 +409,9 @@ name_markup = u'' + \ gobject.markup_escape_text(prim_contact.get_shown_name())\ + '' + if self.account and prim_contact.jid in gajim.connections[ + self.account].blocked_contacts: + name_markup += u' [blocked]' properties.append((name_markup, None)) num_resources = 0

1 0

[commit-gajim] r8106 - in trunk: data/glade src
by asterix＠gajim.org 25 Apr '07

25 Apr '07

Author: asterix Date: 2007-04-25 17:54:58 +0200 (Wed, 25 Apr 2007) New Revision: 8106 Modified: trunk/data/glade/advanced_menuitem_menu.glade trunk/data/glade/blocked_contacts_window.glade trunk/data/glade/roster_contact_context_menu.glade trunk/src/dialogs.py trunk/src/roster_window.py Log: [roidelapluie] ability to block several contacts in the same time. fixes #3128 Modified: trunk/data/glade/advanced_menuitem_menu.glade =================================================================== --- trunk/data/glade/advanced_menuitem_menu.glade 2007-04-25 14:32:32 UTC (rev 8105) +++ trunk/data/glade/advanced_menuitem_menu.glade 2007-04-25 15:54:58 UTC (rev 8106) @@ -11,7 +11,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1461"> + <widget class="GtkImage" id="image1466"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -32,11 +32,23 @@ </child> <child> - <widget class="GtkMenuItem" id="blocked_contacts_menuitem"> + <widget class="GtkImageMenuItem" id="blocked_contacts_menuitem"> <property name="visible">True</property> <property name="label" translatable="yes">_Blocked Contacts</property> <property name="use_underline">True</property> <signal name="activate" handler="on_blocked_contacts_menuitem_activate" last_modification_time="Thu, 19 Apr 2007 15:32:47 GMT"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image1467"> + <property name="visible">True</property> + <property name="stock">gtk-stop</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> </widget> </child> @@ -67,7 +79,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1462"> + <widget class="GtkImage" id="image1468"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -109,7 +121,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1463"> + <widget class="GtkImage" id="image1469"> <property name="visible">True</property> <property name="stock">gtk-clear</property> <property name="icon_size">1</property> Modified: trunk/data/glade/blocked_contacts_window.glade =================================================================== --- trunk/data/glade/blocked_contacts_window.glade 2007-04-25 14:32:32 UTC (rev 8105) +++ trunk/data/glade/blocked_contacts_window.glade 2007-04-25 15:54:58 UTC (rev 8106) @@ -50,6 +50,7 @@ <property name="fixed_height_mode">False</property> <property name="hover_selection">False</property> <property name="hover_expand">False</property> + <signal name="row_activated" handler="on_contacts_treeview_row_activated" last_modification_time="Wed, 25 Apr 2007 13:09:39 GMT"/> </widget> </child> </widget> @@ -65,11 +66,73 @@ <property name="border_width">3</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label">gtk-remove</property> - <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <signal name="clicked" handler="on_remove_button_clicked" last_modification_time="Sun, 22 Apr 2007 14:02:48 GMT"/> + + <child> + <widget class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> + + <child> + <widget class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">2</property> + + <child> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-remove</property> + <property name="icon_size">4</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="label">_Unblock</property> + <property name="use_underline">True</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> </widget> <packing> <property name="padding">0</property> Modified: trunk/data/glade/roster_contact_context_menu.glade =================================================================== --- trunk/data/glade/roster_contact_context_menu.glade 2007-04-25 14:32:32 UTC (rev 8105) +++ trunk/data/glade/roster_contact_context_menu.glade 2007-04-25 15:54:58 UTC (rev 8106) @@ -12,7 +12,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1650"> + <widget class="GtkImage" id="image1701"> <property name="visible">True</property> <property name="stock">gtk-jump-to</property> <property name="icon_size">1</property> @@ -32,7 +32,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1651"> + <widget class="GtkImage" id="image1702"> <property name="visible">True</property> <property name="stock">gtk-go-up</property> <property name="icon_size">1</property> @@ -52,7 +52,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1652"> + <widget class="GtkImage" id="image1703"> <property name="visible">True</property> <property name="stock">gtk-new</property> <property name="icon_size">1</property> @@ -72,7 +72,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1653"> + <widget class="GtkImage" id="image1704"> <property name="visible">True</property> <property name="stock">gtk-go-back</property> <property name="icon_size">1</property> @@ -91,7 +91,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1654"> + <widget class="GtkImage" id="image1705"> <property name="visible">True</property> <property name="stock">gtk-refresh</property> <property name="icon_size">1</property> @@ -112,48 +112,6 @@ </child> <child> - <widget class="GtkImageMenuItem" id="block_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Block</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_block_menuitem_activate" last_modification_time="Sun, 22 Apr 2007 10:35:33 GMT"/> - - <child internal-child="image"> - <widget class="GtkImage" id="image1655"> - <property name="visible">True</property> - <property name="stock">gtk-stop</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkImageMenuItem" id="unblock_menuitem"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Unblock</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_unblock_menuitem_activate" last_modification_time="Sun, 22 Apr 2007 12:08:00 GMT"/> - - <child internal-child="image"> - <widget class="GtkImage" id="image1656"> - <property name="visible">True</property> - <property name="stock">gtk-stop</property> - <property name="icon_size">1</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - </child> - </widget> - </child> - - <child> <widget class="GtkSeparatorMenuItem" id="above_send_file_separator"> <property name="visible">True</property> </widget> @@ -166,7 +124,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1657"> + <widget class="GtkImage" id="image1706"> <property name="visible">True</property> <property name="stock">gtk-file</property> <property name="icon_size">1</property> @@ -186,7 +144,7 @@ <signal name="activate" handler="on_assign_openpgp_key_menuitem_activate" last_modification_time="Thu, 30 Jun 2005 22:57:59 GMT"/> <child internal-child="image"> - <widget class="GtkImage" id="image1658"> + <widget class="GtkImage" id="image1707"> <property name="visible">True</property> <property name="stock">gtk-dialog-authentication</property> <property name="icon_size">1</property> @@ -206,7 +164,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1659"> + <widget class="GtkImage" id="image1708"> <property name="visible">True</property> <property name="stock">gtk-info</property> <property name="icon_size">1</property> @@ -226,7 +184,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1660"> + <widget class="GtkImage" id="image1709"> <property name="visible">True</property> <property name="stock">gtk-execute</property> <property name="icon_size">1</property> @@ -251,7 +209,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1661"> + <widget class="GtkImage" id="image1710"> <property name="visible">True</property> <property name="stock">gtk-dialog-question</property> <property name="icon_size">1</property> @@ -272,7 +230,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1662"> + <widget class="GtkImage" id="image1711"> <property name="visible">True</property> <property name="stock">gtk-go-up</property> <property name="icon_size">1</property> @@ -292,7 +250,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1663"> + <widget class="GtkImage" id="image1712"> <property name="visible">True</property> <property name="stock">gtk-go-down</property> <property name="icon_size">1</property> @@ -312,7 +270,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1664"> + <widget class="GtkImage" id="image1713"> <property name="visible">True</property> <property name="stock">gtk-stop</property> <property name="icon_size">1</property> @@ -330,12 +288,54 @@ </child> <child> + <widget class="GtkImageMenuItem" id="block_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Block</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_block_menuitem_activate" last_modification_time="Sun, 22 Apr 2007 10:35:33 GMT"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image1714"> + <property name="visible">True</property> + <property name="stock">gtk-no</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> + + <child> + <widget class="GtkImageMenuItem" id="unblock_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Unblock</property> + <property name="use_underline">True</property> + <signal name="activate" handler="on_unblock_menuitem_activate" last_modification_time="Sun, 22 Apr 2007 12:08:00 GMT"/> + + <child internal-child="image"> + <widget class="GtkImage" id="image1715"> + <property name="visible">True</property> + <property name="stock">gtk-yes</property> + <property name="icon_size">1</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + </widget> + </child> + </widget> + </child> + + <child> <widget class="GtkImageMenuItem" id="add_to_roster_menuitem"> <property name="label" translatable="yes">_Add to Roster</property> <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1665"> + <widget class="GtkImage" id="image1716"> <property name="visible">True</property> <property name="stock">gtk-add</property> <property name="icon_size">1</property> @@ -354,7 +354,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1666"> + <widget class="GtkImage" id="image1717"> <property name="visible">True</property> <property name="stock">gtk-remove</property> <property name="icon_size">1</property> @@ -386,7 +386,7 @@ <property name="use_underline">True</property> <child internal-child="image"> - <widget class="GtkImage" id="image1667"> + <widget class="GtkImage" id="image1718"> <property name="visible">True</property> <property name="stock">gtk-justify-fill</property> <property name="icon_size">1</property> Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-04-25 14:32:32 UTC (rev 8105) +++ trunk/src/dialogs.py 2007-04-25 15:54:58 UTC (rev 8106) @@ -56,7 +56,7 @@ if len(list_) == 1: contact = list_[0][0] self.xml.get_widget('nickname_label').set_markup( - _("Contact name: %s") % contact.get_shown_name()) + _('Contact name: %s') % contact.get_shown_name()) self.xml.get_widget('jid_label').set_markup( _('Jabber ID: %s') % contact.jid) else: @@ -2308,12 +2308,11 @@ self.remove_button = self.xml.get_widget('remove_button') self.contacts_treeview = self.xml.get_widget('contacts_treeview') renderer = gtk.CellRendererText() - self.store = gtk.ListStore(str) self.contacts_treeview.set_model(self.store) - column = gtk.TreeViewColumn("Contact", renderer, text=0) + column = gtk.TreeViewColumn('Contact', renderer, text=0) self.contacts_treeview.append_column(column) if len(gajim.connections) > 1: @@ -2321,7 +2320,6 @@ else: title = _('Blocked Contacts') self.window.set_title(title) - self.window.show_all() self.xml.signal_autoconnect(self) gajim.connections[self.account].get_privacy_list('block') @@ -2332,38 +2330,53 @@ del gajim.interface.instances[self.account][key_name] def on_remove_button_clicked(self, widget): - tags=[] + if self.contacts_treeview.get_selection().get_selected()[1] == None: + return + tags = [] rule_selected = self.store.get_path( self.contacts_treeview.get_selection().get_selected()[1])[0] for i in range(0,len(self.global_rules)): if i != rule_selected: tags.append(self.global_rules[i]) + else: + deleted_rule = self.global_rules[i] for rule in self.global_rules_to_append: tags.append(rule) gajim.connections[self.account].set_privacy_list( 'block', tags) - gajim.connections[self.account].set_active_list('block') - gajim.connections[self.account].set_default_list('block') gajim.connections[self.account].get_privacy_list('block') if len(tags) == 0: self.privacy_list_received([]) gajim.connections[self.account].blocked_contacts = [] + gajim.connections[self.account].blocked_groups = [] gajim.connections[self.account].blocked_list = [] gajim.connections[self.account].set_default_list('') gajim.connections[self.account].set_active_list('') gajim.connections[self.account].del_privacy_list('block') - + status = gajim.connections[self.account].connected + msg = gajim.connections[self.account].status + show = gajim.SHOW_LIST[gajim.connections[self.account].connected] + if deleted_rule['type'] == 'jid': + gajim.connections[self.account].send_custom_status(show, msg, + deleted_rule['value']) + else: + for jid in gajim.contacts.get_jid_list(self.account): + contact = gajim.contacts.get_contact_with_highest_priority( + self.account, jid) + if deleted_rule['value'] in contact.groups: + gajim.connections[self.account].send_custom_status(show, msg, + contact.jid) def privacy_list_received(self, rules): self.store.clear() self.global_rules = [] self.global_rules_to_append = [] for rule in rules: - if rule['type'] == "jid" and rule['action'] == "deny": + if rule['type'] == 'jid' and rule['action'] == 'deny': #self.global_rules[text_item] = rule self.store.append([rule['value']]) self.global_rules.append(rule) - elif rule['type'] == "group" and rule['action'] == "deny": + elif rule['type'] == 'group' and rule['action'] == 'deny': text_item = _('Group %s') % rule['value'] self.store.append([text_item]) self.global_rules.append(rule) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-04-25 14:32:32 UTC (rev 8105) +++ trunk/src/roster_window.py 2007-04-25 15:54:58 UTC (rev 8106) @@ -1425,6 +1425,7 @@ on_response_ok = (remove, list_)) def on_block(self, widget, iter, blockedlist): + ''' When clicked on the 'block' button in context menu. ''' model = self.tree.get_model() accounts = [] if blockedlist == None: @@ -1435,50 +1436,86 @@ self.send_status(account, 'offline', msg, to = jid) new_rule = {'order': u'1', 'type': u'jid', 'action': u'deny', 'value' : jid, 'child': [u'message', u'iq', u'presence-out']} + gajim.connections[account].blocked_list.append(new_rule) else: - model = self.tree.get_model() - group = model[iter][C_JID].decode('utf-8') msg = self.get_status_message('offline') - for (contact, account) in blockedlist: - if account not in accounts: - if gajim.connections[account].privacy_rules_supported: - accounts.append(account) + if iter == None: + for (contact, account) in blockedlist: + if account not in accounts: + if gajim.connections[account].privacy_rules_supported: + accounts.append(account) + self.send_status(account, 'offline', msg, to = contact.jid) + new_rule = {'order': u'1', 'type': u'jid', + 'action': u'deny', 'value' : contact.jid, + 'child': [u'message', u'iq', u'presence-out']} + gajim.connections[account].blocked_list.append(new_rule) + else: self.send_status(account, 'offline', msg, to = contact.jid) - else: - self.send_status(account, 'offline', msg, to = contact.jid) - new_rule = {'order': u'1', 'type': u'group', 'action': u'deny', - 'value' : group, 'child': [u'message', u'iq', u'presence-out']} - for account in accounts: - gajim.connections[account].blocked_list.append(new_rule) - gajim.connections[account].set_privacy_list( + new_rule = {'order': u'1', 'type': u'jid', + 'action': u'deny', 'value' : contact.jid, + 'child': [u'message', u'iq', u'presence-out']} + gajim.connections[account].blocked_list.append(new_rule) + else: + group = model[iter][C_JID].decode('utf-8') + msg = self.get_status_message('offline') + for (contact, account) in blockedlist: + if account not in accounts: + if gajim.connections[account].privacy_rules_supported: + accounts.append(account) + self.send_status(account, 'offline', msg, to = contact.jid) + else: + self.send_status(account, 'offline', msg, to = contact.jid) + new_rule = {'order': u'1', 'type': u'group', 'action': u'deny', + 'value' : group, 'child': [u'message', u'iq', u'presence-out']} + gajim.connections[account].blocked_list.append(new_rule) + for account in accounts: + gajim.connections[account].set_privacy_list( 'block', gajim.connections[account].blocked_list) if len(gajim.connections[account].blocked_list) == 1: gajim.connections[account].set_active_list('block') gajim.connections[account].set_default_list('block') gajim.connections[account].get_privacy_list('block') - def on_unblock(self, widget, iter, blockedlist): + def on_unblock(self, widget, iter, group_list): + ''' When clicked on the 'unblock' button in context menu. ''' model = self.tree.get_model() accounts = [] - if blockedlist == None: + if group_list == None: jid = model[iter][C_JID].decode('utf-8') jid_account = model[iter][C_ACCOUNT].decode('utf-8') accounts.append(jid_account) gajim.connections[jid_account].new_blocked_list = [] for rule in gajim.connections[jid_account].blocked_list: - if rule['action'] != 'deny' or rule['type'] != 'jid' or rule['value'] != jid: + if rule['action'] != 'deny' or rule['type'] != 'jid' \ + or rule['value'] != jid: gajim.connections[jid_account].new_blocked_list.append(rule) else: - model = self.tree.get_model() - group = model[iter][C_JID].decode('utf-8') - for (contact, account) in blockedlist: - if account not in accounts: - if gajim.connections[account].privacy_rules_supported: - accounts.append(account) - gajim.connections[account].new_blocked_list = [] - for rule in gajim.connections[account].blocked_list: - if rule['action'] != 'deny' or rule['type'] != 'group' or rule['value'] != group: - gajim.connections[account].new_blocked_list.append(rule) + if iter == None: + for (contact, account) in group_list: + if account not in accounts: + if gajim.connections[account].privacy_rules_supported: + accounts.append(account) + gajim.connections[account].new_blocked_list = [] + gajim.connections[account].to_unblock = [] + gajim.connections[account].to_unblock.append(contact.jid) + else: + gajim.connections[account].to_unblock.append(contact.jid) + for account in accounts: + for rule in gajim.connections[account].blocked_list: + if rule['action'] != 'deny' or rule['type'] != 'jid' \ + or rule['value'] not in gajim.connections[account].to_unblock: + gajim.connections[account].new_blocked_list.append(rule) + else: + group = model[iter][C_JID].decode('utf-8') + for (contact, account) in group_list: + if account not in accounts: + if gajim.connections[account].privacy_rules_supported: + accounts.append(account) + gajim.connections[account].new_blocked_list = [] + for rule in gajim.connections[account].blocked_list: + if rule['action'] != 'deny' or rule['type'] != 'group' \ + or rule['value'] != group: + gajim.connections[account].new_blocked_list.append(rule) for account in accounts: gajim.connections[account].set_privacy_list( 'block', gajim.connections[account].new_blocked_list) @@ -1490,7 +1527,10 @@ gajim.connections[account].set_default_list('') gajim.connections[account].set_active_list('') gajim.connections[account].del_privacy_list('block') - if blockedlist == None: + if gajim.interface.instances[account].has_key('blocked_contacts'): + gajim.interface.instances[account]['blocked_contacts'].\ + privacy_list_received([]) + if group_list == None: status = gajim.connections[jid_account].connected msg = gajim.connections[jid_account].status if not self.regroup: @@ -1499,7 +1539,7 @@ show = helpers.get_global_show() self.send_status(jid_account, show, msg, to = jid) else: - for (contact, account) in blockedlist: + for (contact, account) in group_list: if not self.regroup: show = gajim.SHOW_LIST[gajim.connections[account].connected] else: # accounts merged @@ -2146,6 +2186,7 @@ connected_accounts = [] contacts_transport = -1 # -1 is at start, False when not from the same, None when jabber + is_blocked = True for iter in iters: jid = model[iter][C_JID].decode('utf-8') account = model[iter][C_ACCOUNT].decode('utf-8') @@ -2160,6 +2201,8 @@ contacts_transport = transport if contacts_transport != transport: contacts_transport = False + if jid not in gajim.connections[account].blocked_contacts: + is_blocked = False list_.append((contact, account)) menu = gtk.Menu() @@ -2229,6 +2272,18 @@ send_group_message_item.connect('activate', self.on_send_single_message_menuitem_activate, account, list_) + if is_blocked: + unblock_menuitem = gtk.ImageMenuItem(_('_Unblock')) + icon = gtk.image_new_from_stock(gtk.STOCK_YES, gtk.ICON_SIZE_MENU) + unblock_menuitem.set_image(icon) + unblock_menuitem.connect('activate', self.on_unblock, None, list_) + menu.append(unblock_menuitem) + else: + block_menuitem = gtk.ImageMenuItem(_('_Block')) + icon = gtk.image_new_from_stock(gtk.STOCK_NO, gtk.ICON_SIZE_MENU) + block_menuitem.set_image(icon) + block_menuitem.connect('activate', self.on_block, None, list_) + menu.append(block_menuitem) # unsensitive if one account is not connected if one_account_offline: remove_item.set_sensitive(False) @@ -2330,13 +2385,13 @@ if group not in helpers.special_groups + (_('General'),): if is_blocked: unblock_menuitem = gtk.ImageMenuItem(_('_Unblock')) - icon = gtk.image_new_from_stock(gtk.STOCK_STOP, gtk.ICON_SIZE_MENU) + icon = gtk.image_new_from_stock(gtk.STOCK_YES, gtk.ICON_SIZE_MENU) unblock_menuitem.set_image(icon) unblock_menuitem.connect('activate', self.on_unblock, iter, list_) menu.append(unblock_menuitem) else: block_menuitem = gtk.ImageMenuItem(_('_Block')) - icon = gtk.image_new_from_stock(gtk.STOCK_STOP, gtk.ICON_SIZE_MENU) + icon = gtk.image_new_from_stock(gtk.STOCK_NO, gtk.ICON_SIZE_MENU) block_menuitem.set_image(icon) block_menuitem.connect('activate', self.on_block, iter, list_) menu.append(block_menuitem)

1 0

[commit-gajim] r8105 - trunk/src/common/zeroconf
by asterix＠gajim.org 25 Apr '07

25 Apr '07

Author: asterix Date: 2007-04-25 16:32:32 +0200 (Wed, 25 Apr 2007) New Revision: 8105 Modified: trunk/src/common/zeroconf/connection_zeroconf.py Log: try to fix zeroconf reconection. see #3076 Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2007-04-25 14:20:57 UTC (rev 8104) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2007-04-25 14:32:32 UTC (rev 8105) @@ -132,8 +132,8 @@ self.time_to_reconnect = None gajim.log.debug('reconnect') - signed = self.get_signed_msg(self.status) - self.reconnect() +# signed = self.get_signed_msg(self.status) + self.connect(self.old_show, self.status) def quit(self, kill_core): if kill_core and self.connected > 1:

1 0

[commit-gajim] r8104 - trunk/src/common/zeroconf
by asterix＠gajim.org 25 Apr '07

25 Apr '07

Author: asterix Date: 2007-04-25 16:20:57 +0200 (Wed, 25 Apr 2007) New Revision: 8104 Modified: trunk/src/common/zeroconf/connection_zeroconf.py Log: fix TB. fixes #3076 Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2007-04-25 10:30:07 UTC (rev 8103) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2007-04-25 14:20:57 UTC (rev 8104) @@ -205,7 +205,6 @@ def _disconnectedReconnCB(self): '''Called when we are disconnected. Comes from network manager for example we don't try to reconnect, network manager will tell us when we can''' - log.debug('disconnectedReconnCB') if gajim.account_is_connected(self.name): # we cannot change our status to offline or connecting # after we auth to server

1 0

[commit-gajim] r8103 - trunk/src/common/zeroconf
by asterix＠gajim.org 25 Apr '07

25 Apr '07

Author: asterix Date: 2007-04-25 12:30:07 +0200 (Wed, 25 Apr 2007) New Revision: 8103 Modified: trunk/src/common/zeroconf/client_zeroconf.py Log: send stream:features in zeroconf network, and send stanza only when other part reply to stream initialization. fixes #3057 Modified: trunk/src/common/zeroconf/client_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/client_zeroconf.py 2007-04-25 10:25:22 UTC (rev 8102) +++ trunk/src/common/zeroconf/client_zeroconf.py 2007-04-25 10:30:07 UTC (rev 8103) @@ -158,10 +158,6 @@ self.Connection.PlugIn(self) dispatcher_nb.Dispatcher().PlugIn(self) self._register_handlers() - if self.sock_type == TYPE_CLIENT: - while self.stanzaqueue: - stanza, is_message = self.stanzaqueue.pop(0) - self.send(stanza, is_message) def StreamInit(self): ''' Send an initial stream header. ''' @@ -178,7 +174,6 @@ def send_stream_header(self): self.Dispatcher._metastream = Node('stream:stream') self.Dispatcher._metastream.setNamespace(self.Namespace) - # XXX TLS support self.Dispatcher._metastream.setAttr('version', '1.0') self.Dispatcher._metastream.setAttr('xmlns:stream', NS_STREAMS) self.Dispatcher._metastream.setAttr('from', self.conn_holder.zeroconf.name) @@ -197,9 +192,19 @@ if attrs.has_key('from'): self.to = attrs['from'] self.send_stream_header() + if attrs.has_key('version') and attrs['version'] == '1.0': + # other part supports stream features + features = Node('stream:features') + features.T.mechanisms.setNamespace(NS_SASL) + features.T.mechanisms.NT.mechanism = 'PLAIN' + self.Dispatcher.send(features) while self.stanzaqueue: stanza, is_message = self.stanzaqueue.pop(0) self.send(stanza, is_message) + elif self.sock_type == TYPE_CLIENT: + while self.stanzaqueue: + stanza, is_message = self.stanzaqueue.pop(0) + self.send(stanza, is_message) def on_disconnect(self):

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2007