Commits May 2009

commits@gajim.org

3 participants
53 discussions

[commit-gajim] r11279 - trunk/src
by asterix＠gajim.org 10 May '09

10 May '09

Author: asterix Date: 2009-05-10 21:37:39 +0200 (Sun, 10 May 2009) New Revision: 11279 Modified: trunk/src/config.py Log: prevent traceback when we click on Rename in accounts window, but no account is selected. Fixes #5019 Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2009-05-10 19:36:04 UTC (rev 11278) +++ trunk/src/config.py 2009-05-10 19:37:39 UTC (rev 11279) @@ -1720,6 +1720,8 @@ remove(account) def on_rename_button_clicked(self, widget): + if not self.current_account: + return enable = gajim.config.get('enable_zeroconf') if (self.current_account != gajim.ZEROCONF_ACC_NAME or enable) and \ gajim.connections[self.current_account].connected != 0:

1 0

[commit-gajim] r11278 - trunk/src
by asterix＠gajim.org 10 May '09

10 May '09

Author: asterix Date: 2009-05-10 21:36:04 +0200 (Sun, 10 May 2009) New Revision: 11278 Modified: trunk/src/config.py Log: don't show _last_* status message in GUI, they are internal only. Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2009-05-10 19:32:57 UTC (rev 11277) +++ trunk/src/config.py 2009-05-10 19:36:04 UTC (rev 11278) @@ -1026,6 +1026,8 @@ model.clear() preset_status = [] for msg_name in gajim.config.get_per('statusmsg'): + if msg_name.startswith('_last_'): + continue preset_status.append(msg_name) preset_status.sort() for msg_name in preset_status:

1 0

[commit-gajim] r11277 - in trunk: . src src/common
by asterix＠gajim.org 10 May '09

10 May '09

Author: asterix Date: 2009-05-10 21:32:57 +0200 (Sun, 10 May 2009) New Revision: 11277 Modified: trunk/configure.ac trunk/src/common/config.py trunk/src/common/defs.py trunk/src/common/helpers.py trunk/src/common/optparser.py trunk/src/config.py trunk/src/dialogs.py Log: [brubru] better sound file managment, Fixes #5016 Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2009-05-07 11:32:02 UTC (rev 11276) +++ trunk/configure.ac 2009-05-10 19:32:57 UTC (rev 11277) @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.12.1.4-svn],[http://trac.gajim.org/],[gajim]) + [0.12.1.5-svn],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2009-05-07 11:32:02 UTC (rev 11276) +++ trunk/src/common/config.py 2009-05-10 19:32:57 UTC (rev 11277) @@ -457,15 +457,15 @@ } soundevents_default = { - 'first_message_received': [ True, '../data/sounds/message1.wav' ], - 'next_message_received_focused': [ True, '../data/sounds/message2.wav' ], - 'next_message_received_unfocused': [ True, '../data/sounds/message2.wav' ], - 'contact_connected': [ True, '../data/sounds/connected.wav' ], - 'contact_disconnected': [ True, '../data/sounds/disconnected.wav' ], - 'message_sent': [ True, '../data/sounds/sent.wav' ], - 'muc_message_highlight': [ True, '../data/sounds/gc_message1.wav', _('Sound to play when a group chat message contains one of the words in muc_highlight_words, or when a group chat message contains your nickname.')], - 'muc_message_received': [ False, '../data/sounds/gc_message2.wav', _('Sound to play when any MUC message arrives.') ], - 'gmail_received': [ False, '../data/sounds/message1.wav' ], + 'first_message_received': [ True, 'message1.wav' ], + 'next_message_received_focused': [ True, 'message2.wav' ], + 'next_message_received_unfocused': [ True, 'message2.wav' ], + 'contact_connected': [ True, 'connected.wav' ], + 'contact_disconnected': [ True, 'disconnected.wav' ], + 'message_sent': [ True, 'sent.wav' ], + 'muc_message_highlight': [ True, 'gc_message1.wav', _('Sound to play when a group chat message contains one of the words in muc_highlight_words, or when a group chat message contains your nickname.')], + 'muc_message_received': [ False, 'gc_message2.wav', _('Sound to play when any MUC message arrives.') ], + 'gmail_received': [ False, 'message1.wav' ], } themes_default = { Modified: trunk/src/common/defs.py =================================================================== --- trunk/src/common/defs.py 2009-05-07 11:32:02 UTC (rev 11276) +++ trunk/src/common/defs.py 2009-05-10 19:32:57 UTC (rev 11277) @@ -27,7 +27,7 @@ datadir = '../' localedir = '../po' -version = '0.12.1.4-svn' +version = '0.12.1.5-svn' import sys, os.path for base in ('.', 'common'): Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2009-05-07 11:32:02 UTC (rev 11276) +++ trunk/src/common/helpers.py 2009-05-10 19:32:57 UTC (rev 11277) @@ -773,11 +773,52 @@ path_to_soundfile = gajim.config.get_per('soundevents', event, 'path') play_sound_file(path_to_soundfile) +def check_soundfile_path(file, + dirs=(gajim.gajimpaths.root, gajim.DATA_DIR)): + '''Check if the sound file exists. + :param file: the file to check, absolute or relative to 'dirs' path + :param dirs: list of knows paths to fallback if the file doesn't exists + (eg: ~/.gajim/sounds/, DATADIR/sounds...). + :return the path to file or None if it doesn't exists.''' + if not file: + return None + elif os.path.exists(file): + return file + + for d in dirs: + d = os.path.join(d, 'sounds', file) + if os.path.exists(d): + return d + return None + +def strip_soundfile_path(file, + dirs=(gajim.gajimpaths.root, gajim.DATA_DIR), + abs=True): + '''Remove knowns paths from a sound file: + Filechooser returns absolute path. If path is a known fallback path, we remove it. + So config have no hardcoded path to DATA_DIR and text in textfield is shorther. + param: file: the filename to strip. + param: dirs: list of knowns paths from which the filename should be stripped. + param: abs: force absolute path on dirs + ''' + if not file: + return None + + name = os.path.basename(file) + for d in dirs: + d = os.path.join(d, 'sounds', name) + if abs: + d = os.path.abspath(d) + if file == d: + return name + return file + def play_sound_file(path_to_soundfile): if path_to_soundfile == 'beep': exec_command('beep') return - if path_to_soundfile is None or not os.path.exists(path_to_soundfile): + path_to_soundfile = check_soundfile_path(path_to_soundfile) + if path_to_soundfile is None: return if sys.platform == 'darwin': try: Modified: trunk/src/common/optparser.py =================================================================== --- trunk/src/common/optparser.py 2009-05-07 11:32:02 UTC (rev 11276) +++ trunk/src/common/optparser.py 2009-05-10 19:32:57 UTC (rev 11277) @@ -30,6 +30,7 @@ import locale import re from common import gajim +from common import helpers import exceptions try: @@ -195,6 +196,8 @@ self.update_config_to_01213() if old < [0, 12, 1, 4] and new >= [0, 12, 1, 4]: self.update_config_to_01214() + if old < [0, 12, 1, 5] and new >= [0, 12, 1, 5]: + self.update_config_to_01215() gajim.logger.init_vars() gajim.config.set('version', new_version) @@ -657,4 +660,15 @@ self.old_values['last_status_msg_' + status]) gajim.config.set('version', '0.12.1.4') + def update_config_to_01215(self): + '''Remove hardcoded ../data/sounds from config''' + dirs = ('../data', gajim.gajimpaths.root, gajim.DATA_DIR) + for evt in gajim.config.get_per('soundevents'): + path = gajim.config.get_per('soundevents', evt ,'path') + # absolute and relative passes are necessary + path = helpers.strip_soundfile_path(path, dirs, abs=False) + path = helpers.strip_soundfile_path(path, dirs, abs=True) + gajim.config.set_per('soundevents', evt, 'path', path) + gajim.config.set('version', '0.12.1.5') + # vim: se ts=3: Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2009-05-07 11:32:02 UTC (rev 11276) +++ trunk/src/config.py 2009-05-10 19:32:57 UTC (rev 11277) @@ -3647,6 +3647,7 @@ return directory = os.path.dirname(path_to_snd_file) gajim.config.set('last_sounds_dir', directory) + path_to_snd_file = helpers.strip_soundfile_path(path_to_snd_file) self.xml.get_widget('sounds_entry').set_text(path_to_snd_file) model[iter_][2] = path_to_snd_file # set new path to sounds_model @@ -3654,12 +3655,8 @@ def on_cancel(widget): self.dialog.destroy() - model, iter_ = self.sound_tree.get_selection().get_selected() - model[iter_][2] = '' - model[iter_][0] = False path_to_snd_file = model[iter_][2].decode('utf-8') - path_to_snd_file = os.path.join(os.getcwd(), path_to_snd_file) self.dialog = dialogs.SoundChooserDialog(path_to_snd_file, on_ok, on_cancel) Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2009-05-07 11:32:02 UTC (rev 11276) +++ trunk/src/dialogs.py 2009-05-10 19:32:57 UTC (rev 11277) @@ -3165,7 +3165,10 @@ self.add_filter(filter_) self.set_filter(filter_) + path_to_snd_file = helpers.check_soundfile_path(path_to_snd_file) if path_to_snd_file: + # set_filename accept only absolute path + path_to_snd_file = os.path.abspath(path_to_snd_file) self.set_filename(path_to_snd_file) class ImageChooserDialog(FileChooserDialog):

1 0

[commit-gajim] r11276 - branches/gajim_0.12/src/common
by asterix＠gajim.org 07 May '09

07 May '09

Author: asterix Date: 2009-05-07 13:32:02 +0200 (Thu, 07 May 2009) New Revision: 11276 Modified: branches/gajim_0.12/src/common/gajim.py Log: except: -> except Exception: Modified: branches/gajim_0.12/src/common/gajim.py =================================================================== --- branches/gajim_0.12/src/common/gajim.py 2009-05-07 11:30:46 UTC (rev 11275) +++ branches/gajim_0.12/src/common/gajim.py 2009-05-07 11:32:02 UTC (rev 11276) @@ -160,7 +160,7 @@ except ImportError: try: import pybonjour - except: # Linux raises ImportError, Windows raises WindowsError + except Exception: # Linux raises ImportError, Windows raises WindowsError HAVE_ZEROCONF = False HAVE_PYCRYPTO = True

1 0

[commit-gajim] r11275 - trunk/src/common
by asterix＠gajim.org 07 May '09

07 May '09

Author: asterix Date: 2009-05-07 13:30:46 +0200 (Thu, 07 May 2009) New Revision: 11275 Modified: trunk/src/common/gajim.py Log: except: -> except Exception: Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2009-05-07 11:25:23 UTC (rev 11274) +++ trunk/src/common/gajim.py 2009-05-07 11:30:46 UTC (rev 11275) @@ -154,7 +154,7 @@ except ImportError: try: import pybonjour - except: # Linux raises ImportError, Windows raises WindowsError + except Exception: # Linux raises ImportError, Windows raises WindowsError HAVE_ZEROCONF = False HAVE_PYCRYPTO = True

1 0

[commit-gajim] r11274 - trunk
by asterix＠gajim.org 07 May '09

07 May '09

Author: asterix Date: 2009-05-07 13:25:23 +0200 (Thu, 07 May 2009) New Revision: 11274 Modified: trunk/gajim.nsi Log: correctly uninstall some pyd files Modified: trunk/gajim.nsi =================================================================== --- trunk/gajim.nsi 2009-05-07 11:19:54 UTC (rev 11273) +++ trunk/gajim.nsi 2009-05-07 11:25:23 UTC (rev 11274) @@ -656,39 +656,39 @@ RMDir /r "$INSTDIR\bin\gtk\share\xml" RMDir "$INSTDIR\bin\gtk\share" RMDir "$INSTDIR\bin\gtk" - Delete "$INSTDIR\bin\_cairo.pyd" Delete "$INSTDIR\bin\_ctypes.pyd" - Delete "$INSTDIR\bin\_gobject.pyd" - Delete "$INSTDIR\bin\_gtk.pyd" Delete "$INSTDIR\bin\_hashlib.pyd" Delete "$INSTDIR\bin\_socket.pyd" Delete "$INSTDIR\bin\_sqlite3.pyd" Delete "$INSTDIR\bin\_sqlite.pyd" Delete "$INSTDIR\bin\_ssl.pyd" Delete "$INSTDIR\bin\_win32sysloader.pyd" - Delete "$INSTDIR\bin\AES.pyd" Delete "$INSTDIR\bin\atk.pyd" Delete "$INSTDIR\bin\bz2.pyd" - Delete "$INSTDIR\bin\crypto.pyd" + Delete "$INSTDIR\bin\cairo._cairo.pyd" + Delete "$INSTDIR\bin\Crypto.Cipher.AES.pyd" + Delete "$INSTDIR\bin\Crypto.Hash.SHA256.pyd" Delete "$INSTDIR\bin\gajim.exe" - Delete "$INSTDIR\bin\glade.pyd" + Delete "$INSTDIR\bin\gobject._gobject.pyd" + Delete "$INSTDIR\bin\gtk._gtk.pyd" + Delete "$INSTDIR\bin\gtk.glade.pyd" Delete "$INSTDIR\bin\history_manager.exe" Delete "$INSTDIR\bin\libeay32.dll" Delete "$INSTDIR\bin\libglade-2.0-0.dll" Delete "$INSTDIR\bin\library.zip" Delete "$INSTDIR\bin\libxml2.dll" Delete "$INSTDIR\bin\msvcr71.dll" + Delete "$INSTDIR\bin\OpenSSL.crypto.pyd" + Delete "$INSTDIR\bin\OpenSSL.rand.pyd" + Delete "$INSTDIR\bin\OpenSSL.SSL.pyd" Delete "$INSTDIR\bin\pangocairo.pyd" Delete "$INSTDIR\bin\pango.pyd" Delete "$INSTDIR\bin\pyexpat.pyd" Delete "$INSTDIR\bin\python25.dll" Delete "$INSTDIR\bin\pywintypes25.dll" - Delete "$INSTDIR\bin\rand.pyd" Delete "$INSTDIR\bin\select.pyd" - Delete "$INSTDIR\bin\SHA256.pyd" Delete "$INSTDIR\bin\sqlite3.dll" Delete "$INSTDIR\bin\ssleay32.dll" - Delete "$INSTDIR\bin\SSL.pyd" Delete "$INSTDIR\bin\unicodedata.pyd" Delete "$INSTDIR\bin\w9xpopen.exe" Delete "$INSTDIR\bin\win32api.pyd"

1 0

[commit-gajim] r11273 - branches/gajim_0.12/src/common
by asterix＠gajim.org 07 May '09

07 May '09

Author: asterix Date: 2009-05-07 13:19:54 +0200 (Thu, 07 May 2009) New Revision: 11273 Modified: branches/gajim_0.12/src/common/gajim.py Log: fix an unhandled traceback under Windows Modified: branches/gajim_0.12/src/common/gajim.py =================================================================== --- branches/gajim_0.12/src/common/gajim.py 2009-05-07 11:18:48 UTC (rev 11272) +++ branches/gajim_0.12/src/common/gajim.py 2009-05-07 11:19:54 UTC (rev 11273) @@ -160,7 +160,7 @@ except ImportError: try: import pybonjour - except ImportError: + except: # Linux raises ImportError, Windows raises WindowsError HAVE_ZEROCONF = False HAVE_PYCRYPTO = True

1 0

[commit-gajim] r11272 - trunk/src/common
by asterix＠gajim.org 07 May '09

07 May '09

Author: asterix Date: 2009-05-07 13:18:48 +0200 (Thu, 07 May 2009) New Revision: 11272 Modified: trunk/src/common/gajim.py Log: fix an unhandled traceback under windows Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2009-05-07 10:07:12 UTC (rev 11271) +++ trunk/src/common/gajim.py 2009-05-07 11:18:48 UTC (rev 11272) @@ -154,7 +154,7 @@ except ImportError: try: import pybonjour - except ImportError: + except: # Linux raises ImportError, Windows raises WindowsError HAVE_ZEROCONF = False HAVE_PYCRYPTO = True

1 0

[commit-gajim] r11271 - branches/gajim_0.12
by asterix＠gajim.org 07 May '09

07 May '09

Author: asterix Date: 2009-05-07 12:07:12 +0200 (Thu, 07 May 2009) New Revision: 11271 Modified: branches/gajim_0.12/gajim.nsi Log: correctly uninstall some pyd files Modified: branches/gajim_0.12/gajim.nsi =================================================================== --- branches/gajim_0.12/gajim.nsi 2009-05-04 11:48:10 UTC (rev 11270) +++ branches/gajim_0.12/gajim.nsi 2009-05-07 10:07:12 UTC (rev 11271) @@ -652,39 +652,39 @@ RMDir /r "$INSTDIR\bin\gtk\share\xml" RMDir "$INSTDIR\bin\gtk\share" RMDir "$INSTDIR\bin\gtk" - Delete "$INSTDIR\bin\_cairo.pyd" Delete "$INSTDIR\bin\_ctypes.pyd" - Delete "$INSTDIR\bin\_gobject.pyd" - Delete "$INSTDIR\bin\_gtk.pyd" Delete "$INSTDIR\bin\_hashlib.pyd" Delete "$INSTDIR\bin\_socket.pyd" Delete "$INSTDIR\bin\_sqlite3.pyd" Delete "$INSTDIR\bin\_sqlite.pyd" Delete "$INSTDIR\bin\_ssl.pyd" Delete "$INSTDIR\bin\_win32sysloader.pyd" - Delete "$INSTDIR\bin\AES.pyd" Delete "$INSTDIR\bin\atk.pyd" Delete "$INSTDIR\bin\bz2.pyd" - Delete "$INSTDIR\bin\crypto.pyd" + Delete "$INSTDIR\bin\cairo._cairo.pyd" + Delete "$INSTDIR\bin\Crypto.Cipher.AES.pyd" + Delete "$INSTDIR\bin\Crypto.Hash.SHA256.pyd" Delete "$INSTDIR\bin\gajim.exe" - Delete "$INSTDIR\bin\glade.pyd" + Delete "$INSTDIR\bin\gobject._gobject.pyd" + Delete "$INSTDIR\bin\gtk._gtk.pyd" + Delete "$INSTDIR\bin\gtk.glade.pyd" Delete "$INSTDIR\bin\history_manager.exe" Delete "$INSTDIR\bin\libeay32.dll" Delete "$INSTDIR\bin\libglade-2.0-0.dll" Delete "$INSTDIR\bin\library.zip" Delete "$INSTDIR\bin\libxml2.dll" Delete "$INSTDIR\bin\msvcr71.dll" + Delete "$INSTDIR\bin\OpenSSL.crypto.pyd" + Delete "$INSTDIR\bin\OpenSSL.rand.pyd" + Delete "$INSTDIR\bin\OpenSSL.SSL.pyd" Delete "$INSTDIR\bin\pangocairo.pyd" Delete "$INSTDIR\bin\pango.pyd" Delete "$INSTDIR\bin\pyexpat.pyd" Delete "$INSTDIR\bin\python25.dll" Delete "$INSTDIR\bin\pywintypes25.dll" - Delete "$INSTDIR\bin\rand.pyd" Delete "$INSTDIR\bin\select.pyd" - Delete "$INSTDIR\bin\SHA256.pyd" Delete "$INSTDIR\bin\sqlite3.dll" Delete "$INSTDIR\bin\ssleay32.dll" - Delete "$INSTDIR\bin\SSL.pyd" Delete "$INSTDIR\bin\unicodedata.pyd" Delete "$INSTDIR\bin\w9xpopen.exe" Delete "$INSTDIR\bin\win32api.pyd"

1 0

[commit-gajim] r11270 - branches/gajim_0.12/src
by asterix＠gajim.org 04 May '09

04 May '09

Author: asterix Date: 2009-05-04 13:48:10 +0200 (Mon, 04 May 2009) New Revision: 11270 Modified: branches/gajim_0.12/src/dialogs.py Log: prevent sending single messages to non-valid JID. Fixes #5000 Modified: branches/gajim_0.12/src/dialogs.py =================================================================== --- branches/gajim_0.12/src/dialogs.py 2009-05-04 11:33:59 UTC (rev 11269) +++ branches/gajim_0.12/src/dialogs.py 2009-05-04 11:48:10 UTC (rev 11270) @@ -2355,10 +2355,17 @@ else: sender_list = [self.to_entry.get_text().decode('utf-8')] + jid_jist = [] for to_whom_jid in sender_list: if to_whom_jid in self.completion_dict: to_whom_jid = self.completion_dict[to_whom_jid].jid + try: + jid_jist.append(helpers.parse_jid(to_whom_jid)) + except helpers.InvalidFormat, e: + ErrorDialog(_('Invalid JID'), e[0]) + return + for to_whom_jid in jid_jist: subject = self.subject_entry.get_text().decode('utf-8') begin, end = self.message_tv_buffer.get_bounds() message = self.message_tv_buffer.get_text(begin, end).decode('utf-8')

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2009