Commits June 2009

commits@gajim.org

7 participants
114 discussions

gajim: really execute ad hoc command when clicking on Execute co...
by Yann Leboulanger 05 Jun '09

05 Jun '09

changeset fd021f7d2795 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fd021f7d2795 description: really execute ad hoc command when clicking on Execute command in disco window diffstat: src/adhoc_commands.py | 12 ++++++++---- src/disco.py | 5 +++-- 2 files changed, 11 insertions(+), 6 deletions(-) diffs (57 lines): diff -r 715d6986b745 -r fd021f7d2795 src/adhoc_commands.py --- a/src/adhoc_commands.py Thu Jun 04 22:46:05 2009 +0200 +++ b/src/adhoc_commands.py Fri Jun 05 21:26:23 2009 +0200 @@ -44,7 +44,7 @@ TODO: gtk 2.10 has a special wizard-widget, consider using it...''' - def __init__(self, account, jid): + def __init__(self, account, jid, commandnode=None): '''Create new window.''' # an account object @@ -55,7 +55,7 @@ self.commandlist=None # a list of (commandname, commanddescription) # command's data - self.commandnode = None + self.commandnode = commandnode self.sessionid = None self.dataform = None self.allow_stage3_close = False @@ -78,8 +78,12 @@ self.data_form_widget.show() self.sending_form_stage_vbox.pack_start(self.data_form_widget) - # setting initial stage - self.stage1() + if self.commandnode: + # Execute command + self.stage3() + else: + # setting initial stage + self.stage1() # displaying the window self.xml.signal_autoconnect(self) diff -r 715d6986b745 -r fd021f7d2795 src/disco.py --- a/src/disco.py Thu Jun 04 22:46:05 2009 +0200 +++ b/src/disco.py Fri Jun 05 21:26:23 2009 +0200 @@ -1258,14 +1258,15 @@ self._renderer.set_property('cell-background', bgcolor) self.window.services_treeview.queue_draw() - def on_execute_button_clicked(self, widget = None): + def on_execute_button_clicked(self, widget=None): '''When we want to execute a command: open adhoc command window''' model, iter_ = self.window.services_treeview.get_selection().get_selected() if not iter_: return service = model[iter_][0].decode('utf-8') - adhoc_commands.CommandWindow(self.account, service) + node = model[iter_][1].decode('utf-8') + adhoc_commands.CommandWindow(self.account, service, commandnode=node) def on_register_button_clicked(self, widget = None): '''When we want to register an agent:

1 0

gajim: fix os info / client info / contact time in vcard of grou...
by Yann Leboulanger 04 Jun '09

04 Jun '09

changeset 715d6986b745 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=715d6986b745 description: fix os info / client info / contact time in vcard of groupchat contacts diffstat: src/vcard.py | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diffs (46 lines): diff -r 64b3a5961415 -r 715d6986b745 src/vcard.py --- a/src/vcard.py Thu Jun 04 21:45:46 2009 +0200 +++ b/src/vcard.py Thu Jun 04 22:46:05 2009 +0200 @@ -90,12 +90,16 @@ gc_contact.room_jid, account) if gc_contact.jid and not gc_control.is_anonymous: self.real_jid = gc_contact.jid + self.real_jid_for_vcard = gc_contact.jid if gc_contact.resource: self.real_jid += '/' + gc_contact.resource else: self.real_jid = gc_contact.get_full_jid() + self.real_jid_for_vcard = self.real_jid + self.real_resource = gc_contact.name else: self.real_jid = contact.get_full_jid() + self.real_resource = contact.resource puny_jid = helpers.sanitize_filename(contact.jid) local_avatar_basepath = os.path.join(gajim.AVATAR_PATH, puny_jid) + \ @@ -395,10 +399,9 @@ gobject.idle_add(gajim.connections[self.account].\ request_entity_time, self.contact.jid, self.contact.resource) - - self.os_info = {0: {'resource': self.contact.resource, 'client': '', + self.os_info = {0: {'resource': self.real_resource, 'client': '', 'os': ''}} - self.time_info = {0: {'resource': self.contact.resource, 'time': ''}} + self.time_info = {0: {'resource': self.real_resource, 'time': ''}} i = 1 contact_list = gajim.contacts.get_contacts(self.account, self.contact.jid) if contact_list: @@ -430,11 +433,7 @@ if self.gc_contact: # If we know the real jid, remove the resource from vcard request - if self.gc_contact.jid: - jid = self.gc_contact.jid - else: - jid = self.real_jid - gajim.connections[self.account].request_vcard(jid, + gajim.connections[self.account].request_vcard(self.real_jid_for_vcard, self.gc_contact.get_full_jid()) else: gajim.connections[self.account].request_vcard(self.contact.jid)

1 0

gajim: mark groupchat messages as read when we scroll at the end...
by Yann Leboulanger 04 Jun '09

04 Jun '09

changeset 64b3a5961415 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=64b3a5961415 description: mark groupchat messages as read when we scroll at the end in groupchat window diffstat: src/chat_control.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diffs (16 lines): diff -r d07a07a64f79 -r 64b3a5961415 src/chat_control.py --- a/src/chat_control.py Thu Jun 04 20:48:04 2009 +0200 +++ b/src/chat_control.py Thu Jun 04 21:45:46 2009 +0200 @@ -1022,7 +1022,11 @@ self.parent_win.get_active_control() == self and \ self.parent_win.window.is_active(): # we are at the end - if self.session and self.session.remove_events(types_list): + if self.type_id == message_control.TYPE_GC: + if not gajim.events.remove_events(self.account, jid, + types=types_list): + self.redraw_after_event_removed(jid) + elif self.session and self.session.remove_events(types_list): # There were events to remove self.redraw_after_event_removed(jid)

1 0

gajim: export time when exporting logs. see #5060
by Yann Leboulanger 04 Jun '09

04 Jun '09

changeset d07a07a64f79 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d07a07a64f79 description: export time when exporting logs. see #5060 diffstat: src/history_manager.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 26b20d885e39 -r d07a07a64f79 src/history_manager.py --- a/src/history_manager.py Thu Jun 04 18:26:25 2009 +0200 +++ b/src/history_manager.py Thu Jun 04 20:48:04 2009 +0200 @@ -525,7 +525,7 @@ continue try: - time_ = time.strftime('%x', time.localtime(float(time_))).decode( + time_ = time.strftime('%c', time.localtime(float(time_))).decode( locale.getpreferredencoding()) except ValueError: pass

1 0

gajim: add ossplay to the list of tested soundplayer. Fixes #5061
by Yann Leboulanger 04 Jun '09

04 Jun '09

changeset 26b20d885e39 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=26b20d885e39 description: add ossplay to the list of tested soundplayer. Fixes #5061 diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 403205c854bf -r 26b20d885e39 src/gajim.py --- a/src/gajim.py Thu Jun 04 18:06:50 2009 +0200 +++ b/src/gajim.py Thu Jun 04 18:26:25 2009 +0200 @@ -3463,7 +3463,7 @@ if gajim.config.get('soundplayer') == '': # only on first time Gajim starts - commands = ('aplay', 'play', 'esdplay', 'artsplay') + commands = ('aplay', 'play', 'esdplay', 'artsplay', 'ossplay') for command in commands: if helpers.is_in_path(command): if command == 'aplay':

1 0

gajim: prevent a traceback when we get a groupchat presence from...
by Yann Leboulanger 04 Jun '09

04 Jun '09

changeset 403205c854bf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=403205c854bf description: prevent a traceback when we get a groupchat presence from unknown participant. see #5067 diffstat: src/groupchat_control.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 2b17eef9fb88 -r 403205c854bf src/groupchat_control.py --- a/src/groupchat_control.py Thu Jun 04 17:34:38 2009 +0200 +++ b/src/groupchat_control.py Thu Jun 04 18:06:50 2009 +0200 @@ -1252,6 +1252,9 @@ else: gc_c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) + if not gc_c: + log.error('%s has an iter, but no gc_contact instance') + return # Re-get vcard if avatar has changed # We do that here because we may request it to the real JID if we # knows it. connections.py doesn't know it.

1 0

gajim: prevent traceback when trying to open a second search win...
by Yann Leboulanger 04 Jun '09

04 Jun '09

changeset 2fb08580caf7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2fb08580caf7 description: prevent traceback when trying to open a second search window. Fixes #5073 diffstat: src/disco.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 5f8450bdd974 -r 2fb08580caf7 src/disco.py --- a/src/disco.py Wed Jun 03 22:45:04 2009 +0200 +++ b/src/disco.py Thu Jun 04 17:34:38 2009 +0200 @@ -1242,7 +1242,8 @@ return service = model[iter][0].decode('utf-8') if service in gajim.interface.instances[self.account]['search']: - gajim.interface.instances[self.account]['search'][service].present() + gajim.interface.instances[self.account]['search'][service].window.\ + present() else: gajim.interface.instances[self.account]['search'][service] = \ search_window.SearchWindow(self.account, service)

1 0

gajim: prevent traceback when trying to open a second search win...
by Yann Leboulanger 04 Jun '09

04 Jun '09

changeset 2b17eef9fb88 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2b17eef9fb88 description: prevent traceback when trying to open a second search window. Fixes #5073 diffstat: src/disco.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 0e202c192d22 -r 2b17eef9fb88 src/disco.py --- a/src/disco.py Tue Jun 02 19:35:57 2009 +0200 +++ b/src/disco.py Thu Jun 04 17:34:38 2009 +0200 @@ -1241,7 +1241,8 @@ return service = model[iter_][0].decode('utf-8') if service in gajim.interface.instances[self.account]['search']: - gajim.interface.instances[self.account]['search'][service].present() + gajim.interface.instances[self.account]['search'][service].window.\ + present() else: gajim.interface.instances[self.account]['search'][service] = \ search_window.SearchWindow(self.account, service)

1 0

gajim: changelog for 0.12.2
by Yann Leboulanger 03 Jun '09

03 Jun '09

changeset 5f8450bdd974 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5f8450bdd974 description: changelog for 0.12.2 diffstat: ChangeLog | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diffs (22 lines): diff -r d637e026a98d -r 5f8450bdd974 ChangeLog --- a/ChangeLog Tue Jun 02 19:35:57 2009 +0200 +++ b/ChangeLog Wed Jun 03 22:45:04 2009 +0200 @@ -1,3 +1,18 @@ +Gajim 0.12.2 (XX June 2009) + + * Better keepalive / ping behaviour + * Fix custom port handling + * Improve error messages handling + * Totem support for played music + * Fix SSL with some servers + * Handle XFCE notification-daemon + * Restore old behaviour of click on systray: left click to open events + * Network manager 0.7 support + * Move logs file under windows to $APPDATA/gajim + * Improve Kerberos support + * Many bugfixes here and there + * Add -c option to history_manager + Gajim 0.12.1 (21 December 2008) * Fix filetransfer

1 0

gajim: prevent traceback when writing avatar file to HD fails. F...
by Yann Leboulanger 03 Jun '09

03 Jun '09

changeset 56b40dceadd6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=56b40dceadd6 description: prevent traceback when writing avatar file to HD fails. Fixes #5005X-Hg-Repo: gajim Subject: gajim: clean gpg call when we list keys. Fixes #5043 From: Yann Leboulanger <asterix(a)lagaule.org> changeset dbd1eab40a12 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=dbd1eab40a12 description: clean gpg call when we list keys. Fixes #5043X-Hg-Repo: gajim Subject: gajim: fix disconnection of client_zeroconf. Fixes #5049 From: Yann Leboulanger <asterix(a)lagaule.org> changeset d6e6b0a63083 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d6e6b0a63083 description: fix disconnection of client_zeroconf. Fixes #5049X-Hg-Repo: gajim Subject: gajim: add -c option to history_manager. Fixes #5058 From: Yann Leboulanger <asterix(a)lagaule.org> changeset 32d2f30cdd6f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=32d2f30cdd6f description: add -c option to history_manager. Fixes #5058X-Hg-Repo: gajim Subject: gajim: handle 210 status code in groupchat (Server changed our nickname) From: Yann Leboulanger <asterix(a)lagaule.org> changeset d637e026a98d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d637e026a98d description: handle 210 status code in groupchat (Server changed our nickname) diffstat: src/common/GnuPG.py | 5 ++++- src/common/zeroconf/client_zeroconf.py | 3 ++- src/gajim.py | 18 +++++++++++++++--- src/groupchat_control.py | 5 +++++ src/history_manager.py | 27 ++++++++++++++++++++++++++- 5 files changed, 52 insertions(+), 6 deletions(-) diffs (124 lines): diff -r fc515904b614 -r d637e026a98d src/common/GnuPG.py --- a/src/common/GnuPG.py Tue Jun 02 10:26:45 2009 +0200 +++ b/src/common/GnuPG.py Tue Jun 02 19:35:57 2009 +0200 @@ -194,6 +194,9 @@ output = proc.handles['stdout'].read() proc.handles['stdout'].close() + try: proc.wait() + except IOError: pass + keys = {} lines = output.split('\n') for line in lines: @@ -236,4 +239,4 @@ out = out + "-----END PGP %s-----\n" % type_ return out -# vim: se ts=3: +# vim: set ts=3: diff -r fc515904b614 -r d637e026a98d src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Tue Jun 02 10:26:45 2009 +0200 +++ b/src/common/zeroconf/client_zeroconf.py Tue Jun 02 19:35:57 2009 +0200 @@ -97,8 +97,9 @@ break; P2PClient(sock[0], ipaddr, sock[1][1], self.conn_holder, [], from_jid) - def disconnect(self): + def disconnect(self, message=''): ''' free all resources, we are not listening anymore ''' + log.info('Disconnecting ZeroconfListener: %s' % message) gajim.idlequeue.remove_timeout(self.fd) gajim.idlequeue.unplug_idle(self.fd) self.fd = -1 diff -r fc515904b614 -r d637e026a98d src/gajim.py --- a/src/gajim.py Tue Jun 02 10:26:45 2009 +0200 +++ b/src/gajim.py Tue Jun 02 19:35:57 2009 +0200 @@ -3097,18 +3097,30 @@ typ = 'png' extension = '.png' path_to_original_file = path_to_file + extension - pixbuf.save(path_to_original_file, typ) + try: + pixbuf.save(path_to_original_file, typ) + except Exception, e: + log.error('Error writing avatar file %s: %s' % (path_to_original_file, + str(e))) # Generate and save the resized, color avatar pixbuf = gtkgui_helpers.get_scaled_pixbuf(pixbuf, 'notification') if pixbuf: path_to_normal_file = path_to_file + '_notif_size_colored' + extension - pixbuf.save(path_to_normal_file, 'png') + try: + pixbuf.save(path_to_normal_file, 'png') + except Exception, e: + log.error('Error writing avatar file %s: %s' % \ + (path_to_original_file, str(e))) # Generate and save the resized, black and white avatar bwbuf = gtkgui_helpers.get_scaled_pixbuf( gtkgui_helpers.make_pixbuf_grayscale(pixbuf), 'notification') if bwbuf: path_to_bw_file = path_to_file + '_notif_size_bw' + extension - bwbuf.save(path_to_bw_file, 'png') + try: + bwbuf.save(path_to_bw_file, 'png') + except Exception, e: + log.error('Error writing avatar file %s: %s' % \ + (path_to_original_file, str(e))) def remove_avatar_files(self, jid, puny_nick = None, local = False): '''remove avatar files of a jid''' diff -r fc515904b614 -r d637e026a98d src/groupchat_control.py --- a/src/groupchat_control.py Tue Jun 02 10:26:45 2009 +0200 +++ b/src/groupchat_control.py Tue Jun 02 19:35:57 2009 +0200 @@ -1236,6 +1236,11 @@ else: iter = self.get_contact_iter(nick) if not iter: + if '210' in statusCode: + # Server changed our nick + self.nick = nick + s = _('You are now known as %s') % nick + self.print_conversation(s, 'info', tim=tim) iter = self.add_contact_to_roster(nick, show, role, affiliation, status, jid) newly_created = True diff -r fc515904b614 -r d637e026a98d src/history_manager.py --- a/src/history_manager.py Tue Jun 02 10:26:45 2009 +0200 +++ b/src/history_manager.py Tue Jun 02 19:35:57 2009 +0200 @@ -53,9 +53,34 @@ import time import locale +import getopt from common import i18n + +def parseOpts(): + config_path = None + + try: + shortargs = 'hc:' + longargs = 'help config_path=' + opts = getopt.getopt(sys.argv[1:], shortargs, longargs.split())[0] + except getopt.error, msg: + print str(msg) + print 'for help use --help' + sys.exit(2) + for o, a in opts: + if o in ('-h', '--help'): + print 'history_manager [--help] [--config-path]' + sys.exit() + elif o in ('-c', '--config-path'): + config_path = a + return config_path + +config_path = parseOpts() +del parseOpts + import common.configpaths -common.configpaths.gajimpaths.init() +common.configpaths.gajimpaths.init(config_path) +del config_path common.configpaths.gajimpaths.init_profile() from common import exceptions import dialogs

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2009