Commits December 2007

commits@gajim.org

6 participants
149 discussions

[commit-gajim] r9199 - trunk/src
by jim++＠gajim.org 27 Dec '07

27 Dec '07

Author: jim++ Date: 2007-12-27 16:53:42 +0100 (Thu, 27 Dec 2007) New Revision: 9199 Modified: trunk/src/tooltips.py Log: Revert [9196]. Escape pep stuff in tooltips the right way. Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2007-12-27 10:59:29 UTC (rev 9198) +++ trunk/src/tooltips.py 2007-12-27 15:53:42 UTC (rev 9199) @@ -503,6 +503,7 @@ mood_string = _('Mood:') + ' %s' % contact.mood['mood'].strip() if contact.mood.has_key('text') and contact.mood['text'] != '': mood_string += ' (%s)' % contact.mood['text'].strip() + mood_string = gobject.markup_escape_text(mood_string) properties.append((mood_string, None)) if contact.activity.has_key('activity'): @@ -516,6 +517,7 @@ if contact.activity.has_key('text'): activity_text = contact.activity['text'].strip() activity_string += ' (%s)' % activity_text + activity_string = gobject.markup_escape_text(activity_string) properties.append((activity_string, None)) if contact.tune.has_key('artist') or contact.tune.has_key('title'): @@ -533,6 +535,7 @@ source = _('Unknown Source') tune_string = _('Tune:') + ' ' + _('"%(title)s" by %(artist)s\nfrom %(source)s' %\ {'title': title, 'artist': artist, 'source': source}) + tune_string = gobject.markup_escape_text(tune_string) properties.append((tune_string, None)) if contact.status: @@ -592,8 +595,7 @@ vertical_fill, 0, 0) else: if isinstance(property[0], (unicode, str)): #FIXME: rm unicode? - markup = gobject.markup_escape_text(property[0]) - label.set_markup(markup) + label.set_markup(property[0]) label.set_line_wrap(True) else: label = property[0]

1 0

[commit-gajim] r9198 - trunk/src
by steve-e＠gajim.org 27 Dec '07

27 Dec '07

Author: steve-e Date: 2007-12-27 11:59:29 +0100 (Thu, 27 Dec 2007) New Revision: 9198 Modified: trunk/src/roster_window.py Log: Variable referenced before assignment Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-12-27 10:26:54 UTC (rev 9197) +++ trunk/src/roster_window.py 2007-12-27 10:59:29 UTC (rev 9198) @@ -3716,8 +3716,8 @@ # do nothing if user doesn't have D-Bus bindings return if enabled: + listener = MusicTrackListener.get() if self._music_track_changed_signal is None: - listener = MusicTrackListener.get() self._music_track_changed_signal = listener.connect( 'music-track-changed', self._music_track_changed) track = listener.get_playing_track()

1 0

[commit-gajim] r9197 - www-website
by steve-e＠gajim.org 27 Dec '07

27 Dec '07

Author: steve-e Date: 2007-12-27 11:26:54 +0100 (Thu, 27 Dec 2007) New Revision: 9197 Modified: www-website/downloads.php Log: There is no Fedora Extras since Fedora 7. Thanks mcepl. Modified: www-website/downloads.php =================================================================== --- www-website/downloads.php 2007-12-27 10:06:30 UTC (rev 9196) +++ www-website/downloads.php 2007-12-27 10:26:54 UTC (rev 9197) @@ -46,8 +46,7 @@ print (" Fedora\n"); print (" </h2>\n"); print ("</a>\n"); -print _(" You can install Gajim provided you have Fedora Extras repository by")." yum install gajim\n"; -print (" \n"); +print _(" Just")." yum install gajim\n"; print ("<a name=\"gentoo\">\n"); print (" <h2>\n");

1 0

[commit-gajim] r9196 - trunk/src
by steve-e＠gajim.org 27 Dec '07

27 Dec '07

Author: steve-e Date: 2007-12-27 11:06:30 +0100 (Thu, 27 Dec 2007) New Revision: 9196 Modified: trunk/src/tooltips.py Log: Fix possible parsing error Modified: trunk/src/tooltips.py =================================================================== --- trunk/src/tooltips.py 2007-12-27 01:30:40 UTC (rev 9195) +++ trunk/src/tooltips.py 2007-12-27 10:06:30 UTC (rev 9196) @@ -592,7 +592,8 @@ vertical_fill, 0, 0) else: if isinstance(property[0], (unicode, str)): #FIXME: rm unicode? - label.set_markup(property[0]) + markup = gobject.markup_escape_text(property[0]) + label.set_markup(markup) label.set_line_wrap(True) else: label = property[0]

1 0

[commit-gajim] r9195 - trunk/src
by nicfit＠gajim.org 27 Dec '07

27 Dec '07

Author: nicfit Date: 2007-12-27 02:30:40 +0100 (Thu, 27 Dec 2007) New Revision: 9195 Modified: trunk/src/gajim.py Log: Since KeyboardInterrupt is "common" then catch the exception, print to stderr, and exit. No traceback, which says "error" to me... Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-12-26 23:59:54 UTC (rev 9194) +++ trunk/src/gajim.py 2007-12-27 01:30:40 UTC (rev 9195) @@ -2953,4 +2953,7 @@ osx.init() Interface() - gtk.main() + try: + gtk.main() + except KeyboardInterrupt: + print >> sys.stderr, 'KeyboardInterrupt'

1 0

[commit-gajim] r9194 - in trunk/src: . common
by asterix＠gajim.org 26 Dec '07

26 Dec '07

Author: asterix Date: 2007-12-27 00:59:54 +0100 (Thu, 27 Dec 2007) New Revision: 9194 Modified: trunk/src/common/connection.py trunk/src/config.py trunk/src/gajim.py Log: don't propose to add certificate to cacerts.pem file if it's useless, and don't add it if it is already in. fixes #720 Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-12-26 21:44:37 UTC (rev 9193) +++ trunk/src/common/connection.py 2007-12-26 23:59:54 UTC (rev 9194) @@ -318,7 +318,7 @@ ssl_fingerprint = \ self.connection.Connection.ssl_fingerprint_sha1 self.dispatch('NEW_ACC_CONNECTED', (conf, is_form, ssl_msg, - ssl_cert, ssl_fingerprint)) + errnum, ssl_cert, ssl_fingerprint)) self.connection.UnregisterDisconnectHandler( self._on_new_account) self.disconnect(on_purpose=True) @@ -589,7 +589,7 @@ text += _('\nSSL Error: %s') % ssl_error[errnum] else: text += _('\nUnknown SSL error: %d') % errnum - self.dispatch('SSL_ERROR', (text, con.Connection.ssl_cert_pem, + self.dispatch('SSL_ERROR', (text, errnum, con.Connection.ssl_cert_pem, con.Connection.ssl_fingerprint_sha1)) return True if hasattr(con.Connection, 'ssl_fingerprint_sha1'): Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-12-26 21:44:37 UTC (rev 9193) +++ trunk/src/config.py 2007-12-26 23:59:54 UTC (rev 9194) @@ -3225,12 +3225,22 @@ if checked: hostname = gajim.connections[self.account].new_account_info[ 'hostname'] - f = open(gajim.MY_CACERTS, 'a') - f.write(hostname + '\n') - f.write(self.ssl_cert + '\n\n') - f.close() - gajim.connections[self.account].new_account_info[ - 'ssl_fingerprint_sha1'] = self.ssl_fingerprint + # Check if cert is already in file + certs = '' + if os.path.isfile(gajim.MY_CACERTS): + f = open(gajim.MY_CACERTS) + certs = f.read() + f.close() + if self.ssl_cert in certs: + dialogs.ErrorDialog(_('Certificate Already in File'), + _('This certificate is already in file %s, so it\'s not added again.') % gajim.MY_CACERTS) + else: + f = open(gajim.MY_CACERTS, 'a') + f.write(hostname + '\n') + f.write(self.ssl_cert + '\n\n') + f.close() + gajim.connections[self.account].new_account_info[ + 'ssl_fingerprint_sha1'] = self.ssl_fingerprint self.notebook.set_current_page(4) # show fom page elif cur_page == 4: if self.is_form: @@ -3271,7 +3281,7 @@ self.progressbar.pulse() return True # loop forever - def new_acc_connected(self, form, is_form, ssl_msg, ssl_cert, + def new_acc_connected(self, form, is_form, ssl_msg, ssl_err, ssl_cert, ssl_fingerprint): '''connection to server succeded, present the form to the user.''' if self.update_progressbar_timeout_id is not None: @@ -3296,8 +3306,12 @@ 'SSL Error: %s\n' 'Do you still want to connect to this server?') % (hostname, ssl_msg)) - text = _('Add this certificate to the list of trusted certificates.\nSHA1 fingerprint of the certificate:\n%s') % ssl_fingerprint - self.xml.get_widget('ssl_checkbutton').set_label(text) + if ssl_err in (18, 27): + text = _('Add this certificate to the list of trusted certificates.\nSHA1 fingerprint of the certificate:\n%s') % ssl_fingerprint + self.xml.get_widget('ssl_checkbutton').set_label(text) + else: + self.xml.get_widget('ssl_checkbutton').set_no_show_all(True) + self.xml.get_widget('ssl_checkbutton').hide() self.notebook.set_current_page(3) # show SSL page else: self.notebook.set_current_page(4) # show form page Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-12-26 21:44:37 UTC (rev 9193) +++ trunk/src/gajim.py 2007-12-26 23:59:54 UTC (rev 9194) @@ -1019,11 +1019,11 @@ return def handle_event_new_acc_connected(self, account, array): - #('NEW_ACC_CONNECTED', account, (infos, is_form, ssl_msg, ssl_cert, - # ssl_fingerprint)) + #('NEW_ACC_CONNECTED', account, (infos, is_form, ssl_msg, ssl_err, + # ssl_cert, ssl_fingerprint)) if self.instances.has_key('account_creation_wizard'): self.instances['account_creation_wizard'].new_acc_connected(array[0], - array[1], array[2], array[3], array[4]) + array[1], array[2], array[3], array[4], array[5]) def handle_event_new_acc_not_connected(self, account, array): #('NEW_ACC_NOT_CONNECTED', account, (reason)) @@ -2191,25 +2191,39 @@ instance.unique_room_id_error(data[0]) def handle_event_ssl_error(self, account, data): - # ('SSL_ERROR', account, (text, cert, sha1_fingerprint)) + # ('SSL_ERROR', account, (text, errnum, cert, sha1_fingerprint)) server = gajim.config.get_per('accounts', account, 'hostname') - def on_ok(is_checked): + def on_ok(is_checked=False): if is_checked: - f = open(gajim.MY_CACERTS, 'a') - f.write(server + '\n') - f.write(data[1] + '\n\n') - f.close() + # Check if cert is already in file + certs = '' + if os.path.isfile(gajim.MY_CACERTS): + f = open(gajim.MY_CACERTS) + certs = f.read() + f.close() + if data[2] in certs: + dialogs.ErrorDialog(_('Certificate Already in File'), + _('This certificate is already in file %s, so it\'s not added again.') % gajim.MY_CACERTS) + else: + f = open(gajim.MY_CACERTS, 'a') + f.write(server + '\n') + f.write(data[2] + '\n\n') + f.close() gajim.config.set_per('accounts', account, 'ssl_fingerprint_sha1', - data[2]) + data[3]) gajim.connections[account].ssl_certificate_accepted() def on_cancel(): gajim.connections[account].disconnect(on_purpose=True) self.handle_event_status(account, 'offline') pritext = _('Error verifying SSL certificate') sectext = _('There was an error verifying the SSL certificate of your jabber server: %(error)s\nDo you still want to connect to this server?') % {'error': data[0]} - checktext = _('Add this certificate to the list of trusted certificates.\nSHA1 fingerprint of the certificate:\n%s') % data[2] - dialogs.ConfirmationDialogCheck(pritext, sectext, checktext, - on_response_ok=on_ok, on_response_cancel=on_cancel) + if data[1] in (18, 27): + checktext = _('Add this certificate to the list of trusted certificates.\nSHA1 fingerprint of the certificate:\n%s') % data[3] + dialogs.ConfirmationDialogCheck(pritext, sectext, checktext, + on_response_ok=on_ok, on_response_cancel=on_cancel) + else: + dialogs.ConfirmationDialog(pritext, sectext, + on_response_ok=on_ok, on_response_cancel=on_cancel) def handle_event_fingerprint_error(self, account, data): # ('FINGERPRINT_ERROR', account, (fingerprint,))

1 0

[commit-gajim] r9193 - trunk/src
by asterix＠gajim.org 26 Dec '07

26 Dec '07

Author: asterix Date: 2007-12-26 22:44:37 +0100 (Wed, 26 Dec 2007) New Revision: 9193 Modified: trunk/src/config.py Log: check if relogin or resend presence is needed when we close accounts window. fixes #3637 Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-12-26 21:30:45 UTC (rev 9192) +++ trunk/src/config.py 2007-12-26 21:44:37 UTC (rev 9193) @@ -1352,6 +1352,7 @@ del gajim.interface.instances['accounts'] def on_close_button_clicked(self, widget): + self.check_resend_relog() self.window.destroy() def __init__(self): @@ -1399,6 +1400,7 @@ def on_accounts_window_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Escape: + self.check_resend_relog() self.window.destroy() def select_account(self, account): @@ -1428,37 +1430,7 @@ status = gajim.connections[self.current_account].status gajim.connections[self.current_account].change_status(show, status) - def on_accounts_treeview_cursor_changed(self, widget): - '''Activate modify buttons when a row is selected, update accounts info''' - sel = self.accounts_treeview.get_selection() - (model, iter) = sel.get_selected() - if iter: - account = model[iter][0].decode('utf-8') - else: - account = None - if self.current_account and self.current_account == account: - # We're comming back to our current account, no need to update widgets - return - # Save config for previous account if needed cause focus_out event is - # called after the changed event - if self.current_account: - focused_widget = self.window.get_focus() - focused_widget_name = focused_widget.get_name() - if focused_widget_name in ('jid_entry1', 'resource_entry1', - 'custom_port_entry'): - if focused_widget_name == 'jid_entry1': - func = self.on_jid_entry1_focus_out_event - elif focused_widget_name == 'resource_entry1': - func = self.on_resource_entry1_focus_out_event - elif focused_widget_name == 'custom_port_entry': - func = self.on_custom_port_entry_focus_out_event - if func(focused_widget, None): - # Error detected in entry, don't change account, re-put cursor on - # previous row - self.select_account(self.current_account) - return True - self.window.set_focus(widget) - + def check_resend_relog(self): if self.need_relogin and self.current_account == gajim.ZEROCONF_ACC_NAME: if gajim.connections.has_key(gajim.ZEROCONF_ACC_NAME): gajim.connections[gajim.ZEROCONF_ACC_NAME].update_details() @@ -1497,6 +1469,40 @@ self.need_relogin = False self.resend_presence = False + + def on_accounts_treeview_cursor_changed(self, widget): + '''Activate modify buttons when a row is selected, update accounts info''' + sel = self.accounts_treeview.get_selection() + (model, iter) = sel.get_selected() + if iter: + account = model[iter][0].decode('utf-8') + else: + account = None + if self.current_account and self.current_account == account: + # We're comming back to our current account, no need to update widgets + return + # Save config for previous account if needed cause focus_out event is + # called after the changed event + if self.current_account: + focused_widget = self.window.get_focus() + focused_widget_name = focused_widget.get_name() + if focused_widget_name in ('jid_entry1', 'resource_entry1', + 'custom_port_entry'): + if focused_widget_name == 'jid_entry1': + func = self.on_jid_entry1_focus_out_event + elif focused_widget_name == 'resource_entry1': + func = self.on_resource_entry1_focus_out_event + elif focused_widget_name == 'custom_port_entry': + func = self.on_custom_port_entry_focus_out_event + if func(focused_widget, None): + # Error detected in entry, don't change account, re-put cursor on + # previous row + self.select_account(self.current_account) + return True + self.window.set_focus(widget) + + self.check_resend_relog() + self.remove_button.set_sensitive(True) self.rename_button.set_sensitive(True) if iter: @@ -2068,7 +2074,8 @@ custom_port) def on_gpg_choose_button_clicked(self, widget, data = None): - if gajim.connections.has_key(self.current_account): + if gajim.connections.has_key(self.current_account) and \ + gajim.connections[self.current_account].gpg: secret_keys = gajim.connections[self.current_account].\ ask_gpg_secrete_keys()

1 0

[commit-gajim] r9192 - in trunk: . src/common
by asterix＠gajim.org 26 Dec '07

26 Dec '07

Author: asterix Date: 2007-12-26 22:30:45 +0100 (Wed, 26 Dec 2007) New Revision: 9192 Modified: trunk/configure.ac trunk/src/common/defs.py trunk/src/common/optparser.py Log: create caps_cache table if it doesn't exists. fixes #3641 Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2007-12-26 19:25:29 UTC (rev 9191) +++ trunk/configure.ac 2007-12-26 21:30:45 UTC (rev 9192) @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.11.4.0-svn],[http://trac.gajim.org/],[gajim]) + [0.11.4.1-svn],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AM_INIT_AUTOMAKE([1.8]) AC_CONFIG_HEADER(config.h) Modified: trunk/src/common/defs.py =================================================================== --- trunk/src/common/defs.py 2007-12-26 19:25:29 UTC (rev 9191) +++ trunk/src/common/defs.py 2007-12-26 21:30:45 UTC (rev 9192) @@ -2,7 +2,7 @@ datadir = '../' -version = '0.11.4.0-svn' +version = '0.11.4.1-svn' import sys, os.path for base in ('.', 'common'): Modified: trunk/src/common/optparser.py =================================================================== --- trunk/src/common/optparser.py 2007-12-26 19:25:29 UTC (rev 9191) +++ trunk/src/common/optparser.py 2007-12-26 21:30:45 UTC (rev 9192) @@ -174,8 +174,8 @@ self.update_config_to_01115() if old < [0, 11, 2, 1] and new >= [0, 11, 2, 1]: self.update_config_to_01121() - if old < [0, 11, 2, 2] and new >= [0, 11, 2, 2]: - self.update_config_to_01122() + if old < [0, 11, 4, 1] and new >= [0, 11, 4, 1]: + self.update_config_to_01141() gajim.logger.init_vars() gajim.config.set('version', new_version) @@ -503,7 +503,7 @@ gajim.config.set('version', '0.11.2.1') - def update_config_to_01122(self): + def update_config_to_01141(self): back = os.getcwd() os.chdir(logger.LOG_DB_FOLDER) con = sqlite.connect(logger.LOG_DB_FILE) @@ -524,5 +524,5 @@ except sqlite.OperationalError, e: pass con.close() - gajim.config.set('version', '0.11.2.2') + gajim.config.set('version', '0.11.4.1')

1 0

[commit-gajim] r9191 - trunk/src
by asterix＠gajim.org 26 Dec '07

26 Dec '07

Author: asterix Date: 2007-12-26 20:25:29 +0100 (Wed, 26 Dec 2007) New Revision: 9191 Modified: trunk/src/music_track_listener.py Log: [js] fix MRPIS behaviour Modified: trunk/src/music_track_listener.py =================================================================== --- trunk/src/music_track_listener.py 2007-12-24 10:24:52 UTC (rev 9190) +++ trunk/src/music_track_listener.py 2007-12-26 19:25:29 UTC (rev 9191) @@ -128,19 +128,37 @@ def _mpris_properties_extract(self, song): info = MusicTrackInfo() - info.title = song['title'] - info.album = song['album'] - info.artist = song['artist'] - info.duration = int(song['length']) + + if song.has_key('title'): + info.title = song['title'] + else: + info.title = '' + + if song.has_key('album'): + info.album = song['album'] + else: + info.album = '' + + if song.has_key('artist'): + info.artist = song['artist'] + else: + info.artist = '' + + if song.has_key('length'): + info.duration = int(song['length']) + else: + info.duration = 0 + return info def _mpris_playing_changed_cb(self, playing): - if playing == 2: + if playing == 0: + self.emit('music-track-changed', self._last_playing_music) + else: self.emit('music-track-changed', None) def _mpris_music_track_change_cb(self, arg): - info = self._mpris_properties_extract(arg) - self.emit('music-track-changed', info) + self._last_playing_music = self._mpris_properties_extract(arg) def _muine_properties_extract(self, song_string): d = dict((x.strip() for x in s1.split(':', 1)) for s1 in \

1 0

[commit-gajim] r9190 - trunk/src
by asterix＠gajim.org 24 Dec '07

24 Dec '07

Author: asterix Date: 2007-12-24 11:24:52 +0100 (Mon, 24 Dec 2007) New Revision: 9190 Modified: trunk/src/features_window.py Log: don't fail when we scroll features window with no row selected Modified: trunk/src/features_window.py =================================================================== --- trunk/src/features_window.py 2007-12-22 22:50:26 UTC (rev 9189) +++ trunk/src/features_window.py 2007-12-24 10:24:52 UTC (rev 9190) @@ -141,6 +141,8 @@ def on_features_treeview_cursor_changed(self, widget): selection = widget.get_selection() + if not selection: + return path = selection.get_selected_rows()[1][0] available = self.model[path][1] feature = self.model[path][0].decode('utf-8')

1 0

← Newer
1
2
3
4
5
6
7
...
15
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 December 2007