Commits December 2009

commits@gajim.org

8 participants
127 discussions

gajim: latest version is 0.13.10.1. see [775b0b18efb1]
by Yann Leboulanger 30 Dec '09

30 Dec '09

changeset d8f7cd1a1cbb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d8f7cd1a1cbb description: latest version is 0.13.10.1. see [775b0b18efb1] diffstat: configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (10 lines): diff -r 201e3a3594fc -r d8f7cd1a1cbb configure.ac --- a/configure.ac Wed Dec 30 11:27:54 2009 +0100 +++ b/configure.ac Wed Dec 30 13:09:55 2009 +0100 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.13.10.0-dev],[http://trac.gajim.org/],[gajim]) + [0.13.10.1-dev],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h)

1 0

gajim: fix typo in variable name
by Yann Leboulanger 30 Dec '09

30 Dec '09

changeset a27b6042e07d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a27b6042e07d description: fix typo in variable name diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7c3c64bae081 -r a27b6042e07d src/common/connection.py --- a/src/common/connection.py Tue Dec 29 16:02:50 2009 +0100 +++ b/src/common/connection.py Wed Dec 30 11:27:54 2009 +0100 @@ -1791,7 +1791,7 @@ last_date = time.time() - gajim.config.get( 'muc_restore_timeout') * 60 else: - last_time = min(last_date, time.time() - gajim.config.get( + last_date = min(last_date, time.time() - gajim.config.get( 'muc_restore_timeout') * 60) last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(last_date)) t.setTag('history', {'maxstanzas': gajim.config.get(

1 0

gajim: prevent bug when merging metacontacts
by Yann Leboulanger 30 Dec '09

30 Dec '09

changeset 7c3c64bae081 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7c3c64bae081 description: prevent bug when merging metacontacts diffstat: src/roster_window.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 2a7f8d66f29a -r 7c3c64bae081 src/roster_window.py --- a/src/roster_window.py Wed Dec 30 11:10:11 2009 +0100 +++ b/src/roster_window.py Tue Dec 29 16:02:50 2009 +0100 @@ -3954,6 +3954,9 @@ _account = data['account'] _jid = data['jid'] _contact = gajim.contacts.get_first_contact_from_jid(_account, _jid) + if not _contact: + # One of the metacontacts may be not connected. + continue _contact.groups = c_dest.groups[:] gajim.contacts.add_metacontact(account_dest, c_dest.jid,

1 0

gajim: fix typo in variable name
by Yann Leboulanger 30 Dec '09

30 Dec '09

changeset 201e3a3594fc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=201e3a3594fc description: fix typo in variable name diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3317852803dd -r 201e3a3594fc src/common/connection.py --- a/src/common/connection.py Wed Dec 30 11:04:26 2009 +0100 +++ b/src/common/connection.py Wed Dec 30 11:27:54 2009 +0100 @@ -2021,7 +2021,7 @@ last_date = time.time() - gajim.config.get( 'muc_restore_timeout') * 60 else: - last_time = min(last_date, time.time() - gajim.config.get( + last_date = min(last_date, time.time() - gajim.config.get( 'muc_restore_timeout') * 60) last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(last_date)) t.setTag('history', {'maxstanzas': gajim.config.get(

1 0

gajim: hide() roster instead of iconify() it when clicking on sy...
by Yann Leboulanger 30 Dec '09

30 Dec '09

changeset 2a7f8d66f29a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2a7f8d66f29a description: hide() roster instead of iconify() it when clicking on systray. Fixes #5505 diffstat: src/systray.py | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diffs (25 lines): diff -r 59f2af364029 -r 2a7f8d66f29a src/systray.py --- a/src/systray.py Wed Dec 30 11:06:14 2009 +0100 +++ b/src/systray.py Wed Dec 30 11:10:11 2009 +0100 @@ -326,18 +326,16 @@ win = gajim.interface.roster.window if len(gajim.events.get_systray_events()) == 0: # No pending events, so toggle visible/hidden for roster window - if not win.iconify_initially and (win.get_property( + if win..get_property('visible') and (win.get_property( 'has-toplevel-focus') or os.name == 'nt'): # visible in ANY virtual desktop? # we could be in another VD right now. eg vd2 # and we want to show it in vd2 if not gtkgui_helpers.possibly_move_window_in_current_desktop(win): - win.set_property('skip-taskbar-hint', False) - win.iconify() # else we hide it from VD that was visible in - win.set_property('skip-taskbar-hint', True) + win.hide() # else we hide it from VD that was visible in else: - win.deiconify() + win.show_all() if not gajim.config.get('roster_window_skip_taskbar'): win.set_property('skip-taskbar-hint', False) win.present_with_time(gtk.get_current_event_time())

1 0

gajim: dd some debuging info when saving avatar fails
by Yann Leboulanger 30 Dec '09

30 Dec '09

changeset 59f2af364029 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=59f2af364029 description: dd some debuging info when saving avatar fails diffstat: ChangeLog | 8 ++++++++ src/gtkgui_helpers.py | 3 ++- 2 files changed, 10 insertions(+), 1 deletions(-) diffs (28 lines): diff -r bd039e2e9e01 -r 59f2af364029 ChangeLog --- a/ChangeLog Wed Nov 25 16:50:15 2009 +0100 +++ b/ChangeLog Wed Dec 30 11:06:14 2009 +0100 @@ -1,3 +1,11 @@ +Gajim 0.13.2 ((01 January 2010) + + * Fix some translations + * Fix string comparison according to locales + * Fix resizing of groupchat occupant treeview + * Fix some gnomekeyring glitches + * better SRV usage with libasyncns + Gajim 0.13.1 ((28 November 2009) * Fix a bug when no account exists and bonjour is not available diff -r bd039e2e9e01 -r 59f2af364029 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Wed Nov 25 16:50:15 2009 +0100 +++ b/src/gtkgui_helpers.py Wed Dec 30 11:06:14 2009 +0100 @@ -790,7 +790,8 @@ # Save image try: pixbuf.save(file_path, type_) - except Exception: + except Exception, e: + log.debug('Error saving avatar: %s' % str(e)) if os.path.exists(file_path): os.remove(file_path) new_file_path = '.'.join(file_path.split('.')[:-1]) + '.jpeg'

1 0

gajim: add some debuging info when saving avatar fails
by Yann Leboulanger 30 Dec '09

30 Dec '09

changeset 3317852803dd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3317852803dd description: add some debuging info when saving avatar fails diffstat: src/gtkgui_helpers.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r defe37989ddf -r 3317852803dd src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Tue Dec 29 16:02:50 2009 +0100 +++ b/src/gtkgui_helpers.py Wed Dec 30 11:04:26 2009 +0100 @@ -865,7 +865,8 @@ # Save image try: pixbuf.save(file_path, image_format) - except glib.GError: + except glib.GError, e: + log.debug('Error saving avatar: %s' % str(e)) if os.path.exists(file_path): os.remove(file_path) new_file_path = '.'.join(file_path.split('.')[:-1]) + '.jpeg'

1 0

gajim: prevent bug when merging metacontacts
by Yann Leboulanger 29 Dec '09

29 Dec '09

changeset defe37989ddf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=defe37989ddf description: prevent bug when merging metacontacts diffstat: src/roster_window.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 61291a23d3d4 -r defe37989ddf src/roster_window.py --- a/src/roster_window.py Tue Dec 29 00:01:55 2009 +0100 +++ b/src/roster_window.py Tue Dec 29 16:02:50 2009 +0100 @@ -3988,6 +3988,9 @@ _account = data['account'] _jid = data['jid'] _contact = gajim.contacts.get_first_contact_from_jid(_account, _jid) + if not _contact: + # One of the metacontacts may be not connected. + continue _contact.groups = c_dest.groups[:] gajim.contacts.add_metacontact(account_dest, c_dest.jid,

1 0

gajim: allow space in profile name when running with launch.sh. ...
by Yann Leboulanger 29 Dec '09

29 Dec '09

changeset bd039e2e9e01 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bd039e2e9e01 description: allow space in profile name when running with launch.sh. Fixes #5453 diffstat: launch.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (8 lines): diff -r 2fa5bbe52895 -r bd039e2e9e01 launch.sh --- a/launch.sh Mon Dec 28 22:41:05 2009 +0100 +++ b/launch.sh Wed Nov 25 16:50:15 2009 +0100 @@ -1,3 +1,3 @@ #!/bin/sh cd "$(dirname $0)/src" -exec python -OOt gajim.py $@ +exec python -OOt gajim.py "$@"

1 0

gajim: apply config to minimized controls too. Fixes #5515
by Yann Leboulanger 29 Dec '09

29 Dec '09

changeset 2fa5bbe52895 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2fa5bbe52895 description: apply config to minimized controls too. Fixes #5515 diffstat: src/config.py | 63 ++++++++++++++++++++++++++++---------------------- src/message_window.py | 12 --------- 2 files changed, 35 insertions(+), 40 deletions(-) diffs (158 lines): diff -r d6b787792c5a -r 2fa5bbe52895 src/config.py --- a/src/config.py Tue Dec 01 17:41:43 2009 +0100 +++ b/src/config.py Mon Dec 28 22:41:05 2009 +0100 @@ -383,7 +383,8 @@ # Default Status messages self.default_msg_tree = self.xml.get_widget('default_msg_treeview') - col2 = self.default_msg_tree.rc_get_style().bg[gtk.STATE_ACTIVE].to_string() + col2 = self.default_msg_tree.rc_get_style().bg[gtk.STATE_ACTIVE].\ + to_string() # (status, translated_status, message, enabled) model = gtk.ListStore(str, str, str, bool) self.default_msg_tree.set_model(model) @@ -546,37 +547,43 @@ w.set_sensitive(widget.get_active()) gajim.interface.save_config() + def _get_all_controls(self): + for ctrl in gajim.interface.msg_win_mgr.get_controls(): + yield ctrl + for account in gajim.connections: + for ctrl in gajim.interface.minimized_controls[account].values(): + yield ctrl + + def _get_all_muc_controls(self): + for ctrl in gajim.interface.msg_win_mgr.get_controls( + message_control.TYPE_GC): + yield ctrl + for account in gajim.connections: + for ctrl in gajim.interface.minimized_controls[account].values(): + yield ctrl + def on_sort_by_show_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'sort_by_show_in_roster') gajim.interface.roster.setup_and_draw_roster() def on_sort_by_show_in_muc_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'sort_by_show_in_muc') - # Redraw connected groupchats - for account in gajim.connections: - if gajim.connections[account].connected: - for gc_control in gajim.interface.msg_win_mgr.get_controls( - message_control.TYPE_GC) + \ - gajim.interface.minimized_controls[account].values(): - gc_control.draw_roster() + # Redraw groupchats + for ctrl in self._get_all_muc_controls(): + ctrl.draw_roster() def on_show_avatars_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_avatars_in_roster') gajim.interface.roster.setup_and_draw_roster() - # Redraw connected groupchats (in an ugly way) - for account in gajim.connections: - if gajim.connections[account].connected: - for gc_control in gajim.interface.msg_win_mgr.get_controls( - message_control.TYPE_GC) + \ - gajim.interface.minimized_controls[account].values(): - gc_control.draw_roster() + # Redraw groupchats (in an ugly way) + for ctrl in self._get_all_muc_controls(): + ctrl.draw_roster() def on_show_status_msgs_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_status_msgs_in_roster') gajim.interface.roster.setup_and_draw_roster() - for ctl in gajim.interface.msg_win_mgr.controls(): - if ctl.type_id == message_control.TYPE_GC: - ctl.update_ui() + for ctrl in self._get_all_muc_controls(): + ctrl.update_ui() def on_show_mood_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_mood_in_roster') @@ -605,8 +612,8 @@ def toggle_emoticons(self): '''Update emoticons state in Opened Chat Windows''' - for win in gajim.interface.msg_win_mgr.windows(): - win.toggle_emoticons() + for ctrl in self._get_all_controls(): + ctrl.toggle_emoticons() def on_one_window_type_combo_changed(self, widget): active = widget.get_active() @@ -617,8 +624,8 @@ def on_compact_view_checkbutton_toggled(self, widget): active = widget.get_active() - for ctl in gajim.interface.msg_win_mgr.controls(): - ctl.chat_buttons_set_visible(active) + for ctrl in self._get_all_controls(): + ctrl.chat_buttons_set_visible(active) gajim.config.set('compact_view', active) gajim.interface.save_config() @@ -627,7 +634,7 @@ helpers.update_optional_features() def apply_speller(self): - for ctrl in gajim.interface.msg_win_mgr.controls(): + for ctrl in self._get_all_controls(): if isinstance(ctrl, chat_control.ChatControlBase): try: spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview) @@ -638,7 +645,7 @@ ctrl.set_speller() def remove_speller(self): - for ctrl in gajim.interface.msg_win_mgr.controls(): + for ctrl in self._get_all_controls(): if isinstance(ctrl, chat_control.ChatControlBase): try: spell_obj = gtkspell.get_from_text_view(ctrl.msg_textview) @@ -799,8 +806,8 @@ def update_text_tags(self): '''Update color tags in Opened Chat Windows''' - for win in gajim.interface.msg_win_mgr.windows(): - win.update_tags() + for ctrl in self._get_all_controls(): + ctrl.update_tags() def on_preference_widget_color_set(self, widget, text): color = widget.get_color() @@ -820,8 +827,8 @@ def update_text_font(self): '''Update text font in Opened Chat Windows''' - for win in gajim.interface.msg_win_mgr.windows(): - win.update_font() + for ctrl in self._get_all_controls(): + ctrl.update_font() def on_incoming_msg_colorbutton_color_set(self, widget): self.on_preference_widget_color_set(widget, 'inmsgcolor') diff -r d6b787792c5a -r 2fa5bbe52895 src/message_window.py --- a/src/message_window.py Tue Dec 01 17:41:43 2009 +0100 +++ b/src/message_window.py Mon Dec 28 22:41:05 2009 +0100 @@ -650,18 +650,6 @@ def get_origin(self): return self.window.window.get_origin() - def toggle_emoticons(self): - for ctrl in self.controls(): - ctrl.toggle_emoticons() - - def update_font(self): - for ctrl in self.controls(): - ctrl.update_font() - - def update_tags(self): - for ctrl in self.controls(): - ctrl.update_tags() - def get_control(self, key, acct): '''Return the MessageControl for jid or n, where n is a notebook page index. When key is an int index acct may be None'''

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2009