Commits July 2007

commits@gajim.org

8 participants
98 discussions

[commit-gajim] r8416 - trunk/src
by roidelapluie＠gajim.org 20 Jul '07

20 Jul '07

Author: roidelapluie Date: 2007-07-20 02:05:38 +0200 (Fri, 20 Jul 2007) New Revision: 8416 Modified: trunk/src/features_window.py Log: Beter handling of LaTeX in feature window Modified: trunk/src/features_window.py =================================================================== --- trunk/src/features_window.py 2007-07-19 23:36:25 UTC (rev 8415) +++ trunk/src/features_window.py 2007-07-20 00:05:38 UTC (rev 8416) @@ -87,7 +87,7 @@ _('Requires compilation of the idle module from Gajim sources.')), _('LaTeX'): (self.latex_available, _('Transform LaTeX espressions between $$ $$.'), - _('Requires latex, dvips and imagemagick. You have to set \'use_latex\' to True in the Advanced Configuration Editor.'), + _('Requires texlive-latex-base, dvips and imagemagick. You have to set \'use_latex\' to True in the Advanced Configuration Editor.'), _('Feature not available under Windows.')), } @@ -244,17 +244,26 @@ 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'], + try: + p = Popen(['latex', '--interaction=nonstopmode', tmpfile + '.tex'], cwd=gettempdir()) exitcode = p.wait() + except: + exitcode = 1 if exitcode == 0: - p = Popen(['convert', tmpfile + '.ps', tmpfile + '.png'], - cwd=gettempdir()) - exitcode = p.wait() + try: + p = Popen(['dvips', '-E', '-o', tmpfile + '.ps', tmpfile + '.dvi'], + cwd=gettempdir()) + exitcode = p.wait() + except: + exitcode = 1 + if exitcode == 0: + try: + p = Popen(['convert', tmpfile + '.ps', tmpfile + '.png'], + cwd=gettempdir()) + exitcode = p.wait() + except: + exitcode = 1 extensions = [".tex", ".log", ".aux", ".dvi", ".ps", ".png"] for ext in extensions: try:

1 0

[commit-gajim] r8415 - trunk/src
by roidelapluie＠gajim.org 19 Jul '07

19 Jul '07

Author: roidelapluie Date: 2007-07-20 01:36:25 +0200 (Fri, 20 Jul 2007) New Revision: 8415 Modified: trunk/src/features_window.py Log: [darkwod and I] Add LaTeX in features window. Fix #2796. Modified: trunk/src/features_window.py =================================================================== --- trunk/src/features_window.py 2007-07-19 18:44:50 UTC (rev 8414) +++ trunk/src/features_window.py 2007-07-19 23:36:25 UTC (rev 8415) @@ -22,6 +22,10 @@ from common import gajim from common import helpers +import random +from tempfile import gettempdir +from subprocess import Popen + class FeaturesWindow: '''Class for features window''' @@ -81,6 +85,10 @@ _('Ability to measure idle time, in order to set auto status.'), _('Requires compilation of the idle module from Gajim sources.'), _('Requires compilation of the idle module from Gajim sources.')), + _('LaTeX'): (self.latex_available, + _('Transform LaTeX espressions between $$ $$.'), + _('Requires latex, dvips and imagemagick. You have to set \'use_latex\' to True in the Advanced Configuration Editor.'), + _('Feature not available under Windows.')), } # name, supported @@ -214,3 +222,45 @@ def idle_available(self): from common import sleepy return sleepy.SUPPORTED + + def latex_available(self): + '''check is latex is available and if it can create a picture.''' + + if os.name == 'nt': + return False + + exitcode = 0 + random.seed() + tmpfile = os.path.join(gettempdir(), "gajimtex_" + \ + random.randint(0,100).__str__()) + + # build latex string + texstr = '\\documentclass[12pt]{article}\\usepackage[dvips]{graphicx}' + texstr += '\\usepackage{amsmath}\\usepackage{amssymb}\\pagestyle{empty}' + texstr += '\\begin{document}\\begin{large}\\begin{gather*}test' + 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", ".png"] + for ext in extensions: + try: + os.remove(tmpfile + ext) + except Exception: + pass + if exitcode == 0: + return True + return False \ No newline at end of file

1 0

[commit-gajim] r8414 - trunk/src
by roidelapluie＠gajim.org 19 Jul '07

19 Jul '07

Author: roidelapluie Date: 2007-07-19 20:44:50 +0200 (Thu, 19 Jul 2007) New Revision: 8414 Modified: trunk/src/groupchat_control.py Log: Fix a stupid bug Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-07-19 18:37:11 UTC (rev 8413) +++ trunk/src/groupchat_control.py 2007-07-19 18:44:50 UTC (rev 8414) @@ -905,7 +905,7 @@ if show in ('offline', 'error'): if statusCode: - if statuscode '307' in statusCode: + if '307' in statusCode: if actor is None: # do not print 'kicked by None' s = _('%(nick)s has been kicked: %(reason)s') % { 'nick': nick,

1 0

[commit-gajim] r8413 - trunk/src
by roidelapluie＠gajim.org 19 Jul '07

19 Jul '07

Author: roidelapluie Date: 2007-07-19 20:37:11 +0200 (Thu, 19 Jul 2007) New Revision: 8413 Modified: trunk/src/groupchat_control.py Log: Fix a bug with my last commits Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-07-19 13:12:11 UTC (rev 8412) +++ trunk/src/groupchat_control.py 2007-07-19 18:37:11 UTC (rev 8413) @@ -889,94 +889,96 @@ # statusCode # http://www.xmpp.org/extensions/xep-0045.html#registrar-statuscodes-init - if '100' in statusCode: - # Can be a message (see handle_event_gc_config_change in gajim.py) - self.print_conversation(\ - _('Any occupant is allowed to see your full JID')) - if '170' in statusCode: - # Can be a message (see handle_event_gc_config_change in gajim.py) - self.print_conversation(_('Room logging is enabled')) - if '201' in statusCode: - self.print_conversation(_('A new room has been created')) - if '210' in statusCode: - self.print_conversation(\ - _('The server has assigned or modified your roomnick')) + if statusCode: + if '100' in statusCode: + # Can be a message (see handle_event_gc_config_change in gajim.py) + self.print_conversation(\ + _('Any occupant is allowed to see your full JID')) + if '170' in statusCode: + # Can be a message (see handle_event_gc_config_change in gajim.py) + self.print_conversation(_('Room logging is enabled')) + if '201' in statusCode: + self.print_conversation(_('A new room has been created')) + if '210' in statusCode: + self.print_conversation(\ + _('The server has assigned or modified your roomnick')) if show in ('offline', 'error'): - if '307' in statusCode: - if actor is None: # do not print 'kicked by None' - s = _('%(nick)s has been kicked: %(reason)s') % { + if statusCode: + if statuscode '307' in statusCode: + if actor is None: # do not print 'kicked by None' + s = _('%(nick)s has been kicked: %(reason)s') % { + 'nick': nick, + 'reason': reason } + else: + s = _('%(nick)s has been kicked by %(who)s: %(reason)s') % { + 'nick': nick, + 'who': actor, + 'reason': reason } + self.print_conversation(s, 'info', tim = tim) + elif '301' in statusCode: + if actor is None: # do not print 'banned by None' + s = _('%(nick)s has been banned: %(reason)s') % { + 'nick': nick, + 'reason': reason } + else: + s = _('%(nick)s has been banned by %(who)s: %(reason)s') % { + 'nick': nick, + 'who': actor, + 'reason': reason } + self.print_conversation(s, 'info', tim = tim) + elif '303' in statusCode: # Someone changed his or her nick + if new_nick == self.nick: # We changed our nick + s = _('You are now known as %s') % new_nick + else: + s = _('%s is now known as %s') % (nick, new_nick) + # We add new nick to muc roster here, so we don't see + # that "new_nick has joined the room" when he just changed nick. + # add_contact_to_roster will be called a second time + # after that, but that doesn't hurt + self.add_contact_to_roster(new_nick, show, role, affiliation, + status, jid) + if nick in self.attention_list: + self.attention_list.remove(nick) + # keep nickname color + if nick in self.gc_custom_colors: + self.gc_custom_colors[new_nick] = self.gc_custom_colors[nick] + # rename vcard / avatar + puny_jid = helpers.sanitize_filename(self.room_jid) + puny_nick = helpers.sanitize_filename(nick) + puny_new_nick = helpers.sanitize_filename(new_nick) + old_path = os.path.join(gajim.VCARD_PATH, puny_jid, puny_nick) + new_path = os.path.join(gajim.VCARD_PATH, puny_jid, puny_new_nick) + files = {old_path: new_path} + path = os.path.join(gajim.AVATAR_PATH, puny_jid) + # possible extensions + for ext in ('.png', '.jpeg', '_notif_size_bw.png', + '_notif_size_colored.png'): + files[os.path.join(path, puny_nick + ext)] = \ + os.path.join(path, puny_new_nick + ext) + for old_file in files: + if os.path.exists(old_file): + if os.path.exists(files[old_file]): + # Windows require this + os.remove(files[old_file]) + os.rename(old_file, files[old_file]) + self.print_conversation(s, 'info', tim) + elif '321' in statusCode: + s = _('%(nick)s has been removed from the room (%(reason)s)') % { + 'nick': nick, 'reason': _('affiliation changed') } + self.print_conversation(s, 'info', tim = tim) + elif '322' in statusCode: + s = _('%(nick)s has been removed from the room (%(reason)s)') % { 'nick': nick, - 'reason': reason } - else: - s = _('%(nick)s has been kicked by %(who)s: %(reason)s') % { + 'reason': _('room configuration changed to members-only') } + self.print_conversation(s, 'info', tim = tim) + elif '332' in statusCode: + s = _('%(nick)s has been removed from the room (%(reason)s)') % { 'nick': nick, - 'who': actor, - 'reason': reason } - self.print_conversation(s, 'info', tim = tim) - elif '301' in statusCode: - if actor is None: # do not print 'banned by None' - s = _('%(nick)s has been banned: %(reason)s') % { - 'nick': nick, - 'reason': reason } - else: - s = _('%(nick)s has been banned by %(who)s: %(reason)s') % { - 'nick': nick, - 'who': actor, - 'reason': reason } - self.print_conversation(s, 'info', tim = tim) - elif '303' in statusCode: # Someone changed his or her nick - if new_nick == self.nick: # We changed our nick - s = _('You are now known as %s') % new_nick - else: - s = _('%s is now known as %s') % (nick, new_nick) - # We add new nick to muc roster here, so we don't see - # that "new_nick has joined the room" when he just changed nick. - # add_contact_to_roster will be called a second time - # after that, but that doesn't hurt - self.add_contact_to_roster(new_nick, show, role, affiliation, - status, jid) - if nick in self.attention_list: - self.attention_list.remove(nick) - # keep nickname color - if nick in self.gc_custom_colors: - self.gc_custom_colors[new_nick] = self.gc_custom_colors[nick] - # rename vcard / avatar - puny_jid = helpers.sanitize_filename(self.room_jid) - puny_nick = helpers.sanitize_filename(nick) - puny_new_nick = helpers.sanitize_filename(new_nick) - old_path = os.path.join(gajim.VCARD_PATH, puny_jid, puny_nick) - new_path = os.path.join(gajim.VCARD_PATH, puny_jid, puny_new_nick) - files = {old_path: new_path} - path = os.path.join(gajim.AVATAR_PATH, puny_jid) - # possible extensions - for ext in ('.png', '.jpeg', '_notif_size_bw.png', - '_notif_size_colored.png'): - files[os.path.join(path, puny_nick + ext)] = \ - os.path.join(path, puny_new_nick + ext) - for old_file in files: - if os.path.exists(old_file): - if os.path.exists(files[old_file]): - # Windows require this - os.remove(files[old_file]) - os.rename(old_file, files[old_file]) - self.print_conversation(s, 'info', tim) - elif '321' in statusCode: - s = _('%(nick)s has been removed from the room (%(reason)s)') % { - 'nick': nick, 'reason': _('affiliation changed') } - self.print_conversation(s, 'info', tim = tim) - elif '322' in statusCode: - s = _('%(nick)s has been removed from the room (%(reason)s)') % { - 'nick': nick, - 'reason': _('room configuration changed to members-only') } - self.print_conversation(s, 'info', tim = tim) - elif '332' in statusCode: - s = _('%(nick)s has been removed from the room (%(reason)s)') % { - 'nick': nick, - 'reason': _('system shutdown') } - self.print_conversation(s, 'info', tim = tim) - elif 'destroyed' in statusCode: # Room has been destroyed - self.print_conversation(reason, 'info', tim) + 'reason': _('system shutdown') } + self.print_conversation(s, 'info', tim = tim) + elif 'destroyed' in statusCode: # Room has been destroyed + self.print_conversation(reason, 'info', tim) if len(gajim.events.get_events(self.account, fake_jid)) == 0: self.remove_contact(nick) @@ -984,7 +986,8 @@ c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) c.show = show c.status = status - if nick == self.nick and '303' not in statusCode: # We became offline + if nick == self.nick and (not statusCode or \ + '303' not in statusCode): # We became offline self.got_disconnected() contact = gajim.contacts.\ get_contact_with_highest_priority(self.account, self.room_jid) @@ -998,7 +1001,7 @@ iter = self.add_contact_to_roster(nick, show, role, affiliation, status, jid) newly_created = True - if '201' in statusCode: # We just created the room + if statusCode and '201' in statusCode: # We just created the room gajim.connections[self.account].request_gc_config(self.room_jid) else: gc_c = gajim.contacts.get_gc_contact(self.account, self.room_jid, @@ -1051,7 +1054,8 @@ if self.parent_win: self.parent_win.redraw_tab(self) if (time.time() - self.room_creation) > 30 and \ - nick != self.nick and '303' not in statusCode: + nick != self.nick and (not statusCode or \ + '303' not in statusCode): st = '' print_status = None for bookmark in gajim.connections[self.account].bookmarks: @@ -1069,7 +1073,7 @@ if nick in self.attention_list: self.attention_list.remove(nick) if show == 'offline' and print_status in ('all', 'in_and_out') and \ - '307' not in statusCode: + (not statusCode or '307' not in statusCode): st = _('%s has left') % nick_jid if reason: st += ' [%s]' % reason

1 0

[commit-gajim] r8412 - trunk/src
by roidelapluie＠gajim.org 19 Jul '07

19 Jul '07

Author: roidelapluie Date: 2007-07-19 15:12:11 +0200 (Thu, 19 Jul 2007) New Revision: 8412 Modified: trunk/src/gajim.py trunk/src/groupchat_control.py Log: Beter handling of status code in MUC. see #3270. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-07-19 11:54:15 UTC (rev 8411) +++ trunk/src/gajim.py 2007-07-19 13:12:11 UTC (rev 8412) @@ -1225,6 +1225,9 @@ return changes = [] + if '100' in statusCode: + # Can be a presence (see chg_contact_status in groupchat_contol.py) + changes.append(_('Any occupant is allowed to see your full JID')) if '102' in statusCode: changes.append(_('Room now shows unavailable member')) if '103' in statusCode: @@ -1233,6 +1236,7 @@ changes.append(\ _('A non-privacy-related room configuration change has occurred')) if '170' in statusCode: + # Can be a presence (see chg_contact_status in groupchat_contol.py) changes.append(_('Room logging is now enabled')) if '171' in statusCode: changes.append(_('Room logging is now disabled')) Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-07-19 11:54:15 UTC (rev 8411) +++ trunk/src/groupchat_control.py 2007-07-19 13:12:11 UTC (rev 8412) @@ -890,9 +890,11 @@ # statusCode # http://www.xmpp.org/extensions/xep-0045.html#registrar-statuscodes-init if '100' in statusCode: + # Can be a message (see handle_event_gc_config_change in gajim.py) self.print_conversation(\ _('Any occupant is allowed to see your full JID')) if '170' in statusCode: + # Can be a message (see handle_event_gc_config_change in gajim.py) self.print_conversation(_('Room logging is enabled')) if '201' in statusCode: self.print_conversation(_('A new room has been created')) @@ -959,6 +961,20 @@ os.remove(files[old_file]) os.rename(old_file, files[old_file]) self.print_conversation(s, 'info', tim) + elif '321' in statusCode: + s = _('%(nick)s has been removed from the room (%(reason)s)') % { + 'nick': nick, 'reason': _('affiliation changed') } + self.print_conversation(s, 'info', tim = tim) + elif '322' in statusCode: + s = _('%(nick)s has been removed from the room (%(reason)s)') % { + 'nick': nick, + 'reason': _('room configuration changed to members-only') } + self.print_conversation(s, 'info', tim = tim) + elif '332' in statusCode: + s = _('%(nick)s has been removed from the room (%(reason)s)') % { + 'nick': nick, + 'reason': _('system shutdown') } + self.print_conversation(s, 'info', tim = tim) elif 'destroyed' in statusCode: # Room has been destroyed self.print_conversation(reason, 'info', tim)

1 0

[commit-gajim] r8411 - trunk/src
by roidelapluie＠gajim.org 19 Jul '07

19 Jul '07

Author: roidelapluie Date: 2007-07-19 13:54:15 +0200 (Thu, 19 Jul 2007) New Revision: 8411 Modified: trunk/src/gajim.py trunk/src/groupchat_control.py Log: Beter handling of status codes. See #3270. http://www.xmpp.org/extensions/xep-0045.html#registrar-statuscodes-init Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-07-19 10:06:59 UTC (rev 8410) +++ trunk/src/gajim.py 2007-07-19 11:54:15 UTC (rev 8411) @@ -1213,6 +1213,7 @@ def handle_event_gc_config_change(self, account, array): #('GC_CONFIG_CHANGE', account, (jid, statusCode)) statuscode is a list # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify + # http://www.xmpp.org/extensions/xep-0045.html#registrar-statuscodes-init jid = array[0] statusCode = array[1] @@ -1224,6 +1225,13 @@ return changes = [] + if '102' in statusCode: + changes.append(_('Room now shows unavailable member')) + if '103' in statusCode: + changes.append(_('room now does not show unavailable members')) + if '104' in statusCode: + changes.append(\ + _('A non-privacy-related room configuration change has occurred')) if '170' in statusCode: changes.append(_('Room logging is now enabled')) if '171' in statusCode: @@ -1234,8 +1242,6 @@ changes.append(_('Room is now semi-anonymous')) if '174' in statusCode: changes.append(_('Room is now fully-anonymous')) - if '104' in statusCode: - changes.append(_('Room configuration has changed')) for change in changes: gc_control.print_conversation(change) Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-07-19 10:06:59 UTC (rev 8410) +++ trunk/src/groupchat_control.py 2007-07-19 11:54:15 UTC (rev 8411) @@ -886,8 +886,20 @@ affiliation = 'none' fake_jid = self.room_jid + '/' + nick newly_created = False + + # statusCode + # http://www.xmpp.org/extensions/xep-0045.html#registrar-statuscodes-init + if '100' in statusCode: + self.print_conversation(\ + _('Any occupant is allowed to see your full JID')) if '170' in statusCode: self.print_conversation(_('Room logging is enabled')) + if '201' in statusCode: + self.print_conversation(_('A new room has been created')) + if '210' in statusCode: + self.print_conversation(\ + _('The server has assigned or modified your roomnick')) + if show in ('offline', 'error'): if '307' in statusCode: if actor is None: # do not print 'kicked by None'

1 0

[commit-gajim] r8410 - in trunk/src: . common common/xmpp
by roidelapluie＠gajim.org 19 Jul '07

19 Jul '07

Author: roidelapluie Date: 2007-07-19 12:06:59 +0200 (Thu, 19 Jul 2007) New Revision: 8410 Modified: trunk/src/common/connection_handlers.py trunk/src/common/xmpp/protocol.py trunk/src/gajim.py trunk/src/groupchat_control.py Log: Add notification of Configuration Changes in MUC. See #3270. http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-07-19 09:27:33 UTC (rev 8409) +++ trunk/src/common/connection_handlers.py 2007-07-19 10:06:59 UTC (rev 8410) @@ -1529,6 +1529,12 @@ self.dispatch('GC_SUBJECT', (frm, subject, msgtxt, has_timestamp)) else: if not msg.getTag('body'): #no <body> + # It could be a config change. See + # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify + if msg.getTag('x'): + statusCode = msg.getStatusCode() + if statusCode != []: + self.dispatch('GC_CONFIG_CHANGE', (jid, statusCode)) return # Ignore message from room in which we are not if not self.last_history_line.has_key(jid): Modified: trunk/src/common/xmpp/protocol.py =================================================================== --- trunk/src/common/xmpp/protocol.py 2007-07-19 09:27:33 UTC (rev 8409) +++ trunk/src/common/xmpp/protocol.py 2007-07-19 10:06:59 UTC (rev 8410) @@ -449,6 +449,14 @@ th=self.getThread() if th: m.setThread(th) return m + def getStatusCode(self): + """Returns the status code of the message (for groupchat config + change)""" + attrs = [] + for xtag in self.getTags('x'): + for child in xtag.getTags('status'): + attrs.append(child.getAttr('code')) + return attrs class Presence(Protocol): """ XMPP Presence object.""" Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-07-19 09:27:33 UTC (rev 8409) +++ trunk/src/gajim.py 2007-07-19 10:06:59 UTC (rev 8410) @@ -1210,6 +1210,36 @@ self.instances[account]['gc_config'][room_jid] = \ config.GroupchatConfigWindow(account, room_jid, array[1]) + def handle_event_gc_config_change(self, account, array): + #('GC_CONFIG_CHANGE', account, (jid, statusCode)) statuscode is a list + # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify + jid = array[0] + statusCode = array[1] + + gc_control = self.msg_win_mgr.get_control(jid, account) + if not gc_control and \ + jid in self.minimized_controls[account]: + gc_control = self.minimized_controls[account][jid] + if not gc_control: + return + + changes = [] + if '170' in statusCode: + changes.append(_('Room logging is now enabled')) + if '171' in statusCode: + changes.append(_('Room logging is now disabled')) + if '172' in statusCode: + changes.append(_('Room is now non-anonymous')) + if '173' in statusCode: + changes.append(_('Room is now semi-anonymous')) + if '174' in statusCode: + changes.append(_('Room is now fully-anonymous')) + if '104' in statusCode: + changes.append(_('Room configuration has changed')) + + for change in changes: + gc_control.print_conversation(change) + def handle_event_gc_affiliation(self, account, array): #('GC_AFFILIATION', account, (room_jid, affiliation, list)) list is list room_jid = array[0] @@ -2113,6 +2143,7 @@ 'GC_MSG': self.handle_event_gc_msg, 'GC_SUBJECT': self.handle_event_gc_subject, 'GC_CONFIG': self.handle_event_gc_config, + 'GC_CONFIG_CHANGE': self.handle_event_gc_config_change, 'GC_INVITATION': self.handle_event_gc_invitation, 'GC_AFFILIATION': self.handle_event_gc_affiliation, 'GC_PASSWORD_REQUIRED': self.handle_event_gc_password_required, Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-07-19 09:27:33 UTC (rev 8409) +++ trunk/src/groupchat_control.py 2007-07-19 10:06:59 UTC (rev 8410) @@ -887,7 +887,7 @@ fake_jid = self.room_jid + '/' + nick newly_created = False if '170' in statusCode: - self.print_conversation(_('Room logging is enabled'), 'info') + self.print_conversation(_('Room logging is enabled')) if show in ('offline', 'error'): if '307' in statusCode: if actor is None: # do not print 'kicked by None'

1 0

[commit-gajim] r8409 - in trunk/src: . common common/xmpp
by roidelapluie＠gajim.org 19 Jul '07

19 Jul '07

Author: roidelapluie Date: 2007-07-19 11:27:33 +0200 (Thu, 19 Jul 2007) New Revision: 8409 Modified: trunk/src/common/connection_handlers.py trunk/src/common/xmpp/protocol.py trunk/src/groupchat_control.py Log: XEP-0045: Multi-User Chat * Handle Multiple status code in MUC. * Warn the user if room logging is enabled ( http://www.xmpp.org/extensions/xep-0045.html#enter-logging ). Fix #3270. Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-07-18 12:11:48 UTC (rev 8408) +++ trunk/src/common/connection_handlers.py 2007-07-19 09:27:33 UTC (rev 8409) @@ -1741,7 +1741,7 @@ jid = destroy.getAttr('jid') if jid: reason += '\n' + _('You can join this room instead: %s') % jid - statusCode = 'destroyed' + statusCode = ['destroyed'] else: reason = prs.getReason() statusCode = prs.getStatusCode() Modified: trunk/src/common/xmpp/protocol.py =================================================================== --- trunk/src/common/xmpp/protocol.py 2007-07-18 12:11:48 UTC (rev 8408) +++ trunk/src/common/xmpp/protocol.py 2007-07-19 09:27:33 UTC (rev 8409) @@ -509,7 +509,11 @@ return self._muc_getSubTagDataAttr('actor','jid')[1] def getStatusCode(self): """Returns the status code of the presence (for groupchat)""" - return self._muc_getItemAttr('status','code') + attrs = [] + for xtag in self.getTags('x'): + for child in xtag.getTags('status'): + attrs.append(child.getAttr('code')) + return attrs class Iq(Protocol): """ XMPP Iq object - get/set dialog mechanism. """ Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-07-18 12:11:48 UTC (rev 8408) +++ trunk/src/groupchat_control.py 2007-07-19 09:27:33 UTC (rev 8409) @@ -886,8 +886,10 @@ affiliation = 'none' fake_jid = self.room_jid + '/' + nick newly_created = False + if '170' in statusCode: + self.print_conversation(_('Room logging is enabled'), 'info') if show in ('offline', 'error'): - if statusCode == '307': + if '307' in statusCode: if actor is None: # do not print 'kicked by None' s = _('%(nick)s has been kicked: %(reason)s') % { 'nick': nick, @@ -898,7 +900,7 @@ 'who': actor, 'reason': reason } self.print_conversation(s, 'info', tim = tim) - elif statusCode == '301': + elif '301' in statusCode: if actor is None: # do not print 'banned by None' s = _('%(nick)s has been banned: %(reason)s') % { 'nick': nick, @@ -909,7 +911,7 @@ 'who': actor, 'reason': reason } self.print_conversation(s, 'info', tim = tim) - elif statusCode == '303': # Someone changed his or her nick + elif '303' in statusCode: # Someone changed his or her nick if new_nick == self.nick: # We changed our nick s = _('You are now known as %s') % new_nick else: @@ -945,7 +947,7 @@ os.remove(files[old_file]) os.rename(old_file, files[old_file]) self.print_conversation(s, 'info', tim) - elif statusCode == 'destroyed': # Room has been destroyed + elif 'destroyed' in statusCode: # Room has been destroyed self.print_conversation(reason, 'info', tim) if len(gajim.events.get_events(self.account, fake_jid)) == 0: @@ -954,7 +956,7 @@ c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) c.show = show c.status = status - if nick == self.nick and statusCode != '303': # We became offline + if nick == self.nick and '303' not in statusCode: # We became offline self.got_disconnected() contact = gajim.contacts.\ get_contact_with_highest_priority(self.account, self.room_jid) @@ -968,7 +970,7 @@ iter = self.add_contact_to_roster(nick, show, role, affiliation, status, jid) newly_created = True - if statusCode == '201': # We just created the room + if '201' in statusCode: # We just created the room gajim.connections[self.account].request_gc_config(self.room_jid) else: gc_c = gajim.contacts.get_gc_contact(self.account, self.room_jid, @@ -1021,7 +1023,7 @@ if self.parent_win: self.parent_win.redraw_tab(self) if (time.time() - self.room_creation) > 30 and \ - nick != self.nick and statusCode != '303': + nick != self.nick and '303' not in statusCode: st = '' print_status = None for bookmark in gajim.connections[self.account].bookmarks: @@ -1039,7 +1041,7 @@ if nick in self.attention_list: self.attention_list.remove(nick) if show == 'offline' and print_status in ('all', 'in_and_out') and \ - statusCode != '307': + '307' not in statusCode: st = _('%s has left') % nick_jid if reason: st += ' [%s]' % reason

1 0

[commit-gajim] r8408 - trunk/src
by roidelapluie＠gajim.org 18 Jul '07

18 Jul '07

Author: roidelapluie Date: 2007-07-18 14:11:48 +0200 (Wed, 18 Jul 2007) New Revision: 8408 Modified: trunk/src/remote_control.py Log: Fix a name error in [8407] Modified: trunk/src/remote_control.py =================================================================== --- trunk/src/remote_control.py 2007-07-18 12:07:21 UTC (rev 8407) +++ trunk/src/remote_control.py 2007-07-18 12:11:48 UTC (rev 8408) @@ -228,7 +228,7 @@ def _get_account_for_groupchat(self, account, room_jid): '''get the account which is connected to groupchat (if not given) or check if the given account is connected to the groupchat''' - correct_account = None + connected_account = None accounts = gajim.contacts.get_accounts() # if there is only one account in roster, take it as default # if user did not ask for account

1 0

[commit-gajim] r8407 - trunk/src
by roidelapluie＠gajim.org 18 Jul '07

18 Jul '07

Author: roidelapluie Date: 2007-07-18 14:07:21 +0200 (Wed, 18 Jul 2007) New Revision: 8407 Modified: trunk/src/gajim-remote.py trunk/src/remote_control.py Log: Add send_groupchat_message to gajim-remote. Fix #2447. Modified: trunk/src/gajim-remote.py =================================================================== --- trunk/src/gajim-remote.py 2007-07-17 08:26:14 UTC (rev 8406) +++ trunk/src/gajim-remote.py 2007-07-18 12:07:21 UTC (rev 8407) @@ -137,6 +137,15 @@ 'using this account'), False), ] ], + 'send_groupchat_message':[ + _('Sends new message to a groupchat you\'ve joined.'), + [ + ('room_jid', _('JID of the room that will receive the message'), True), + (_('message'), _('message contents'), True), + (_('account'), _('if specified, the message will be sent ' + 'using this account'), False), + ] + ], 'contact_info': [ _('Gets detailed info on a contact'), [ Modified: trunk/src/remote_control.py =================================================================== --- trunk/src/remote_control.py 2007-07-17 08:26:14 UTC (rev 8406) +++ trunk/src/remote_control.py 2007-07-18 12:07:21 UTC (rev 8407) @@ -225,6 +225,31 @@ return connected_account, contact + def _get_account_for_groupchat(self, account, room_jid): + '''get the account which is connected to groupchat (if not given) + or check if the given account is connected to the groupchat''' + correct_account = None + accounts = gajim.contacts.get_accounts() + # if there is only one account in roster, take it as default + # if user did not ask for account + if not account and len(accounts) == 1: + account = accounts[0] + if account: + if gajim.connections[account].connected > 1 and \ + room_jid in gajim.gc_connected[account] and \ + gajim.gc_connected[account][room_jid]: + # account and groupchat are connected + connected_account = account + else: + for account in accounts: + if gajim.connections[account].connected > 1 and \ + room_jid in gajim.gc_connected[account] and \ + gajim.gc_connected[account][room_jid]: + # account and groupchat are connected + connected_account = account + break + return connected_account + @dbus.service.method(INTERFACE, in_signature='sss', out_signature='b') def send_file(self, file_path, jid, account): '''send file, located at 'file_path' to 'jid', using account @@ -271,6 +296,19 @@ jid = self._get_real_jid(jid, account) return self._send_message(jid, message, keyID, account, type, subject) + @dbus.service.method(INTERFACE, in_signature='sss', out_signature='b') + def send_groupchat_message(self, room_jid, message, account): + '''Send 'message' to groupchat 'room_jid', + using account (optional) 'account'.''' + if not room_jid or not message: + return DBUS_BOOLEAN(False) + connected_account = self._get_account_for_groupchat(account, room_jid) + if connected_account: + connection = gajim.connections[connected_account] + connection.send_gc_message(room_jid, message) + return DBUS_BOOLEAN(True) + return DBUS_BOOLEAN(False) + @dbus.service.method(INTERFACE, in_signature='ss', out_signature='b') def open_chat(self, jid, account): '''Shows the tabbed window for new message to 'jid', using account

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2007