Commits April 2007

commits@gajim.org

4 participants
62 discussions

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

30 Apr '07

Author: asterix Date: 2007-04-30 22:27:11 +0200 (Mon, 30 Apr 2007) New Revision: 8122 Modified: trunk/src/common/connection_handlers.py trunk/src/gajim.py Log: [Peritus] handle confirmation requests sent via messages for XEP-0070. fixes #2995 Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-04-30 17:54:43 UTC (rev 8121) +++ trunk/src/common/connection_handlers.py 2007-04-30 20:27:11 UTC (rev 8122) @@ -1180,7 +1180,8 @@ id = iq_obj.getTagAttr('confirm', 'id') method = iq_obj.getTagAttr('confirm', 'method') url = iq_obj.getTagAttr('confirm', 'url') - self.dispatch('HTTP_AUTH', (method, url, id, iq_obj)); + msg = iq_obj.getTagData('body') # In case it's a message with a body + self.dispatch('HTTP_AUTH', (method, url, id, iq_obj, msg)); raise common.xmpp.NodeProcessed def _ErrorCB(self, con, iq_obj): @@ -1384,6 +1385,11 @@ if msg.getTag('event') is not None: self._pubsubEventCB(con, msg) return + # check if the message is a xep70-confirmation-request + if msg.getTag('confirm') and msg.getTag('confirm').namespace == \ + common.xmpp.NS_HTTP_AUTH: + self._HttpAuthCB(con, msg) + return msgtxt = msg.getBody() msghtml = msg.getXHTML() mtype = msg.getType() Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-04-30 17:54:43 UTC (rev 8121) +++ trunk/src/gajim.py 2007-04-30 20:27:11 UTC (rev 8122) @@ -400,13 +400,16 @@ gc_control.show_change_nick_input_dialog(title, prompt, proposed_nick) def handle_event_http_auth(self, account, data): - #('HTTP_AUTH', account, (method, url, transaction_id, iq_obj)) + #('HTTP_AUTH', account, (method, url, transaction_id, iq_obj, msg)) def response(widget, account, iq_obj, answer): self.dialog.destroy() gajim.connections[account].build_http_auth_answer(iq_obj, answer) + sec_msg = _('Do you accept this request?') + if data[4]: + sec_msg = data[4] + '\n' + sec_msg self.dialog = dialogs.YesNoDialog(_('HTTP (%s) Authorization for %s (id: %s)') \ - % (data[0], data[1], data[2]), _('Do you accept this request?'), + % (data[0], data[1], data[2]), sec_msg, on_response_yes = (response, account, data[3], 'yes'), on_response_no = (response, account, data[3], 'no'))

1 0

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

30 Apr '07

Author: asterix Date: 2007-04-30 19:54:43 +0200 (Mon, 30 Apr 2007) New Revision: 8121 Modified: trunk/src/common/zeroconf/connection_zeroconf.py Log: fix TB with zeroconf and blocked contacts. fixes #3141 Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2007-04-30 14:32:58 UTC (rev 8120) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2007-04-30 17:54:43 UTC (rev 8121) @@ -59,6 +59,7 @@ self.is_zeroconf = True self.privacy_rules_supported = False self.blocked_contacts = [] + self.blocked_groups = [] self.status = '' self.old_show = '' self.priority = 0

1 0

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

30 Apr '07

Author: asterix Date: 2007-04-30 16:32:58 +0200 (Mon, 30 Apr 2007) New Revision: 8120 Modified: trunk/src/roster_window.py Log: catch all exceptions when trying to talk to Awn through dbus Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-04-29 21:18:07 UTC (rev 8119) +++ trunk/src/roster_window.py 2007-04-30 14:32:58 UTC (rev 8120) @@ -3268,9 +3268,10 @@ obj = bus.get_object('com.google.code.Awn', '/com/google/code/Awn') awn = dbus.Interface(obj, 'com.google.code.Awn') awn.SetTaskIconByName('Gajim', os.path.abspath(path)) - except dbus.DBusException: + except Exception, e: + gajim.log.debug(str(e)) pass - + def _music_track_changed(self, unused_listener, music_track_info): accounts = gajim.connections.keys() if music_track_info is None:

1 0

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

29 Apr '07

Author: asterix Date: 2007-04-29 23:18:07 +0200 (Sun, 29 Apr 2007) New Revision: 8119 Modified: trunk/src/roster_window.py Log: always open chat window when we di middle click on a contact Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-04-26 20:33:52 UTC (rev 8118) +++ trunk/src/roster_window.py 2007-04-29 21:18:07 UTC (rev 8119) @@ -2872,7 +2872,7 @@ self.tree.get_selection().select_path(path) type_ = model[path][C_TYPE] if type_ in ('agent', 'contact', 'self_contact'): - self.on_roster_treeview_row_activated(widget, path) + self.on_row_activated(widget, path) elif type_ == 'account': account = model[path][C_ACCOUNT].decode('utf-8') if account != 'all':

1 0

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

26 Apr '07

Author: asterix Date: 2007-04-26 22:33:52 +0200 (Thu, 26 Apr 2007) New Revision: 8118 Modified: trunk/src/dialogs.py trunk/src/roster_window.py Log: draw contacts under a blocked group as striked Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-04-26 20:05:06 UTC (rev 8117) +++ trunk/src/dialogs.py 2007-04-26 20:33:52 UTC (rev 8118) @@ -2365,16 +2365,17 @@ gajim.interface.roster.draw_contact(jid, self.account) else: group = deleted_rule['value'] + # needed for draw_group: + if group in gajim.connections[self.account].blocked_groups: + gajim.connections[self.account].blocked_groups.remove(group) + gajim.interface.roster.draw_group(group, self.account) for jid in gajim.contacts.get_jid_list(self.account): contact = gajim.contacts.get_contact_with_highest_priority( self.account, jid) if group in contact.groups: gajim.connections[self.account].send_custom_status(show, msg, contact.jid) - # needed for draw_group: - if group in gajim.connections[self.account].blocked_groups: - gajim.connections[self.account].blocked_groups.remove(group) - gajim.interface.roster.draw_group(group, self.account) + gajim.interface.roster.draw_contact(contact.jid, self.account) def privacy_list_received(self, rules): self.store.clear() Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-04-26 20:05:06 UTC (rev 8117) +++ trunk/src/roster_window.py 2007-04-26 20:33:52 UTC (rev 8118) @@ -562,7 +562,20 @@ if not contact: return name = gobject.markup_escape_text(contact.get_shown_name()) + strike = False if jid in gajim.connections[account].blocked_contacts: + strike = True + else: + groups = contact.groups + if contact.is_observer(): + groups = [_('Observers')] + elif not groups: + groups = [_('General')] + for group in groups: + if group in gajim.connections[account].blocked_groups: + strike = True + break + if strike: name = '<span strikethrough="true">%s</span>' % name nb_connected_contact = 0 @@ -1469,13 +1482,14 @@ if not gajim.connections[account].privacy_rules_supported: continue accounts.append(account) + # needed for draw_group: + gajim.connections[account].blocked_groups.append(group) + self.draw_group(group, account) self.send_status(account, 'offline', msg, to=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) - # needed for draw_group: - gajim.connections[account].blocked_groups.append(group) - self.draw_group(group, account) for account in accounts: gajim.connections[account].set_privacy_list( 'block', gajim.connections[account].blocked_list) @@ -1528,16 +1542,17 @@ if account not in accounts: if gajim.connections[account].privacy_rules_supported: accounts.append(account) + # needed for draw_group: + if group in gajim.connections[account].blocked_groups: + gajim.connections[account].blocked_groups.remove(group) + self.draw_group(group, 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) - # needed for draw_group: - if group in gajim.connections[account].blocked_groups: - gajim.connections[account].blocked_groups.remove(group) - self.draw_group(group, account) + self.draw_contact(contact.jid, account) for account in accounts: gajim.connections[account].set_privacy_list( 'block', gajim.connections[account].new_blocked_list)

1 0

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

26 Apr '07

Author: asterix Date: 2007-04-26 22:05:06 +0200 (Thu, 26 Apr 2007) New Revision: 8117 Modified: trunk/src/dialogs.py Log: unstrike groups when we remove them from blocked contacts window Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-04-26 19:46:47 UTC (rev 8116) +++ trunk/src/dialogs.py 2007-04-26 20:05:06 UTC (rev 8117) @@ -2364,18 +2364,17 @@ gajim.connections[self.account].blocked_contacts.remove(jid) gajim.interface.roster.draw_contact(jid, self.account) else: + group = deleted_rule['value'] 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: + if group 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) + # needed for draw_group: + if group in gajim.connections[self.account].blocked_groups: + gajim.connections[self.account].blocked_groups.remove(group) + gajim.interface.roster.draw_group(group, self.account) def privacy_list_received(self, rules): self.store.clear()

1 0

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

26 Apr '07

Author: asterix Date: 2007-04-26 21:46:47 +0200 (Thu, 26 Apr 2007) New Revision: 8116 Modified: trunk/src/common/zeroconf/connection_zeroconf.py Log: prevent TB with zeroconf and blocked contacts Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2007-04-26 19:46:13 UTC (rev 8115) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2007-04-26 19:46:47 UTC (rev 8116) @@ -58,6 +58,7 @@ self.gpg = None self.is_zeroconf = True self.privacy_rules_supported = False + self.blocked_contacts = [] self.status = '' self.old_show = '' self.priority = 0

1 0

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

26 Apr '07

Author: asterix Date: 2007-04-26 21:46:13 +0200 (Thu, 26 Apr 2007) New Revision: 8115 Modified: trunk/src/roster_window.py Log: draw blocked groups striked Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-04-26 17:06:05 UTC (rev 8114) +++ trunk/src/roster_window.py 2007-04-26 19:46:13 UTC (rev 8115) @@ -392,13 +392,15 @@ accounts = [] else: accounts = [account] - text = group + text = gobject.markup_escape_text(group) + if group in gajim.connections[account].blocked_groups: + text = '<span strikethrough="true">%s</span>' % text if gajim.config.get('show_contacts_number'): nbr_on, nbr_total = gajim.contacts.get_nb_online_total_contacts( accounts = accounts, groups = [group]) text += ' (%s/%s)' % (repr(nbr_on), repr(nbr_total)) model = self.tree.get_model() - model.set_value(iter, 1 , gobject.markup_escape_text(text)) + model.set_value(iter, 1 , text) def add_to_not_in_the_roster(self, account, jid, nick = '', resource = ''): ''' add jid to group "not in the roster", he MUST not be in roster yet, @@ -1462,19 +1464,18 @@ 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 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) - # 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) + # needed for draw_group: + gajim.connections[account].blocked_groups.append(group) + self.draw_group(group, account) for account in accounts: gajim.connections[account].set_privacy_list( 'block', gajim.connections[account].blocked_list) @@ -1533,11 +1534,10 @@ 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) + # needed for draw_group: + if group in gajim.connections[account].blocked_groups: + gajim.connections[account].blocked_groups.remove(group) + self.draw_group(group, account) for account in accounts: gajim.connections[account].set_privacy_list( 'block', gajim.connections[account].new_blocked_list)

1 0

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

26 Apr '07

Author: asterix Date: 2007-04-26 19:06:05 +0200 (Thu, 26 Apr 2007) New Revision: 8114 Modified: trunk/src/conversation_textview.py Log: [thecurse] blacklist of latex commands. fixes #2796 Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2007-04-26 16:46:43 UTC (rev 8113) +++ trunk/src/conversation_textview.py 2007-04-26 17:06:05 UTC (rev 8114) @@ -578,48 +578,70 @@ def latex_to_image(self, str): result = None - + exitcode = 0 + + # some latex commands are really bad + blacklist = ["\\def", "\\let", "\\futurelet", + "\\newcommand", "\\renewcomment", "\\else", "\\fi", "\\write", + "\\input", "\\include", "\\chardef", "\\catcode", "\\makeatletter", + "\\noexpand", "\\toksdef", "\\every", "\\errhelp", "\\errorstopmode", + "\\scrollmode", "\\nonstopmode", "\\batchmode", "\\read", "\\csname", + "\\newhelp", "\\relax", "\\afterground", "\\afterassignment", + "\\expandafter", "\\noexpand", "\\special", "\\command", "\\loop", + "\\repeat", "\\toks", "\\output", "\\line", "\\mathcode", "\\name", + "\\item", "\\section", "\\mbox", "\\DeclareRobustCommand", "\\[", + "\\]"] + 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}" + # filter latex code with bad commands + for word in blacklist: + if word in str: + exitcode = 1 + break - file = open(os.path.join(tmpfile + ".tex"), "w+") - file.write(texstr) - file.flush() - file.close() + if exitcode == 0: + random.seed() + tmpfile = os.path.join(gettempdir(), "gajimtex_" + random.randint(0, + 100).__str__()) - p = Popen(['latex', '--interaction=nonstopmode', tmpfile + '.tex'], cwd=gettempdir()) - exitcode = p.wait() + # 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()) + 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() - + 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)'''

1 0

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

26 Apr '07

Author: asterix Date: 2007-04-26 18:46:43 +0200 (Thu, 26 Apr 2007) New Revision: 8113 Modified: trunk/src/dialogs.py Log: copyright set to 2007. fixes #3131 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2007-04-26 16:44:00 UTC (rev 8112) +++ trunk/src/dialogs.py 2007-04-26 16:46:43 UTC (rev 8113) @@ -716,7 +716,7 @@ dlg.set_transient_for(gajim.interface.roster.window) dlg.set_name('Gajim') dlg.set_version(gajim.version) - s = u'Copyright © 2003-2006 Gajim Team' + s = u'Copyright © 2003-2007 Gajim Team' dlg.set_copyright(s) copying_file_path = None if os.path.isfile(os.path.join(gajim.defs.docdir, 'COPYING')):

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