Commits July 2009

commits@gajim.org

5 participants
169 discussions

gajim: stringprep nick and room jid in manage bookmark dialog.
by Yann Leboulanger 29 Jul '09

29 Jul '09

changeset 1f69c674067a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1f69c674067a description: stringprep nick and room jid in manage bookmark dialog. diffstat: src/config.py | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diffs (50 lines): diff -r f12e0ad917d6 -r 1f69c674067a src/config.py --- a/src/config.py Wed Jul 29 12:09:02 2009 +0200 +++ b/src/config.py Wed Jul 29 12:56:59 2009 +0200 @@ -2906,20 +2906,42 @@ def on_nick_entry_changed(self, widget): (model, iter_) = self.selection.get_selected() if iter_: - model[iter_][6] = self.nick_entry.get_text() + nick = self.nick_entry.get_text().decode('utf-8') + try: + nick = helpers.parse_resource(nick) + except helpers.InvalidFormat, e: + dialogs.ErrorDialog(_('Invalid nickname'), + _('Character not allowed')) + self.nick_entry.set_text(model[iter_][6]) + return True + model[iter_][6] = nick def on_server_entry_changed(self, widget): (model, iter_) = self.selection.get_selected() if iter_: room_jid = self.room_entry.get_text().decode('utf-8').strip() + '@' + \ self.server_entry.get_text().decode('utf-8').strip() - model[iter_][2] = room_jid.replace(' ', '') + try: + room_jid = helpers.parse_resource(room_jid) + except helpers.InvalidFormat, e: + dialogs.ErrorDialog(_('Invalid server'), + _('Character not allowed')) + self.server_entry.set_text(model[iter_][2].split('@')[1]) + return True + model[iter_][2] = room_jid def on_room_entry_changed(self, widget): (model, iter_) = self.selection.get_selected() if iter_: - room_jid = self.room_entry.get_text().decode('utf-8') + '@' + \ - self.server_entry.get_text().decode('utf-8') + room_jid = self.room_entry.get_text().decode('utf-8').strip() + '@' + \ + self.server_entry.get_text().decode('utf-8').strip() + try: + room_jid = helpers.parse_resource(room_jid) + except helpers.InvalidFormat, e: + dialogs.ErrorDialog(_('Invalid room'), + _('Character not allowed')) + self.room_entry.set_text(model[iter_][2].split('@')[0]) + return True model[iter_][2] = room_jid def on_pass_entry_changed(self, widget):

1 0

gajim: remove old FIXME, don't crash when we receive badly encod...
by Yann Leboulanger 29 Jul '09

29 Jul '09

changeset f12e0ad917d6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f12e0ad917d6 description: remove old FIXME, don't crash when we receive badly encoded char via zeroconf. Fixes #5178 diffstat: src/common/zeroconf/zeroconf_avahi.py | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diffs (25 lines): diff -r 4950d58d2dd5 -r f12e0ad917d6 src/common/zeroconf/zeroconf_avahi.py --- a/src/common/zeroconf/zeroconf_avahi.py Tue Jul 28 23:13:34 2009 +0200 +++ b/src/common/zeroconf/zeroconf_avahi.py Wed Jul 29 12:09:02 2009 +0200 @@ -124,11 +124,7 @@ for els in txt_array: key, val = '', None for c in els: - #FIXME: remove when outdated, this is for avahi < 0.6.14 - if c < 0 or c > 255: - c = '.' - else: - c = chr(c) + c = chr(c) if val is None: if c == '=': val = '' @@ -138,7 +134,7 @@ val += c if val is None: # missing '=' val = '' - txt_dict[key] = val.decode('utf-8') + txt_dict[key] = val.decode('utf-8', 'ignore') return txt_dict def service_resolved_callback(self, interface, protocol, name, stype, domain,

1 0

gajim: better file transfer error handling. Fixes #5064
by Yann Leboulanger 28 Jul '09

28 Jul '09

changeset 4950d58d2dd5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4950d58d2dd5 description: better file transfer error handling. Fixes #5064 diffstat: src/common/socks5.py | 14 ++++++++++++-- src/filetransfers_window.py | 3 +-- src/gajim.py | 7 +++++-- src/roster_window.py | 7 ++++++- 4 files changed, 24 insertions(+), 7 deletions(-) diffs (85 lines): diff -r e872bdb60df2 -r 4950d58d2dd5 src/common/socks5.py --- a/src/common/socks5.py Tue Jul 28 17:04:57 2009 +0200 +++ b/src/common/socks5.py Tue Jul 28 23:13:34 2009 +0200 @@ -489,7 +489,12 @@ return None fd = None if self.remaining_buff != '': - fd = self.get_fd() + try: + fd = self.get_fd() + except IOError, e: + self.disconnect(False) + self.file_props['error'] = -6 # file system error + return 0 fd.write(self.remaining_buff) lenn = len(self.remaining_buff) current_time = self.idlequeue.current_time() @@ -505,7 +510,12 @@ self.file_props['completed'] = True return 0 else: - fd = self.get_fd() + try: + fd = self.get_fd() + except IOError, e: + self.disconnect(False) + self.file_props['error'] = -6 # file system error + return 0 try: buff = self._recv(MAX_BUFF_LEN) except Exception: diff -r e872bdb60df2 -r 4950d58d2dd5 src/filetransfers_window.py --- a/src/filetransfers_window.py Tue Jul 28 17:04:57 2009 +0200 +++ b/src/filetransfers_window.py Tue Jul 28 23:13:34 2009 +0200 @@ -228,8 +228,7 @@ sectext += '\n\t' + _('Recipient: %s') % jid if error_msg: sectext += '\n\t' + _('Error message: %s') % error_msg - dialogs.ErrorDialog(_('File transfer stopped by the contact at the other ' - 'end'), sectext) + dialogs.ErrorDialog(_('File transfer stopped'), sectext) self.tree.get_selection().unselect_all() def show_file_send_request(self, account, contact): diff -r e872bdb60df2 -r 4950d58d2dd5 src/gajim.py --- a/src/gajim.py Tue Jul 28 17:04:57 2009 +0200 +++ b/src/gajim.py Tue Jul 28 23:13:34 2009 +0200 @@ -1768,7 +1768,10 @@ if gajim.config.get('notify_on_file_complete'): ft.show_completed(jid, file_props) elif file_props['error'] == -1: - ft.show_stopped(jid, file_props) + ft.show_stopped(jid, file_props, + error_msg=_('Remote contact stopped transfer')) + elif file_props['error'] == -6: + ft.show_stopped(jid, file_props, error_msg=_('Error opening file')) return msg_type = '' @@ -1777,7 +1780,7 @@ 'notify_on_file_complete'): msg_type = 'file-completed' event_type = _('File Transfer Completed') - elif file_props['error'] == -1: + elif file_props['error'] in (-1, -6): msg_type = 'file-stopped' event_type = _('File Transfer Stopped') diff -r e872bdb60df2 -r 4950d58d2dd5 src/roster_window.py --- a/src/roster_window.py Tue Jul 28 17:04:57 2009 +0200 +++ b/src/roster_window.py Tue Jul 28 23:13:34 2009 +0200 @@ -1838,7 +1838,12 @@ gajim.events.remove_events(account, jid, event) return True elif event.type_ in ('file-error', 'file-stopped'): - ft.show_stopped(jid, data) + msg_error = '' + if data['error'] == -1: + msg_err = _('Remote contact stopped transfer') + elif data['error'] == -6: + msg_err = _('Error opening file') + ft.show_stopped(jid, data, error_msg=msg_err) gajim.events.remove_events(account, jid, event) return True elif event.type_ == 'file-completed':

1 0

gajim: always build emoticons menu with 16x16 images. Fixes #3125
by Yann Leboulanger 28 Jul '09

28 Jul '09

changeset e872bdb60df2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e872bdb60df2 description: always build emoticons menu with 16x16 images. Fixes #3125 diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r c3f3423c5920 -r e872bdb60df2 src/gajim.py --- a/src/gajim.py Fri Jul 24 16:17:49 2009 +0200 +++ b/src/gajim.py Tue Jul 28 17:04:57 2009 +0200 @@ -2713,7 +2713,7 @@ if emot_file.endswith('.gif'): pix = gtk.gdk.PixbufAnimation(emot_file) else: - pix = gtk.gdk.pixbuf_new_from_file(emot_file) + pix = gtk.gdk.pixbuf_new_from_file_at_size(emot_file, 16, 16) self.emoticons_images.append((emot, pix)) self.emoticons[emot.upper()] = emot_file del emoticons

1 0

gajim: fix showing whiteboard when clicking on popup window
by Yann Leboulanger 27 Jul '09

27 Jul '09

changeset 94d7e72fe32d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=94d7e72fe32d description: fix showing whiteboard when clicking on popup window diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 9a6f65613775 -r 94d7e72fe32d src/gajim.py --- a/src/gajim.py Mon Jul 27 15:55:02 2009 +0200 +++ b/src/gajim.py Mon Jul 27 15:57:33 2009 +0200 @@ -2577,7 +2577,7 @@ elif type_ == 'whiteboard-incoming': event = gajim.events.get_first_event(account, jid, type_) peerjid, sid = event.parameters - session = gajim.connections[account].getJingleSession(peerjid, sid) + self.show_whiteboard_dialog(account, peerjid, sid) gajim.events.remove_events(account, jid, event) if w: w.set_active_tab(ctrl)

1 0

gajim: allow to draw more than one object
by Yann Leboulanger 27 Jul '09

27 Jul '09

changeset 9a6f65613775 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9a6f65613775 description: allow to draw more than one object diffstat: src/common/jingle.py | 1 - src/whiteboardwidget.py | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diffs (23 lines): diff -r 56adcdbb0d7c -r 9a6f65613775 src/common/jingle.py --- a/src/common/jingle.py Mon Jul 27 15:42:07 2009 +0200 +++ b/src/common/jingle.py Mon Jul 27 15:55:02 2009 +0200 @@ -356,7 +356,6 @@ callback(stanza, content, error, action) def __editCB(self, stanza, content, error, action): - new_edits = None new_edits = content.getTags('new') if new_edits is not None: diff -r 56adcdbb0d7c -r 9a6f65613775 src/whiteboardwidget.py --- a/src/whiteboardwidget.py Mon Jul 27 15:42:07 2009 +0200 +++ b/src/whiteboardwidget.py Mon Jul 27 15:55:02 2009 +0200 @@ -144,7 +144,7 @@ if self.recieving[x]['type'] == 'element': self.image.add_recieved(x, self.recieving) - self.recieving = None + self.recieving = {} class SVGObject(): ''' A class to store the svg document and make changes to it.'''

1 0

gajim: fix drawing in both way
by Yann Leboulanger 27 Jul '09

27 Jul '09

changeset 56adcdbb0d7c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=56adcdbb0d7c description: fix drawing in both way diffstat: src/chat_control.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (10 lines): diff -r 739943ff6a8e -r 56adcdbb0d7c src/chat_control.py --- a/src/chat_control.py Mon Jul 27 15:37:18 2009 +0200 +++ b/src/chat_control.py Mon Jul 27 15:42:07 2009 +0200 @@ -2763,5 +2763,6 @@ self.whiteboard.hbox.show_all() except: pass # TODO: Fix problem with groupchat + session.control = self # vim: se ts=3:

1 0

gajim: refactor whiteboard dialog showing
by Yann Leboulanger 27 Jul '09

27 Jul '09

changeset 739943ff6a8e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=739943ff6a8e description: refactor whiteboard dialog showing diffstat: src/gajim.py | 95 ++++++++++++++++------------------------------- src/roster_window.py | 5 ++ 2 files changed, 38 insertions(+), 62 deletions(-) diffs (134 lines): diff -r 5dc42736b6d7 -r 739943ff6a8e src/gajim.py --- a/src/gajim.py Mon Jul 27 04:59:18 2009 -0700 +++ b/src/gajim.py Mon Jul 27 15:37:18 2009 +0200 @@ -2237,6 +2237,38 @@ _('PEP node %(node)s was not removed: %(message)s') % { 'node': data[1], 'message': data[2]}) + def show_whiteboard_dialog(self, account, peerjid, sid): + def on_ok(): + session = gajim.connections[account].getJingleSession(peerjid, sid) + session.approveSession() + jid = gajim.get_jid_without_resource(peerjid) + for _jid in [peerjid, jid]: + ctrl = self.msg_win_mgr.get_control(_jid, account) + if ctrl: + break + if not ctrl: + # create it + self.new_chat_from_jid(account, jid) + ctrl = self.msg_win_mgr.get_control(jid, account) + session = session.contents[('initiator', 'xhtml')] + ctrl.draw_whiteboard(session) + + def on_cancel(): + session.declineSession() + + contact = gajim.contacts.get_first_contact_from_jid(account, + gajim.get_jid_without_resource(peerjid)) + if contact: + name = contact.get_shown_name() + else: + name = peerjid + pritext = _('Incoming Whiteboard') + sectext = _('%(name)s (%(jid)s) wants to start a whiteboard with ' + 'you. Do you want to accept?') % {'name': name, 'jid': peerjid} + dialog = dialogs.NonModalConfirmationDialog(pritext, sectext=sectext, + on_response_ok=on_ok, on_response_cancel=on_cancel) + dialog.popup() + def handle_event_jingle_incoming(self, account, data): # ('JINGLE_INCOMING', account, (peer jid, sid, # tuple-of-contents==(type, data...))) @@ -2251,38 +2283,7 @@ if 'WHITEBOARD' in content_types: # a whiteboard session... if helpers.allow_popup_window(account): - session = gajim.connections[account].getJingleSession(peerjid, sid) - def on_ok(): - session = gajim.connections[account].getJingleSession(peerjid, - sid) - session.approveSession() - for _jid in [peerjid, jid]: - ctrl = self.msg_win_mgr.get_control(_jid, account) - if ctrl: - break - if not ctrl: - # create it - self.new_chat_from_jid(account, jid) - ctrl = self.msg_win_mgr.get_control(jid, account) - session = session.contents[('initiator', 'xhtml')] - session.control = ctrl - ctrl.draw_whiteboard(session) - - def on_cancel(): - session.declineSession() - - contact = gajim.contacts.get_first_contact_from_jid(account, jid) - if contact: - name = contact.get_shown_name() - else: - name = jid - pritext = _('Incoming Whiteboard') - sectext = _('%(name)s (%(jid)s) wants to start a whiteboard with ' - 'you. Do you want to accept?') % {'name': name, 'jid': jid} - dialog = dialogs.NonModalConfirmationDialog(pritext, - sectext=sectext, on_response_ok=on_ok, - on_response_cancel=on_cancel) - dialog.popup() + self.show_whiteboard_dialog(account, peerjid, sid) self.add_event(account, peerjid, 'whiteboard-incoming', (peerjid, sid)) @@ -2577,36 +2578,6 @@ event = gajim.events.get_first_event(account, jid, type_) peerjid, sid = event.parameters session = gajim.connections[account].getJingleSession(peerjid, sid) - def on_ok(): - session = gajim.connections[account].getJingleSession(peerjid, sid) - session.approveSession() - jid = gajim.get_jid_without_resource(peerjid) - for _jid in [peerjid, jid]: - ctrl = self.msg_win_mgr.get_control(_jid, account) - if ctrl: - break - if not ctrl: - # create it - self.new_chat_from_jid(account, jid) - ctrl = self.msg_win_mgr.get_control(jid, account) - session = session.contents[('initiator', 'xhtml')] - ctrl.draw_whiteboard(session) - - def on_cancel(): - session.declineSession() - - contact = gajim.contacts.get_first_contact_from_jid(account, - gajim.get_jid_without_resource(peerjid)) - if contact: - name = contact.get_shown_name() - else: - name = peerjid - pritext = _('Incoming Whiteboard') - sectext = _('%(name)s (%(jid)s) wants to start a whiteboard with ' - 'you. Do you want to accept?') % {'name': name, 'jid': peerjid} - dialog = dialogs.NonModalConfirmationDialog(pritext, sectext=sectext, - on_response_ok=on_ok, on_response_cancel=on_cancel) - dialog.popup() gajim.events.remove_events(account, jid, event) if w: w.set_active_tab(ctrl) diff -r 5dc42736b6d7 -r 739943ff6a8e src/roster_window.py --- a/src/roster_window.py Mon Jul 27 04:59:18 2009 -0700 +++ b/src/roster_window.py Mon Jul 27 15:37:18 2009 +0200 @@ -1835,6 +1835,11 @@ gajim.interface.show_unsubscribed_dialog(account, data) gajim.events.remove_events(account, jid, event) return True + elif event.type_ == 'whiteboard-incoming': + peerjid, sid = data + gajim.interface.show_whiteboard_dialog(account, peerjid, sid) + gajim.events.remove_events(account, jid, event) + return True return False ################################################################################

1 0

gajim: New method works until second item is added. Again with c...
by Ummu 27 Jul '09

27 Jul '09

changeset 5dc42736b6d7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5dc42736b6d7 description: New method works until second item is added. Again with chatcontrol disappearing. Jingle Problem? New method also adds to whiteboard, node, and self.items correctly. diffstat: src/common/jingle.py | 17 +++-- src/whiteboardwidget.py | 144 +++++++++++++++++++----------------------------- 2 files changed, 67 insertions(+), 94 deletions(-) diffs (217 lines): diff -r d9eaf9d3d532 -r 5dc42736b6d7 src/common/jingle.py --- a/src/common/jingle.py Fri Jul 24 18:52:13 2009 -0700 +++ b/src/common/jingle.py Mon Jul 27 04:59:18 2009 -0700 @@ -356,15 +356,18 @@ callback(stanza, content, error, action) def __editCB(self, stanza, content, error, action): + new_edits = None new_edits = content.getTags('new') - # Process new elements - for new in new_edits: - if new.getAttr('type') == 'element': - self.control.whiteboard.recieve_element(new) - elif new.getAttr('type') == 'attr': - self.control.whiteboard.recieve_attr(new) - + if new_edits is not None: + # Process new elements + for new in new_edits: + if new.getAttr('type') == 'element': + self.control.whiteboard.recieve_element(new) + elif new.getAttr('type') == 'attr': + self.control.whiteboard.recieve_attr(new) + self.control.whiteboard.apply_new() + def __sessionAcceptCB(self, stanza, content, error, action): log.debug('session accepted') self.session.connection.dispatch('WHITEBOARD_ACCEPTED', diff -r d9eaf9d3d532 -r 5dc42736b6d7 src/whiteboardwidget.py --- a/src/whiteboardwidget.py Fri Jul 24 18:52:13 2009 -0700 +++ b/src/whiteboardwidget.py Mon Jul 27 04:59:18 2009 -0700 @@ -40,8 +40,7 @@ self.item_temp_coords = (0,0) self.item_data = None - # Recieving item storage, format is - # {parent rid: [element, [child, child,]} + # Will be {ID: {type:'element', data:[node, goocanvas]}, ID2: {}} instance self.recieving = {} def on_brush_button_clicked(self, widget): @@ -125,71 +124,27 @@ self.item_temp = None def recieve_element(self, element): - self.recieving[element.getAttr('rid')] = [element,[]] - + node = self.image.g.addChild(name=element.getAttr('name')) + self.image.g.addChild(node=node) + self.recieving[element.getAttr('rid')] = {'type':'element', + 'data':[node], + 'children':[]} def recieve_attr(self, element): - self.recieving[element.getAttr('parent')][1].append(element) + node = self.recieving[element.getAttr('parent')]['data'][0] + node.setAttr(element.getAttr('name'), element.getAttr('chdata')) + + self.recieving[element.getAttr('rid')] = {'type':'attr', + 'data':element.getAttr('name'), + 'parent':node} + self.recieving[element.getAttr('parent')]['children'].append(element.getAttr('rid')) - # put the element up regardless if it is completed or not - self.image.del_item(element.getAttr('parent')) - - if self.recieving[element.getAttr('parent')][0].getAttr('name') == 'path': - d = None - line_width = None - - for x in self.recieving[element.getAttr('parent')][1]: - if x.getAttr('name') == 'd': - d = x.getAttr('chdata') - elif x.getAttr('name') == 'stroke-width': - line_width = x.getAttr('chdata') - # TODO: the other attributes - if d is None: - d = 'M 0,0' - if line_width is None: - line_width = self.line_width - - goocanvas.Path(parent=self.root, data=d, - line_width=int(line_width)) - - if self.recieving[element.getAttr('parent')][0].getAttr('name') == 'ellipse': - cx = None - cy = None - rx = None - ry = None - line_width = None - - for x in self.recieving[element.getAttr('parent')][1]: - if x.getAttr('name') == 'cx': - cx = float(x.getAttr('chdata')) - elif x.getAttr('name') == 'cy': - cy = float(x.getAttr('chdata')) - elif x.getAttr('name') == 'rx': - rx = float(x.getAttr('chdata')) - elif x.getAttr('name') == 'ry': - ry = float(x.getAttr('chdata')) - elif x.getAttr('name') == 'stroke-width': - line_width = int(x.getAttr('chdata')) - # TODO: the other attributes - if cx is None: - cx = 0 - if cy is None: - cy = 0 - if ry is None: - ry = 0 - if rx is None: - rx = 0 - if line_width is None: - line_width = self.line_width - - goocanvas.Ellipse(parent=self.root, - center_x=cx, - center_y=cy, - radius_x=rx, - radius_y=ry, - stroke_color='black', - line_width=int(line_width)) - + def apply_new(self): + for x in self.recieving.keys(): + if self.recieving[x]['type'] == 'element': + self.image.add_recieved(x, self.recieving) + + self.recieving = None class SVGObject(): ''' A class to store the svg document and make changes to it.''' @@ -213,36 +168,52 @@ self.g.setAttr('fill', 'none') self.g.setAttr('stroke-linecap', 'round') - def add_path(self, data, line_width, send = True, node = None): + def add_path(self, data, line_width): ''' adds the path to the items listing, both minidom node and goocanvas object in a tuple ''' goocanvas_obj = goocanvas.Path(parent=self.root, data=data, line_width=line_width) - if send: - node = self.g.addChild(name='path') - node.setAttr('d', data) - node.setAttr('stroke-width', str(line_width)) - node.setAttr('stroke', 'black') - self.g.addChild(node=node) + node = self.g.addChild(name='path') + node.setAttr('d', data) + node.setAttr('stroke-width', str(line_width)) + node.setAttr('stroke', 'black') + self.g.addChild(node=node) - rids = self.session.generate_rids(4) - self.items[rids[0]] = {'type':'element', 'data':[node, goocanvas_obj], 'children':rids[1:]} - self.items[rids[1]] = {'type':'attr', 'data':'d', 'parent':node} - self.items[rids[2]] = {'type':'attr', 'data':'stroke-width', 'parent':node} - self.items[rids[3]] = {'type':'attr', 'data':'stroke', 'parent':node} + rids = self.session.generate_rids(4) + self.items[rids[0]] = {'type':'element', 'data':[node, goocanvas_obj], 'children':rids[1:]} + self.items[rids[1]] = {'type':'attr', 'data':'d', 'parent':node} + self.items[rids[2]] = {'type':'attr', 'data':'stroke-width', 'parent':node} + self.items[rids[3]] = {'type':'attr', 'data':'stroke', 'parent':node} - self.session.send_items(self.items, rids) - else: - rids = self.session.generate_rids(4) - self.items[rids[0]] = {'type':'element', 'data':[node, goocanvas_obj], 'children':rids[1:]} - self.items[rids[1]] = {'type':'attr', 'data':'d', 'parent':node} - self.items[rids[2]] = {'type':'attr', 'data':'stroke-width', 'parent':node} - self.items[rids[3]] = {'type':'attr', 'data':'stroke', 'parent':node} + self.session.send_items(self.items, rids) + def add_recieved(self, parent_rid, new_items): + ''' adds the path to the items listing, both minidom node and goocanvas + object in a tuple ''' + node = new_items[parent_rid]['data'][0] - def add_ellipse(self, cx, cy, rx, ry, line_width, send = True): + self.items[parent_rid] = new_items[parent_rid] + for x in new_items[parent_rid]['children']: + self.items[x] = new_items[x] + + if node.getName() == 'path': + goocanvas_obj = goocanvas.Path(parent=self.root, data=node.getAttr('d'), + line_width=int(node.getAttr('stroke-width'))) + + if node.getName() == 'ellipse': + goocanvas_obj = goocanvas.Ellipse(parent=self.root, + center_x=float(node.getAttr('cx')), + center_y=float(node.getAttr('cy')), + radius_x=float(node.getAttr('rx')), + radius_y=float(node.getAttr('ry')), + stroke_color=node.getAttr('stroke'), + line_width=float(node.getAttr('stroke-width'))) + + self.items[parent_rid]['data'].append(goocanvas_obj) + + def add_ellipse(self, cx, cy, rx, ry, line_width): ''' adds the ellipse to the items listing, both minidom node and goocanvas object in a tuple ''' @@ -272,9 +243,8 @@ self.items[rids[5]] = {'type':'attr', 'data':'stroke-width', 'parent':node} self.items[rids[6]] = {'type':'attr', 'data':'stroke', 'parent':node} - if send: - self.session.send_items(self.items, rids) - + self.session.send_items(self.items, rids) + def print_xml(self): file = open('whiteboardtest.svg','w') file.writelines(str(self.svg))

1 0

gajim: Merge default branch changes to osx_newbuildsys branch.
by Jonathan Schleifer 25 Jul '09

25 Jul '09

changeset 1d657136f338 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1d657136f338 description: Merge default branch changes to osx_newbuildsys branch. diffstat: src/common/connection_handlers.py | 2 + src/common/zeroconf/zeroconf_avahi.py | 141 ++++++++++++++++++++-------------- src/dialogs.py | 123 ++++++++++++++++-------------- src/groupchat_control.py | 8 +- src/roster_window.py | 15 ++- 5 files changed, 165 insertions(+), 124 deletions(-) diffs (truncated from 683 to 300 lines): diff -r cb42499016b1 -r 1d657136f338 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Jul 22 00:15:39 2009 +0200 +++ b/src/common/connection_handlers.py Sat Jul 25 17:57:53 2009 +0200 @@ -1820,6 +1820,8 @@ exchange_items_list = {} jid_from = helpers.get_full_jid_from_iq(msg) items_list = msg.getTag('x').getChildren() + if not items_list: + return action = items_list[0].getAttr('action') if action == None: action = 'add' diff -r cb42499016b1 -r 1d657136f338 src/common/zeroconf/zeroconf_avahi.py --- a/src/common/zeroconf/zeroconf_avahi.py Wed Jul 22 00:15:39 2009 +0200 +++ b/src/common/zeroconf/zeroconf_avahi.py Sat Jul 25 17:57:53 2009 +0200 @@ -17,7 +17,8 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -from common import gajim +import logging +log = logging.getLogger('gajim.c.z.zeroconf_avahi') try: import dbus.glib @@ -62,27 +63,32 @@ pass def error_callback1(self, err): - gajim.log.debug('Error while resolving: ' + str(err)) + log.debug('Error while resolving: ' + str(err)) def error_callback(self, err): - gajim.log.debug(str(err)) + log.debug(str(err)) # timeouts are non-critical if str(err) != 'Timeout reached': self.disconnect() self.disconnected_CB() - def new_service_callback(self, interface, protocol, name, stype, domain, flags): - gajim.log.debug('Found service %s in domain %s on %i.%i.' % (name, domain, interface, protocol)) + def new_service_callback(self, interface, protocol, name, stype, domain, + flags): + log.debug('Found service %s in domain %s on %i.%i.' % (name, domain, + interface, protocol)) if not self.connected: return # synchronous resolving - self.server.ResolveService( int(interface), int(protocol), name, stype, \ - domain, self.avahi.PROTO_UNSPEC, dbus.UInt32(0), \ - reply_handler=self.service_resolved_callback, error_handler=self.error_callback1) + self.server.ResolveService( int(interface), int(protocol), name, stype, + domain, self.avahi.PROTO_UNSPEC, dbus.UInt32(0), + reply_handler=self.service_resolved_callback, + error_handler=self.error_callback1) - def remove_service_callback(self, interface, protocol, name, stype, domain, flags): - gajim.log.debug('Service %s in domain %s on %i.%i disappeared.' % (name, domain, interface, protocol)) + def remove_service_callback(self, interface, protocol, name, stype, domain, + flags): + log.debug('Service %s in domain %s on %i.%i disappeared.' % (name, + domain, interface, protocol)) if not self.connected: return if name != self.name: @@ -100,14 +106,17 @@ object_path = self.server.ServiceBrowserNew(interface, protocol, \ stype, domain, dbus.UInt32(0)) - self.service_browser = dbus.Interface(self.bus.get_object(self.avahi.DBUS_NAME, \ - object_path) , self.avahi.DBUS_INTERFACE_SERVICE_BROWSER) - self.service_browser.connect_to_signal('ItemNew', self.new_service_callback) - self.service_browser.connect_to_signal('ItemRemove', self.remove_service_callback) + self.service_browser = dbus.Interface(self.bus.get_object( + self.avahi.DBUS_NAME, object_path), + self.avahi.DBUS_INTERFACE_SERVICE_BROWSER) + self.service_browser.connect_to_signal('ItemNew', + self.new_service_callback) + self.service_browser.connect_to_signal('ItemRemove', + self.remove_service_callback) self.service_browser.connect_to_signal('Failure', self.error_callback) def new_domain_callback(self,interface, protocol, domain, flags): - if domain != "local": + if domain != 'local': self.browse_domain(interface, protocol, domain) def txt_array_to_dict(self, txt_array): @@ -132,11 +141,12 @@ txt_dict[key] = val.decode('utf-8') return txt_dict - def service_resolved_callback(self, interface, protocol, name, stype, domain, host, aprotocol, address, port, txt, flags): - gajim.log.debug('Service data for service %s in domain %s on %i.%i:' - % (name, domain, interface, protocol)) - gajim.log.debug('Host %s (%s), port %i, TXT data: %s' % (host, address, port, - self.txt_array_to_dict(txt))) + def service_resolved_callback(self, interface, protocol, name, stype, domain, + host, aprotocol, address, port, txt, flags): + log.debug('Service data for service %s in domain %s on %i.%i:' + % (name, domain, interface, protocol)) + log.debug('Host %s (%s), port %i, TXT data: %s' % (host, address, + port, self.txt_array_to_dict(txt))) if not self.connected: return bare_name = name @@ -145,37 +155,40 @@ # we don't want to see ourselves in the list if name != self.name: - self.contacts[name] = (name, domain, interface, protocol, host, address, port, - bare_name, txt) + self.contacts[name] = (name, domain, interface, protocol, host, + address, port, bare_name, txt) self.new_serviceCB(name) else: # remember data # In case this is not our own record but of another # gajim instance on the same machine, # it will be used when we get a new name. - self.invalid_self_contact[name] = (name, domain, interface, protocol, host, address, port, bare_name, txt) + self.invalid_self_contact[name] = (name, domain, interface, protocol, + host, address, port, bare_name, txt) # different handler when resolving all contacts - def service_resolved_all_callback(self, interface, protocol, name, stype, domain, host, aprotocol, address, port, txt, flags): + def service_resolved_all_callback(self, interface, protocol, name, stype, + domain, host, aprotocol, address, port, txt, flags): if not self.connected: return bare_name = name if name.find('@') == -1: name = name + '@' + name - self.contacts[name] = (name, domain, interface, protocol, host, address, port, bare_name, txt) + self.contacts[name] = (name, domain, interface, protocol, host, address, + port, bare_name, txt) def service_added_callback(self): - gajim.log.debug('Service successfully added') + log.debug('Service successfully added') def service_committed_callback(self): - gajim.log.debug('Service successfully committed') + log.debug('Service successfully committed') def service_updated_callback(self): - gajim.log.debug('Service successfully updated') + log.debug('Service successfully updated') def service_add_fail_callback(self, err): - gajim.log.debug('Error while adding service. %s' % str(err)) + log.debug('Error while adding service. %s' % str(err)) if 'Local name collision' in str(err): alternative_name = self.server.GetAlternativeServiceName(self.username) self.name_conflictCB(alternative_name) @@ -184,26 +197,26 @@ self.disconnect() def server_state_changed_callback(self, state, error): - gajim.log.debug('server state changed to %s' % state) + log.debug('server state changed to %s' % state) if state == self.avahi.SERVER_RUNNING: self.create_service() elif state in (self.avahi.SERVER_COLLISION, - self.avahi.SERVER_REGISTERING): + self.avahi.SERVER_REGISTERING): self.disconnect() self.entrygroup.Reset() elif state == self.avahi.CLIENT_FAILURE: # does it ever go here? - gajim.log.debug('CLIENT FAILURE') + log.debug('CLIENT FAILURE') def entrygroup_state_changed_callback(self, state, error): # the name is already present, so recreate if state == self.avahi.ENTRY_GROUP_COLLISION: - gajim.log.debug('zeroconf.py: local name collision') + log.debug('zeroconf.py: local name collision') self.service_add_fail_callback('Local name collision') elif state == self.avahi.ENTRY_GROUP_FAILURE: self.disconnect() self.entrygroup.Reset() - gajim.log.debug('zeroconf.py: ENTRY_GROUP_FAILURE reached(that' + log.debug('zeroconf.py: ENTRY_GROUP_FAILURE reached(that' ' should not happen)') # make zeroconf-valid names @@ -228,12 +241,15 @@ try: if not self.entrygroup: # create an EntryGroup for publishing - self.entrygroup = dbus.Interface(self.bus.get_object(self.avahi.DBUS_NAME, self.server.EntryGroupNew()), self.avahi.DBUS_INTERFACE_ENTRY_GROUP) - self.entrygroup.connect_to_signal('StateChanged', self.entrygroup_state_changed_callback) + self.entrygroup = dbus.Interface(self.bus.get_object( + self.avahi.DBUS_NAME, self.server.EntryGroupNew()), + self.avahi.DBUS_INTERFACE_ENTRY_GROUP) + self.entrygroup.connect_to_signal('StateChanged', + self.entrygroup_state_changed_callback) txt = {} - #remove empty keys + # remove empty keys for key,val in self.txt.iteritems(): if val: txt[key] = val @@ -249,7 +265,7 @@ txt['status'] = 'avail' self.txt = txt - gajim.log.debug('Publishing service %s of type %s' % (self.name, + log.debug('Publishing service %s of type %s' % (self.name, self.stype)) self.entrygroup.AddService(self.avahi.IF_UNSPEC, self.avahi.PROTO_UNSPEC, dbus.UInt32(0), self.name, self.stype, '', @@ -263,7 +279,7 @@ return True except dbus.DBusException, e: - gajim.log.debug(str(e)) + log.debug(str(e)) return False def announce(self): @@ -293,38 +309,39 @@ else: return False except dbus.DBusException: - gajim.log.debug("Can't remove service. That should not happen") + log.debug("Can't remove service. That should not happen") def browse_domain(self, interface, protocol, domain): self.new_service_type(interface, protocol, self.stype, domain, '') def avahi_dbus_connect_cb(self, a, connect, disconnect): if connect != "": - gajim.log.debug('Lost connection to avahi-daemon') + log.debug('Lost connection to avahi-daemon') self.disconnect() if self.disconnected_CB: self.disconnected_CB() else: - gajim.log.debug('We are connected to avahi-daemon') + log.debug('We are connected to avahi-daemon') # connect to dbus def connect_dbus(self): try: import dbus except ImportError: - gajim.log.debug('Error: python-dbus needs to be installed. No zeroconf support.') + log.debug('Error: python-dbus needs to be installed. No ' + 'zeroconf support.') return False if self.bus: return True try: self.bus = dbus.SystemBus() self.bus.add_signal_receiver(self.avahi_dbus_connect_cb, - "NameOwnerChanged", "org.freedesktop.DBus", - arg0="org.freedesktop.Avahi") + 'NameOwnerChanged', 'org.freedesktop.DBus', + arg0='org.freedesktop.Avahi') except Exception, e: # System bus is not present self.bus = None - gajim.log.debug(str(e)) + log.debug(str(e)) return False else: return True @@ -337,20 +354,21 @@ import avahi self.avahi = avahi except ImportError: - gajim.log.debug('Error: python-avahi needs to be installed. No zeroconf support.') + log.debug('Error: python-avahi needs to be installed. No ' + 'zeroconf support.') return False if self.server: return True try: - self.server = dbus.Interface(self.bus.get_object(self.avahi.DBUS_NAME, \ - self.avahi.DBUS_PATH_SERVER), self.avahi.DBUS_INTERFACE_SERVER) + self.server = dbus.Interface(self.bus.get_object(self.avahi.DBUS_NAME, + self.avahi.DBUS_PATH_SERVER), self.avahi.DBUS_INTERFACE_SERVER) self.server.connect_to_signal('StateChanged', self.server_state_changed_callback) except Exception, e: # Avahi service is not present self.server = None - gajim.log.debug(str(e)) + log.debug(str(e)) return False else: return True

1 0

← Newer
1
2
3
4
5
6
7
...
17
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2009