Commits December 2012

commits@gajim.org

3 participants
51 discussions

gajim: prevent traceback
by Yann Leboulanger 26 Dec '12

26 Dec '12

changeset fedfe3ab9886 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fedfe3ab9886 description: prevent traceback diffstat: src/config.py | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 38 insertions(+), 9 deletions(-) diffs (114 lines): diff -r 755703ea1187 -r fedfe3ab9886 src/config.py --- a/src/config.py Thu Dec 27 00:02:51 2012 +0100 +++ b/src/config.py Thu Dec 27 00:11:48 2012 +0100 @@ -1215,7 +1215,10 @@ model.set_value(iter_, 0, new_text) def on_msg_treeview_cursor_changed(self, widget, data = None): - (model, iter_) = self.msg_tree.get_selection().get_selected() + sel = self.msg_tree.get_selection() + if not sel: + return + (model, iter_) = sel.get_selected() if not iter_: return self.xml.get_object('delete_msg_button').set_sensitive(True) @@ -1230,7 +1233,10 @@ self.msg_tree.set_cursor(model.get_path(iter_)) def on_delete_msg_button_clicked(self, widget, data = None): - (model, iter_) = self.msg_tree.get_selection().get_selected() + sel = self.msg_tree.get_selection() + if not sel: + return + (model, iter_) = sel.get_selected() if not iter_: return buf = self.xml.get_object('msg_textview').get_buffer() @@ -1239,7 +1245,10 @@ self.xml.get_object('delete_msg_button').set_sensitive(False) def on_msg_textview_changed(self, widget, data = None): - (model, iter_) = self.msg_tree.get_selection().get_selected() + sel = self.msg_tree.get_selection() + if not sel: + return + (model, iter_) = sel.get_selected() if not iter_: return buf = self.xml.get_object('msg_textview').get_buffer() @@ -1357,7 +1366,10 @@ self.proxies_treeview.set_cursor(model.get_path(iter_)) def on_remove_proxy_button_clicked(self, widget): - (model, iter_) = self.proxies_treeview.get_selection().get_selected() + sel = self.proxies_treeview.get_selection() + if not sel: + return + (model, iter_) = sel.get_selected() if not iter_: return proxy = model[iter_][0].decode('utf-8') @@ -1412,7 +1424,11 @@ #useauth_checkbutton.set_active(False) #self.on_useauth_checkbutton_toggled(useauth_checkbutton) - (model, iter_) = widget.get_selection().get_selected() + sel = widget.get_selection() + if sel: + (model, iter_) = sel.get_selected() + else: + iter_ = None if not iter_: self.xml.get_object('proxyname_entry').set_text('') self.xml.get_object('proxytype_combobox').set_sensitive(False) @@ -1463,7 +1479,10 @@ def on_proxyname_entry_changed(self, widget): if self.block_signal: return - (model, iter_) = self.proxies_treeview.get_selection().get_selected() + sel = self.proxies_treeview.get_selection() + if not sel: + return + (model, iter_) = sel.get_selected() if not iter_: return old_name = model.get_value(iter_, 0).decode('utf-8') @@ -4182,8 +4201,12 @@ model.append((enabled, sound_ui_name, path, sound_event_config_name)) def on_treeview_sounds_cursor_changed(self, widget, data = None): - (model, iter_) = self.sound_tree.get_selection().get_selected() sounds_entry = self.xml.get_object('sounds_entry') + sel = self.sound_tree.get_selection() + if not sel: + sounds_entry.set_text('') + return + (model, iter_) = sel.get_selected() if not iter_: sounds_entry.set_text('') return @@ -4191,7 +4214,10 @@ sounds_entry.set_text(path_to_snd_file) def on_browse_for_sounds_button_clicked(self, widget, data = None): - (model, iter_) = self.sound_tree.get_selection().get_selected() + sel = self.sound_tree.get_selection() + if not sel: + return + (model, iter_) = sel.get_selected() if not iter_: return def on_ok(widget, path_to_snd_file): @@ -4223,7 +4249,10 @@ model[iter_][2] = path_to_snd_file # set new path to sounds_model def on_play_button_clicked(self, widget): - model, iter_ = self.sound_tree.get_selection().get_selected() + sel = self.sound_tree.get_selection() + if not sel: + return + model, iter_ = sel.get_selected() if not iter_: return snd_event_config_name = model[iter_][3]

1 0

gajim: gtkspell is now ok
by Yann Leboulanger 26 Dec '12

26 Dec '12

changeset 755703ea1187 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=755703ea1187 description: gtkspell is now ok diffstat: src/gtkspell.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (23 lines): diff -r d79d51d6a726 -r 755703ea1187 src/gtkspell.py --- a/src/gtkspell.py Wed Dec 26 23:55:53 2012 +0100 +++ b/src/gtkspell.py Thu Dec 27 00:02:51 2012 +0100 @@ -19,7 +19,7 @@ import ctypes import ctypes.util -import gtk +from gi.repository import Gtk gboolean = ctypes.c_int @@ -63,8 +63,8 @@ class Spell(object): def __init__(self, textview, language=None, create=True): - if not isinstance(textview, gtk.TextView): - raise TypeError("Textview must be derived from gtk.TextView") + if not isinstance(textview, Gtk.TextView): + raise TypeError("Textview must be derived from Gtk.TextView") tv = PyGObject.from_address(id(textview)).obj spell = libgtkspell.gtkspell_get_from_text_view(tv) if create:

1 0

gajim: remove session mnagement broken support
by Yann Leboulanger 26 Dec '12

26 Dec '12

changeset d79d51d6a726 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d79d51d6a726 description: remove session mnagement broken support diffstat: src/features_window.py | 15 +-------------- src/gajim.py | 26 -------------------------- 2 files changed, 1 insertions(+), 40 deletions(-) diffs (74 lines): diff -r 74df14635891 -r d79d51d6a726 src/features_window.py --- a/src/features_window.py Wed Dec 26 23:39:22 2012 +0100 +++ b/src/features_window.py Wed Dec 26 23:55:53 2012 +0100 @@ -67,10 +67,6 @@ _('Autodetection of network status.'), _('Requires gnome-network-manager and python-dbus.'), _('Feature not available under Windows.')), - _('Session Management'): (self.session_management_available, - _('Gajim session is stored on logout and restored on login.'), - _('Requires python-gnome2.'), - _('Feature not available under Windows.')), _('Password encryption'): (self.some_keyring_available, _('Passwords can be stored securely and not just in plaintext.'), _('Requires gnome-keyring and python-gnome2-desktop, or kwalletcli.'), @@ -192,22 +188,13 @@ import network_manager_listener return network_manager_listener.supported - def session_management_available(self): - if os.name == 'nt': - return False - try: - __import__('gnome.ui') - except Exception: - return False - return True - def some_keyring_available(self): if os.name == 'nt': return False if kwalletbinding.kwallet_available(): return True try: - __import__('gnomekeyring') + from gi.repository import GnomeKeyring except Exception: return False return True diff -r 74df14635891 -r d79d51d6a726 src/gajim.py --- a/src/gajim.py Wed Dec 26 23:39:22 2012 +0100 +++ b/src/gajim.py Wed Dec 26 23:55:53 2012 +0100 @@ -449,32 +449,6 @@ log.info("Encodings: d:%s, fs:%s, p:%s", sys.getdefaultencoding(), \ sys.getfilesystemencoding(), locale.getpreferredencoding()) - #if os.name != 'nt': - ## Session Management support - #try: - #import gnome.ui - #raise ImportError - #except ImportError: - #pass - #else: - #def die_cb(dummy): - #gajim.interface.roster.quit_gtkgui_interface() - #gnome.program_init('gajim', gajim.version) - #cli = gnome.ui.master_client() - #cli.connect('die', die_cb) - - #path_to_gajim_script = gtkgui_helpers.get_abspath_for_script( - #'gajim') - - #if path_to_gajim_script: - #argv = [path_to_gajim_script] - #try: - #cli.set_restart_command(argv) - #except TypeError: - ## Fedora systems have a broken gnome-python wrapper for this - ## function. - #cli.set_restart_command(len(argv), argv) - check_paths.check_and_possibly_create_paths() interface = Interface()

1 0

gajim: Cancel an IBB transfer
by Jefry Lagrange 26 Dec '12

26 Dec '12

changeset ef9f5c22d2c2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ef9f5c22d2c2 description: Cancel an IBB transfer diffstat: src/common/protocol/bytestream.py | 19 ++++++++++++++++++- src/filetransfers_window.py | 6 +++++- 2 files changed, 23 insertions(+), 2 deletions(-) diffs (67 lines): diff -r e5fc5cf2b012 -r ef9f5c22d2c2 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Tue Dec 25 18:56:05 2012 +0100 +++ b/src/common/protocol/bytestream.py Wed Dec 26 18:41:31 2012 -0400 @@ -803,6 +803,16 @@ file_props.fp = open(file_props.file_name, 'w') conn.send(rep) + def CloseIBBStream(self, file_props): + file_props.connected = False + file_props.fp.close() + file_props.stopped = True + self.connection.send(nbxmpp.Protocol('iq', + file_props.direction[1:], 'set', + payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close', + {'sid':file_props.sid})])) + + def OpenStream(self, sid, to, fp, blocksize=4096): """ Start new stream. You should provide stream id 'sid', the endpoind jid @@ -849,6 +859,9 @@ if file_props.direction[0] == '>': if file_props.paused: continue + if not file_props.connected: + #TODO: Reply with out of order error + continue chunk = file_props.fp.read(file_props.block_size) if chunk: datanode = nbxmpp.Node(nbxmpp.NS_IBB + ' data', {'sid': sid, @@ -939,6 +952,9 @@ reply.delChild('close') conn.send(reply) file_props.fp.close() + file_props.completed = file_props.received_len >= file_props.size + if not file_props.completed: + file_props.error = -1 gajim.socks5queue.complete_transfer_cb(self.name, file_props) else: conn.send(nbxmpp.Error(stanza, nbxmpp.ERR_ITEM_NOT_FOUND)) @@ -953,8 +969,9 @@ syn_id = stanza.getID() log.debug('IBBAllIqHandler called syn_id->%s' % syn_id) for file_props in FilesProp.getAllFileProp(): - if not file_props.direction: + if not file_props.direction or not file_props.connected: # It's socks5 bytestream + # Or we closed the IBB stream continue if file_props.syn_id == syn_id: if stanza.getType() == 'error': diff -r e5fc5cf2b012 -r ef9f5c22d2c2 src/filetransfers_window.py --- a/src/filetransfers_window.py Tue Dec 25 18:56:05 2012 +0100 +++ b/src/filetransfers_window.py Wed Dec 26 18:41:31 2012 -0400 @@ -943,7 +943,11 @@ account = file_props.tt_account if account not in gajim.connections: return - gajim.connections[account].disconnect_transfer(file_props) + con = gajim.connections[account] + # Check if we are in a IBB transfer + if file_props.direction: + con.CloseIBBStream(file_props) + con.disconnect_transfer(file_props) self.set_status(file_props, 'stop') def show_tooltip(self, widget):

1 0

gajim: use gobject introspection to access gupnp-igd
by Yann Leboulanger 26 Dec '12

26 Dec '12

changeset 74df14635891 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=74df14635891 description: use gobject introspection to access gupnp-igd diffstat: src/common/gajim.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diffs (15 lines): diff -r 27bada70aae0 -r 74df14635891 src/common/gajim.py --- a/src/common/gajim.py Wed Dec 26 23:08:26 2012 +0100 +++ b/src/common/gajim.py Wed Dec 26 23:39:22 2012 +0100 @@ -191,9 +191,8 @@ HAVE_UPNP_IGD = True try: - raise ImportError - import gupnp.igd - gupnp_igd = gupnp.igd.Simple() + from gi.repository import GUPnPIgd + gupnp_igd = GUPnPIgd.SimpleIgd() except ImportError: HAVE_UPNP_IGD = False

1 0

gajim: use gobject introspection to access gconf
by Yann Leboulanger 26 Dec '12

26 Dec '12

changeset 27bada70aae0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=27bada70aae0 description: use gobject introspection to access gconf diffstat: src/command_system/tools.py | 13 ++++++------- src/gtkgui_helpers.py | 9 ++++----- 2 files changed, 10 insertions(+), 12 deletions(-) diffs (63 lines): diff -r 48fe995edbdc -r 27bada70aae0 src/command_system/tools.py --- a/src/command_system/tools.py Wed Dec 26 11:19:59 2012 +0100 +++ b/src/command_system/tools.py Wed Dec 26 23:08:26 2012 +0100 @@ -25,7 +25,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. from types import * -#from glib import GError def remove(sequence, target): if isinstance(sequence, ListType): @@ -36,9 +35,9 @@ del sequence[target] def gconf(path): -# try: -# from gconf import client_get_default -# client = client_get_default() -# return client.get_string(path) -# except ImportError, GError: - pass \ No newline at end of file + try: + from gi.repository import GConf + client = GConf.Client.get_default() + return client.get_string(path) + except ImportError: + pass diff -r 48fe995edbdc -r 27bada70aae0 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Wed Dec 26 11:19:59 2012 +0100 +++ b/src/gtkgui_helpers.py Wed Dec 26 23:08:26 2012 +0100 @@ -31,7 +31,6 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf -import glib from gi.repository import GObject from gi.repository import Pango import os @@ -175,11 +174,11 @@ Xfce and last KDE it returns None on failure or else a string 'Font Size' """ try: - from gconf import client_get_default - client = client_get_default() + from gi.repository import GConf + client = GConf.Client.get_default() value = client.get_string("/desktop/gnome/interface/font_name") return value.decode("utf8") - except ImportError, glib.GError: + except ImportError: pass # try to get Xfce default font @@ -833,7 +832,7 @@ # Save image try: pixbuf.save(file_path, image_format) - except glib.GError, e: + except Exception, e: log.debug('Error saving avatar: %s' % str(e)) if os.path.exists(file_path): os.remove(file_path)

1 0

gajim: une GnomeKeyring vi gobject introspections
by Yann Leboulanger 26 Dec '12

26 Dec '12

changeset 48fe995edbdc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=48fe995edbdc description: une GnomeKeyring vi gobject introspections diffstat: src/common/exceptions.py | 12 ++++ src/common/passwords.py | 125 ++++++++++++++++++++++++++-------------------- 2 files changed, 83 insertions(+), 54 deletions(-) diffs (207 lines): diff -r 43233605baaa -r 48fe995edbdc src/common/exceptions.py --- a/src/common/exceptions.py Wed Dec 26 11:19:36 2012 +0100 +++ b/src/common/exceptions.py Wed Dec 26 11:19:59 2012 +0100 @@ -143,3 +143,15 @@ def __str__(self): return self.text + +class GnomeKeyringError(Exception): + """ + Error with Gnome Keyring + """ + + def __init__(self, error): + Exception.__init__(self) + self.error = error + + def __str__(self): + return str(self.error) diff -r 43233605baaa -r 48fe995edbdc src/common/passwords.py --- a/src/common/passwords.py Wed Dec 26 11:19:36 2012 +0100 +++ b/src/common/passwords.py Wed Dec 26 11:19:59 2012 +0100 @@ -29,11 +29,12 @@ import warnings from common import gajim from common import kwalletbinding +from common.exceptions import GnomeKeyringError USER_HAS_GNOMEKEYRING = False USER_USES_GNOMEKEYRING = False USER_HAS_KWALLETCLI = False -gnomekeyring = None +GnomeKeyring = None class PasswordStorage(object): def get_password(self, account_name): @@ -61,13 +62,15 @@ class GnomePasswordStorage(PasswordStorage): def __init__(self): - self.keyring = gnomekeyring.get_default_keyring_sync() + (err, self.keyring) = GnomeKeyring.get_default_keyring_sync() + if err != GnomeKeyring.Result.OK: + raise GnomeKeyringError(err) if self.keyring is None: self.keyring = 'login' - try: - gnomekeyring.create_sync(self.keyring, None) - except gnomekeyring.AlreadyExistsError: - pass + err = GnomeKeyring.create_sync(self.keyring, None) + if err not in (GnomeKeyring.Result.OK, + GnomeKeyring.Result.KEYRING_ALREADY_EXISTS): + raise GnomeKeyringError(err) def get_password(self, account_name): conf = gajim.config.get_per('accounts', account_name, 'password') @@ -78,62 +81,75 @@ ## migrate the password over to keyring try: self.save_password(account_name, password, update=False) - except gnomekeyring.NoKeyringDaemonError: - ## no keyring daemon: in the future, stop using it - set_storage(SimplePasswordStorage()) + except GnomeKeyringError, e: + if e.error == GnomeKeyring.Result.NO_KEYRING_DAEMON: + ## no keyring daemon: in the future, stop using it + set_storage(SimplePasswordStorage()) return password - try: - server = gajim.config.get_per('accounts', account_name, 'hostname') - user = gajim.config.get_per('accounts', account_name, 'name') - attributes1 = dict(server=str(server), user=str(user), protocol='xmpp') - attributes2 = dict(account_name=str(account_name), gajim=1) - try: - items = gnomekeyring.find_items_sync( - gnomekeyring.ITEM_NETWORK_PASSWORD, attributes1) - except gnomekeyring.Error: - try: - items = gnomekeyring.find_items_sync( - gnomekeyring.ITEM_GENERIC_SECRET, attributes2) - if items: - # We found an old item, move it to new way of storing - password = items[0].secret - self.save_password(account_name, password) - gnomekeyring.item_delete_sync(items[0].keyring, - int(items[0].item_id)) - except gnomekeyring.Error: - items = [] - if len(items) > 1: - warnings.warn("multiple gnome keyring items found for account %s;" - " trying to use the first one..." - % account_name) - if items: - return items[0].secret + server = gajim.config.get_per('accounts', account_name, 'hostname') + user = gajim.config.get_per('accounts', account_name, 'name') + attributes1 = GnomeKeyring.attribute_list_new() + GnomeKeyring.attribute_list_append_string(attributes1, 'server', + str(server)) + GnomeKeyring.attribute_list_append_string(attributes1, 'user', + str(user)) + GnomeKeyring.attribute_list_append_string(attributes1, 'protocol', + 'xmpp') + attributes2 = GnomeKeyring.attribute_list_new() + GnomeKeyring.attribute_list_append_string(attributes2, 'account_name', + str(account_name)) + GnomeKeyring.attribute_list_append_string(attributes2, 'gajim', + '1') + (err, items) = GnomeKeyring.find_items_sync( + GnomeKeyring.ItemType.NETWORK_PASSWORD, attributes1) + if err != GnomeKeyring.Result.OK: + (err, items) = GnomeKeyring.find_items_sync( + GnomeKeyring.ItemType.GENERIC_SECRET, attributes2) + if err == GnomeKeyring.Result.OK and len(items) > 0: + password = items[0].secret + self.save_password(account_name, password) + for item in items: + GnomeKeyring.item_delete_sync(item.keyring, + int(item.item_id)) else: - return None - except gnomekeyring.DeniedError: + items = [] + if len(items) > 1: + warnings.warn("multiple gnome keyring items found for account %s;" + " trying to use the first one..." % account_name) + if items: + return items[0].secret + else: return None - except gnomekeyring.NoKeyringDaemonError: + if err == GnomeKeyring.Result.NO_KEYRING_DAEMON: ## no keyring daemon: in the future, stop using it set_storage(SimplePasswordStorage()) - return None + return None def save_password(self, account_name, password, update=True): server = gajim.config.get_per('accounts', account_name, 'hostname') user = gajim.config.get_per('accounts', account_name, 'name') display_name = _('XMPP account %s@%s') % (user, server) - attributes1 = dict(server=str(server), user=str(user), protocol='xmpp') + attributes1 = GnomeKeyring.attribute_list_new() + GnomeKeyring.attribute_list_append_string(attributes1, 'server', + str(server)) + GnomeKeyring.attribute_list_append_string(attributes1, 'user', + str(user)) + GnomeKeyring.attribute_list_append_string(attributes1, 'protocol', + 'xmpp') if password is None: password = str() - try: - auth_token = gnomekeyring.item_create_sync( - self.keyring, gnomekeyring.ITEM_NETWORK_PASSWORD, - display_name, attributes1, password, update) - except gnomekeyring.DeniedError: - set_storage(SimplePasswordStorage()) - storage.save_password(account_name, password) - return + (err, auth_token) = GnomeKeyring.item_create_sync(self.keyring, + GnomeKeyring.ItemType.NETWORK_PASSWORD, display_name, attributes1, + password, update) + if err != GnomeKeyring.Result.OK: + if err == GnomeKeyring.Result.DENIED: + set_storage(SimplePasswordStorage()) + storage.save_password(account_name, password) + return + else: + raise GnomeKeyringError(err) gajim.config.set_per('accounts', account_name, 'password', - 'gnomekeyring:') + 'gnomekeyring:') if account_name in gajim.connections: gajim.connections[account_name].password = password @@ -181,24 +197,25 @@ global storage if storage is None: # None is only in first time get_storage is called if gajim.config.get('use_gnomekeyring'): - global gnomekeyring + global GnomeKeyring try: - gnomekeyring = __import__('gnomekeyring') + gir = __import__('gi.repository', globals(), locals(), + ['GnomeKeyring'], -1) + GnomeKeyring = gir.GnomeKeyring except ImportError: pass else: global USER_HAS_GNOMEKEYRING global USER_USES_GNOMEKEYRING USER_HAS_GNOMEKEYRING = True - if gnomekeyring.is_available(): + if GnomeKeyring.is_available(): USER_USES_GNOMEKEYRING = True else: USER_USES_GNOMEKEYRING = False if USER_USES_GNOMEKEYRING: try: storage = GnomePasswordStorage() - except (gnomekeyring.NoKeyringDaemonError, gnomekeyring.DeniedError, - gnomekeyring.CancelledError): + except GnomeKeyringError: storage = None if storage is None: if gajim.config.get('use_kwalletcli'):

1 0

gajim: fix some GTK calls
by Yann Leboulanger 26 Dec '12

26 Dec '12

changeset 43233605baaa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=43233605baaa description: fix some GTK calls diffstat: src/dialogs.py | 2 +- src/roster_window.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diffs (47 lines): diff -r 580833a487c3 -r 43233605baaa src/dialogs.py --- a/src/dialogs.py Tue Dec 25 18:56:05 2012 +0100 +++ b/src/dialogs.py Wed Dec 26 11:19:36 2012 +0100 @@ -235,7 +235,7 @@ cancelbutton.connect('clicked', self.on_cancelbutton_clicked) self.xml.connect_signals(self) - self.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(gajim.interface.roster.window) self.window.show_all() self.check = bool(checkbuttontext) diff -r 580833a487c3 -r 43233605baaa src/roster_window.py --- a/src/roster_window.py Tue Dec 25 18:56:05 2012 +0100 +++ b/src/roster_window.py Wed Dec 26 11:19:36 2012 +0100 @@ -2279,7 +2279,7 @@ else: # No need to redraw contacts if we're quitting if child_iterA: - self.model[child_iterA][C_AVATAR_PIXBUF] = None + self.model[child_iterA][C_AVATAR_PIXBUF] = '' if account in gajim.con_types: gajim.con_types[account] = None for jid in gajim.contacts.get_jid_list(account): @@ -2343,10 +2343,12 @@ table = {'offline':9, 'connecting':9, 'online':0, 'chat':1, 'away':2, 'xa':3, 'dnd':4, 'invisible':5} + liststore = self.status_combobox.get_model() # we check if there are more options in the combobox that it should # if yes, we remove the first ones - while len(self.status_combobox.get_model()) > len(table)+2: - self.status_combobox.remove_text(0) + while len(liststore) > len(table)+2: + titer = liststore.get_iter_first() + liststore.remove(titer) show = helpers.get_global_show() # temporarily block signal in order not to send status that we show @@ -2356,7 +2358,6 @@ self.status_combobox.set_active(table[show]) else: uf_show = helpers.get_uf_show(show) - liststore = self.status_combobox.get_model() liststore.prepend(['SEPARATOR', None, '', True]) status_combobox_text = uf_show + ' (' + _("desync'ed") +')' liststore.prepend([status_combobox_text,

1 0

gajim: fix config names. Fixes #7276
by Yann Leboulanger 25 Dec '12

25 Dec '12

changeset 580833a487c3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=580833a487c3 description: fix config names. Fixes #7276 diffstat: src/common/connection.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r d115b393d09e -r 580833a487c3 src/common/connection.py --- a/src/common/connection.py Tue Dec 25 18:18:39 2012 +0100 +++ b/src/common/connection.py Tue Dec 25 18:56:05 2012 +0100 @@ -2384,7 +2384,7 @@ if not change_nick: t = p.setTag(nbxmpp.NS_MUC + ' x') tags = {} - timeout = gajim.config.get_per('room', room_jid, + timeout = gajim.config.get_per('rooms', room_jid, 'muc_restore_timeout') if timeout is None or timeout == -2: timeout = gajim.config.get('muc_restore_timeout') @@ -2398,7 +2398,7 @@ last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime( last_date)) tags['since'] = last_date - nb = gajim.config.get_per('room', room_jid, 'muc_restore_lines') + nb = gajim.config.get_per('rooms', room_jid, 'muc_restore_lines') if nb is None or nb == -2: nb = gajim.config.get('muc_restore_lines') if nb >= 0:

1 0

gajim: correctly get SSL certificate from nbxmpp. Fixes #7283
by Yann Leboulanger 25 Dec '12

25 Dec '12

changeset d115b393d09e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d115b393d09e description: correctly get SSL certificate from nbxmpp. Fixes #7283 diffstat: src/common/connection.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (32 lines): diff -r d343c934b40a -r d115b393d09e src/common/connection.py --- a/src/common/connection.py Sun Dec 23 17:48:11 2012 +0100 +++ b/src/common/connection.py Tue Dec 25 18:18:39 2012 +0100 @@ -1334,7 +1334,7 @@ if con.Connection.ssl_fingerprint_sha1[-1] != saved_fingerprint: gajim.nec.push_incoming_event(FingerprintErrorEvent(None, conn=self, - certificate=con.Connection.ssl_certificate, + certificate=con.Connection.ssl_certificate[-1], new_fingerprint=con.Connection.ssl_fingerprint_sha1[ -1])) return True @@ -1342,8 +1342,8 @@ gajim.config.set_per('accounts', self.name, 'ssl_fingerprint_sha1', con.Connection.ssl_fingerprint_sha1[-1]) - if not check_X509.check_certificate(con.Connection.ssl_certificate, - hostname) and '100' not in gajim.config.get_per('accounts', + if not check_X509.check_certificate(con.Connection.ssl_certificate[ + -1], hostname) and '100' not in gajim.config.get_per('accounts', self.name, 'ignore_ssl_errors').split(): txt = _('The authenticity of the %s certificate could be ' 'invalid.\nThe certificate does not cover this domain.') % \ @@ -1352,7 +1352,7 @@ error_text=txt, error_num=100, cert=con.Connection.ssl_cert_pem[-1], fingerprint=con.Connection.ssl_fingerprint_sha1[-1], - certificate=con.Connection.ssl_certificate)) + certificate=con.Connection.ssl_certificate[-1])) return True self._register_handlers(con, con_type)

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 2012