Commits July 2008

commits@gajim.org

7 participants
229 discussions

[commit-gajim] r9949 - trunk
by js＠gajim.org 16 Jul '08

16 Jul '08

Author: js Date: 2008-07-16 18:47:08 +0200 (Wed, 16 Jul 2008) New Revision: 9949 Modified: trunk/gajim.nsi Log: Delete reg keys on uninstall. Modified: trunk/gajim.nsi =================================================================== --- trunk/gajim.nsi 2008-07-16 16:42:30 UTC (rev 9948) +++ trunk/gajim.nsi 2008-07-16 16:47:08 UTC (rev 9949) @@ -566,12 +566,18 @@ !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder + SetShellVarContext current Delete "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" Delete "$SMPROGRAMS\$StartMenuFolder\Change Theme.lnk" RMDir "$SMPROGRAMS\$StartMenuFolder" Delete "$SMSTARTUP\Gajim.lnk" + SetShellVarContext all + Delete "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" + Delete "$SMPROGRAMS\$StartMenuFolder\Change Theme.lnk" + RMDir "$SMPROGRAMS\$StartMenuFolder" DeleteRegKey /ifempty HKCU "Software\Gajim" + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" SectionEnd !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN

1 0

[commit-gajim] r9948 - trunk
by js＠gajim.org 16 Jul '08

16 Jul '08

Author: js Date: 2008-07-16 18:42:30 +0200 (Wed, 16 Jul 2008) New Revision: 9948 Modified: trunk/gajim.nsi Log: As it's possible to uninstall via Add/remove programs, we don't need a shortcut to the uninstaller. Modified: trunk/gajim.nsi =================================================================== --- trunk/gajim.nsi 2008-07-16 16:34:07 UTC (rev 9947) +++ trunk/gajim.nsi 2008-07-16 16:42:30 UTC (rev 9948) @@ -173,12 +173,10 @@ CreateDirectory "$SMPROGRAMS\$StartMenuFolder" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Change Theme.lnk" "$INSTDIR\bin\gtk\bin\gtkthemeselector.exe" - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe" SetShellVarContext all CreateDirectory "$SMPROGRAMS\$StartMenuFolder" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Change Theme.lnk" "$INSTDIR\bin\gtk\bin\gtkthemeselector.exe" - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe" !insertmacro MUI_STARTMENU_WRITE_END SetOutPath "$INSTDIR\data" @@ -570,7 +568,6 @@ Delete "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" Delete "$SMPROGRAMS\$StartMenuFolder\Change Theme.lnk" - Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" RMDir "$SMPROGRAMS\$StartMenuFolder" Delete "$SMSTARTUP\Gajim.lnk"

1 0

[commit-gajim] r9947 - trunk
by js＠gajim.org 16 Jul '08

16 Jul '08

Author: js Date: 2008-07-16 18:34:07 +0200 (Wed, 16 Jul 2008) New Revision: 9947 Modified: trunk/gajim.nsi Log: Add uninstaller to Add/remove software in control panel. Modified: trunk/gajim.nsi =================================================================== --- trunk/gajim.nsi 2008-07-16 16:17:50 UTC (rev 9946) +++ trunk/gajim.nsi 2008-07-16 16:34:07 UTC (rev 9947) @@ -161,6 +161,11 @@ File "bin\zlib1.dll" WriteRegStr HKCU "Software\Gajim" "" $INSTDIR + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.11.4.4-svn" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" !insertmacro MUI_STARTMENU_WRITE_BEGIN Application

1 0

[commit-gajim] r9946 - trunk/src
by js＠gajim.org 16 Jul '08

16 Jul '08

Author: js Date: 2008-07-16 18:17:50 +0200 (Wed, 16 Jul 2008) New Revision: 9946 Modified: trunk/src/secrets.py Log: Remove E2E password dialog. bct wanted to remove this, but I was bored, so I did his job :). Modified: trunk/src/secrets.py =================================================================== --- trunk/src/secrets.py 2008-07-16 15:50:51 UTC (rev 9945) +++ trunk/src/secrets.py 2008-07-16 16:17:50 UTC (rev 9946) @@ -10,55 +10,9 @@ import gtk -import Crypto.Cipher.AES -import Crypto.Hash.SHA256 -import Crypto.PublicKey.RSA - secrets_filename = gajimpaths['SECRETS_FILE'] secrets_cache = None -secrets_cipher = None -secrets_counter = None - -# strength of the encryption used on SECRETS_FILE -n = 256 - -class Counter: - def __init__(self, n, iv): - self.n = n - self.c = crypto.decode_mpi(iv) - - def __call__(self): - self.c = (self.c + 1) % (2 ** self.n) - return crypto.encode_mpi_with_padding(self.c) - -# return en/decrypter if it's cached, otherwise create it from the user's -# passphrase -def get_key(counter, passph=None): - global secrets_cipher, secrets_counter - - if secrets_cipher: - return secrets_cipher - - if not passph: - passph, checked = dialogs.PassphraseDialog(_('Passphrase Required'), - _('To continue, Gajim needs to access your stored secrets. Enter your passphrase') - ).run() - - if passph == -1: - raise exceptions.Cancelled - - sh = Crypto.Hash.SHA256.new() - sh.update(passph) - key = sh.digest() - - secrets_counter = counter - - secrets_cipher = Crypto.Cipher.AES.new(key, Crypto.Cipher.AES.MODE_CTR, - counter=secrets_counter) - - return secrets_cipher - class Secrets: def __init__(self, filename): self.filename = filename @@ -66,50 +20,16 @@ self.pubkeys = {} self.privkeys = {} - def _save(self): - global secrets_cipher, secrets_counter - - old_counter = secrets_counter.c - - # pickle doesn't appear to have problems with trailing whitespace - padded = crypto.pad_to_multiple(pickle.dumps(self), n / 8, ' ', False) - encrypted = secrets_cipher.encrypt(padded) - - f = open(secrets_filename, 'w') - f.write(crypto.encode_mpi_with_padding(old_counter) + encrypted) - f.close() - def cancel(self): raise exceptions.Cancelled def save(self): - passph1 = None + pickle.dumps(self) - def _cont1(passph, checked): - dialogs.PassphraseDialog(_('Confirm Passphrase'), - _('Enter your new passphrase again for confirmation'), - is_modal=False, ok_handler=(_cont2, passph), cancel_handler=self.cancel) + f = open(secrets_filename, 'w') + f.write(pickle.dumps(self)) + f.close() - def _cont2(passph, checked, passph1): - if passph != passph1: - dialogs.PassphraseDialog(_('Create Passphrase'), - _('Passphrases did not match.\n') + - _('Gajim needs you to create a passphrase to encrypt stored secrets'), - is_modal=False, ok_handler=_cont1, cancel_handler=self.cancel) - return - - counter = Counter(16, crypto.random_bytes(16)) - get_key(counter, passph1) - - self._save() - - if not os.path.exists(self.filename): - dialogs.PassphraseDialog(_('Create Passphrase'), - _('Gajim needs you to create a passphrase to encrypt stored secrets'), - is_modal=False, ok_handler=_cont1, cancel_handler=self.cancel) - else: - self._save() - def retained_secrets(self, account, bare_jid): try: return self.srs[account][bare_jid] @@ -161,25 +81,14 @@ def load_secrets(filename): f = open(filename, 'r') - counter = Counter(16, f.read(16)) - - decrypted = get_key(counter).decrypt(f.read()) - try: - secrets = pickle.loads(decrypted) - except: + secrets = pickle.loads(f.read()) + except KeyError: f.close() + secrets = Secrets(filename) - global secrets_cipher + return secrets - secrets_cipher = None - - return load_secrets(filename) - else: - f.close() - - return secrets - def secrets(): global secrets_cache

1 0

[commit-gajim] r9945 - in trunk/src: . common
by js＠gajim.org 16 Jul '08

16 Jul '08

Author: js Date: 2008-07-16 17:50:51 +0200 (Wed, 16 Jul 2008) New Revision: 9945 Modified: trunk/src/common/config.py trunk/src/gajim.py trunk/src/roster_window.py Log: Keep last status on autoconnect. Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-07-16 12:58:52 UTC (rev 9944) +++ trunk/src/common/config.py 2008-07-16 15:50:51 UTC (rev 9945) @@ -270,7 +270,6 @@ 'autopriority_dnd': [ opt_int, 20], 'autopriority_invisible': [ opt_int, 10], 'autoconnect': [ opt_bool, False, '', True ], - 'autoconnect_as': [ opt_str, 'online', _('Status used to autoconnect as. Can be online, chat, away, xa, dnd, invisible.'), True ], 'autoreconnect': [ opt_bool, True ], 'active': [ opt_bool, True], 'proxy': [ opt_str, '', '', True ], @@ -308,6 +307,8 @@ 'msgwin-height': [opt_int, 440], 'listen_to_network_manager' : [opt_bool, True], 'is_zeroconf': [opt_bool, False], + 'last_status': [opt_str, 'online'], + 'last_status_msg': [opt_str, ''], 'zeroconf_first_name': [ opt_str, '', '', True ], 'zeroconf_last_name': [ opt_str, '', '', True ], 'zeroconf_jabber_id': [ opt_str, '', '', True ], Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-16 12:58:52 UTC (rev 9944) +++ trunk/src/gajim.py 2008-07-16 15:50:51 UTC (rev 9945) @@ -2706,22 +2706,13 @@ def autoconnect(self): '''auto connect at startup''' # dict of account that want to connect sorted by status - shows = {} for a in gajim.connections: if gajim.config.get_per('accounts', a, 'autoconnect'): - show = gajim.config.get_per('accounts', a, 'autoconnect_as') - if not show in gajim.SHOW_LIST: - continue - if not show in shows: - shows[show] = [a] - else: - shows[show].append(a) - for show in shows: - message = self.roster.get_status_message(show) - if message is None: - continue - for a in shows[show]: - self.roster.send_status(a, show, message) + self.roster.send_status(a, + gajim.config.get_per('accounts', a, + 'last_status'), + gajim.config.get_per('accounts', a, + 'last_status_msg')) return False def show_systray(self): Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-16 12:58:52 UTC (rev 9944) +++ trunk/src/roster_window.py 2008-07-16 15:50:51 UTC (rev 9945) @@ -1726,6 +1726,11 @@ def send_status(self, account, status, txt, auto = False, to = None): child_iterA = self._get_account_iter(account, self.model) if status != 'offline': + if to is None: + gajim.config.set_per('accounts', account, + 'last_status', status) + gajim.config.set_per('accounts', account, + 'last_status_msg', txt) if gajim.connections[account].connected < 2: self.set_connecting_state(account)

1 0

[commit-gajim] r9944 - trunk/src/common
by js＠gajim.org 16 Jul '08

16 Jul '08

Author: js Date: 2008-07-16 14:58:52 +0200 (Wed, 16 Jul 2008) New Revision: 9944 Modified: trunk/src/common/nslookup.py Log: Another part of a fix for #4098. I'm not sure how fatal if would be if the idle queue of NS lookups hangs, but this fix won't hurt anyway, so I better fix it. Modified: trunk/src/common/nslookup.py =================================================================== --- trunk/src/common/nslookup.py 2008-07-16 02:37:57 UTC (rev 9943) +++ trunk/src/common/nslookup.py 2008-07-16 12:58:52 UTC (rev 9944) @@ -321,5 +321,15 @@ but.connect('clicked', clicked) win.add(hbox) win.show_all() - gobject.timeout_add(200, idlequeue.process) + + def process(): + try: + idlequeue.process() + except: + # Otherwise, an exception will stop our loop + gobject.timeout_add(200, process) + raise + return True + + gobject.timeout_add(200, process) gtk.main()

1 0

[commit-gajim] r9943 - trunk/src
by js＠gajim.org 16 Jul '08

16 Jul '08

Author: js Date: 2008-07-16 04:37:57 +0200 (Wed, 16 Jul 2008) New Revision: 9943 Modified: trunk/src/gajim.py Log: This should fix #4098. However, I'll let that bug open until I'm very very sure and gave that a few days of testing. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-15 23:46:24 UTC (rev 9942) +++ trunk/src/gajim.py 2008-07-16 02:37:57 UTC (rev 9943) @@ -2738,7 +2738,17 @@ def process_connections(self): ''' called each foo (200) miliseconds. Check for idlequeue timeouts. ''' - gajim.idlequeue.process() + try: + gajim.idlequeue.process() + except: + # Otherwise, an exception will stop our loop + if os.name == 'nt': + gobject.timeout_add(200, + self.process_connections) + else: + gobject.timeout_add_seconds(2, + self.process_connections) + raise return True # renew timeout (loop for ever) def save_config(self):

1 0

[commit-gajim] r9942 - trunk
by js＠gajim.org 15 Jul '08

15 Jul '08

Author: js Date: 2008-07-16 01:46:24 +0200 (Wed, 16 Jul 2008) New Revision: 9942 Modified: trunk/setup_win32.py Log: Don't fail on setup_win32.py if docutil is not installed. Modified: trunk/setup_win32.py =================================================================== --- trunk/setup_win32.py 2008-07-15 23:23:31 UTC (rev 9941) +++ trunk/setup_win32.py 2008-07-15 23:46:24 UTC (rev 9942) @@ -44,6 +44,18 @@ } } +try: + import docutils.readers +except ImportError: + opts['py2exe']['includes'] = \ + opts['py2exe']['includes'].replace(',docutils.readers.*', '') + +try: + import docutils.writers.html4css1 +except ImportError: + opts['py2exe']['includes'] = \ + opts['py2exe']['includes'].replace(',docutils.writers.html4css1', '') + setup( name = 'Gajim', version = '0.11.4.4-svn',

1 0

[commit-gajim] r9941 - trunk/src/common/xmpp
by js＠gajim.org 15 Jul '08

15 Jul '08

Author: js Date: 2008-07-16 01:23:31 +0200 (Wed, 16 Jul 2008) New Revision: 9941 Modified: trunk/src/common/xmpp/idlequeue.py Log: Partially fix #4098. This is, however, only a half fix as this fixes that it fails when there's None in waiting_descriptors[2], but actually, there never should be None, so I have to investigate why there was none. This patch is, however, correct and needed and the other queues also have that check. It's just that I also need to fix the reason for the None in the queue. Modified: trunk/src/common/xmpp/idlequeue.py =================================================================== --- trunk/src/common/xmpp/idlequeue.py 2008-07-15 17:04:36 UTC (rev 9940) +++ trunk/src/common/xmpp/idlequeue.py 2008-07-15 23:23:31 UTC (rev 9941) @@ -204,16 +204,18 @@ except select.error, e: waiting_descriptors = ((),(),()) if e[0] != 4: # interrupt - raise - for fd in waiting_descriptors[0]: - q = self.queue.get(fd) - if q: + raise + for fd in waiting_descriptors[0]: + q = self.queue.get(fd) + if q: q.pollin() for fd in waiting_descriptors[1]: - q = self.queue.get(fd) - if q: + q = self.queue.get(fd) + if q: q.pollout() for fd in waiting_descriptors[2]: - self.queue.get(fd).pollend() + q = self.queue.get(fd) + if q: + q.pollend() self.check_time_events() return True

1 0

[commit-gajim] r9940 - trunk/src
by js＠gajim.org 15 Jul '08

15 Jul '08

Author: js Date: 2008-07-15 19:04:36 +0200 (Tue, 15 Jul 2008) New Revision: 9940 Modified: trunk/src/chat_control.py Log: Last diff was incomplete. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-15 16:45:39 UTC (rev 9939) +++ trunk/src/chat_control.py 2008-07-15 17:04:36 UTC (rev 9940) @@ -1359,7 +1359,8 @@ ec.remove(self.contact.jid) self.gpg_is_active = False msg = _('GPG encryption disabled') - ChatControlBase.print_conversation_line(self, msg, 'status', '', None) + ChatControlBase.print_conversation_line(self, msg, + 'status', '', None) if self.session: self.session.loggable = True @@ -1368,25 +1369,29 @@ ec.append(self.contact.jid) self.gpg_is_active = True msg = _('GPG encryption enabled') - ChatControlBase.print_conversation_line(self, msg, 'status', '', None) + ChatControlBase.print_conversation_line(self, msg, + 'status', '', None) if self.session: - self.session.loggable = gajim.config.get('log_encrypted_sessions'); + self.session.loggable = gajim.config.get( + 'log_encrypted_sessions'); if self.session and not self.session.is_loggable(): msg = _('Session WILL NOT be logged') else: msg = _('Session WILL be logged') - ChatControlBase.print_conversation_line(self, msg, 'status', '', None) + ChatControlBase.print_conversation_line(self, msg, + 'status', '', None) gpg_pref = gajim.config.get_per('contacts', self.contact.jid, 'gpg_enabled') if gpg_pref is None: gajim.config.add_per('contacts', self.contact.jid) - gajim.config.set_per('contacts', self.contact.jid, 'gpg_enabled', - self.gpg_is_active) + gajim.config.set_per('contacts', self.contact.jid, + 'gpg_enabled', self.gpg_is_active) - self._show_lock_image(self.gpg_is_active, 'GPG', self.gpg_is_active, self.session and \ - self.session.is_loggable(), self.session and self.session.verified_identity) + self._show_lock_image(self.gpg_is_active, 'GPG', + self.gpg_is_active, + self.session and self.session.is_loggable(), True) def _show_lock_image(self, visible, enc_type = '', enc_enabled = False, chat_logged = False, authenticated = False): '''Set lock icon visibility and create tooltip'''

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
23
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 2008