Commits April 2010

commits@gajim.org

7 participants
72 discussions

gajim: auto-enable XML logging when opening XML console, and des...
by Yann Leboulanger 01 Apr '10

01 Apr '10

changeset 11949fff1c97 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=11949fff1c97 description: auto-enable XML logging when opening XML console, and destroy window on closing. Fixes #5664 diffstat: data/gui/xml_console_window.ui | 2 +- src/dialogs.py | 37 ++++++++++++++++++------------------- 2 files changed, 19 insertions(+), 20 deletions(-) diffs (105 lines): diff -r 4b99351b01f7 -r 11949fff1c97 data/gui/xml_console_window.ui --- a/data/gui/xml_console_window.ui Thu Apr 01 11:28:21 2010 +0200 +++ b/data/gui/xml_console_window.ui Thu Apr 01 11:40:27 2010 +0200 @@ -6,7 +6,7 @@ <property name="border_width">12</property> <property name="default_width">550</property> <property name="default_height">450</property> - <signal name="delete_event" handler="on_xml_console_window_delete_event"/> + <signal name="destroy" handler="on_xml_console_window_destroy"/> <child> <object class="GtkVBox" id="vbox"> <property name="visible">True</property> diff -r 4b99351b01f7 -r 11949fff1c97 src/dialogs.py --- a/src/dialogs.py Thu Apr 01 11:28:21 2010 +0200 +++ b/src/dialogs.py Thu Apr 01 11:40:27 2010 +0200 @@ -3007,10 +3007,11 @@ self.tagOutIq.set_property('foreground', color) buffer_.create_tag('') # Default tag - self.enabled = False + self.enabled = True + self.xml.get_object('enable_checkbutton').set_active(True) self.input_textview.modify_text( - gtk.STATE_NORMAL, gtk.gdk.color_parse(color)) + gtk.STATE_NORMAL, gtk.gdk.color_parse(color)) if len(gajim.connections) > 1: title = _('XML Console for %s') % self.account @@ -3022,9 +3023,8 @@ self.xml.connect_signals(self) - def on_xml_console_window_delete_event(self, widget, event): - self.window.hide() - return True # do NOT destroy the window + def on_xml_console_window_destroy(self, widget): + del gajim.interface.instances[self.account]['xml_console'] def on_clear_button_clicked(self, widget): buffer_ = self.stanzas_log_textview.get_buffer() @@ -3103,42 +3103,41 @@ type_ = kind # 'incoming' or 'outgoing' if kind == 'incoming': - buffer.insert_with_tags_by_name(end_iter, '\n', - type_) + buffer.insert_with_tags_by_name(end_iter, '\n', type_) elif kind == 'outgoing': - buffer.insert_with_tags_by_name(end_iter, '\n', - type_) + buffer.insert_with_tags_by_name(end_iter, '\n', type_) end_iter = buffer.get_end_iter() - buffer.insert_with_tags_by_name(end_iter, stanza.replace('><', '>\n<') +\ - '\n\n', type_) + buffer.insert_with_tags_by_name(end_iter, stanza.replace('><', '>\n<') \ + + '\n\n', type_) if at_the_end: gobject.idle_add(self.scroll_to_end) def on_send_button_clicked(self, widget): if gajim.connections[self.account].connected <= 1: - #if offline or connecting + # if offline or connecting ErrorDialog(_('Connection not available'), - _('Please make sure you are connected with "%s".') % self.account) + _('Please make sure you are connected with "%s".') % \ + self.account) return begin_iter, end_iter = self.input_tv_buffer.get_bounds() stanza = self.input_tv_buffer.get_text(begin_iter, end_iter).decode( - 'utf-8') + 'utf-8') if stanza: gajim.connections[self.account].send_stanza(stanza) self.input_tv_buffer.set_text('') # we sent ok, clear the textview def on_presence_button_clicked(self, widget): self.input_tv_buffer.set_text( - '<presence><show></show><status></status><priority></priority>' - '</presence>') + '<presence><show></show><status></status><priority></priority>' + '</presence>') def on_iq_button_clicked(self, widget): self.input_tv_buffer.set_text( - '<iq to="" type=""><query xmlns=""></query></iq>') + '<iq to="" type=""><query xmlns=""></query></iq>') def on_message_button_clicked(self, widget): self.input_tv_buffer.set_text( - '<message to="" type=""><body></body></message>') + '<message to="" type=""><body></body></message>') def on_expander_activate(self, widget): if not widget.get_expanded(): # it's the opposite! @@ -3147,7 +3146,7 @@ #Action that can be done with an incoming list of contacts TRANSLATED_ACTION = {'add': _('add'), 'modify': _('modify'), - 'remove': _('remove')} + 'remove': _('remove')} class RosterItemExchangeWindow: """ Windows used when someone send you a exchange contact suggestion

1 0

gajim: check we have a cached vcard before looking in it. Fixes ...
by Yann Leboulanger 01 Apr '10

01 Apr '10

changeset 4b99351b01f7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4b99351b01f7 description: check we have a cached vcard before looking in it. Fixes #5670 diffstat: src/common/helpers.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diffs (20 lines): diff -r 55ecfb639419 -r 4b99351b01f7 src/common/helpers.py --- a/src/common/helpers.py Wed Mar 31 17:05:58 2010 +0300 +++ b/src/common/helpers.py Thu Apr 01 11:28:21 2010 +0200 @@ -1342,11 +1342,11 @@ our_jid = gajim.get_jid_from_account(account) vcard = gajim.connections[account].get_cached_vcard(our_jid) name = '' - if 'N' in vcard: - if 'GIVEN' in vcard['N'] and 'FAMILY' in vcard['N']: - name = vcard['N']['GIVEN'] + ' ' + vcard['N']['FAMILY'] - if not name: - if 'FN' in vcard: + if vcard: + if 'N' in vcard: + if 'GIVEN' in vcard['N'] and 'FAMILY' in vcard['N']: + name = vcard['N']['GIVEN'] + ' ' + vcard['N']['FAMILY'] + if not name and 'FN' in vcard: name = vcard['FN'] nick = gajim.nicks[account] if name and nick:

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 2010