Commits December 2012

commits@gajim.org

3 participants
51 discussions

gajim: fix profile window
by Denis Fomin 31 Dec '12

31 Dec '12

changeset ce5f737fb212 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ce5f737fb212 description: fix profile window diffstat: src/dialogs.py | 9 +++++---- src/profile_window.py | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diffs (73 lines): diff -r 38add2b37075 -r ce5f737fb212 src/dialogs.py --- a/src/dialogs.py Mon Dec 31 20:13:35 2012 +0400 +++ b/src/dialogs.py Mon Dec 31 21:14:21 2012 +0400 @@ -1458,9 +1458,9 @@ select_multiple=False, current_folder=None, on_response_ok=None, on_response_cancel=None): - GObject.GObject.__init__(self, title=title_text, action=action, - buttons=buttons) - + GObject.GObject.__init__(self, title=title_text, action=action) + self.add_button(buttons[0],buttons[1]) + self.add_button(buttons[2],buttons[3]) self.set_default_response(default_response) self.set_select_multiple(select_multiple) if current_folder and os.path.isdir(current_folder): @@ -4702,7 +4702,8 @@ if path_to_file is None or os.path.isdir(path_to_file): # nothing to preview or directory # make sure you clean image do show nothing - widget.get_preview_widget().set_from_file(None) + preview = widget.get_preview_widget() + preview.clear() return try: pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(path_to_file, 100, 100) diff -r 38add2b37075 -r ce5f737fb212 src/profile_window.py --- a/src/profile_window.py Mon Dec 31 20:13:35 2012 +0400 +++ b/src/profile_window.py Mon Dec 31 21:14:21 2012 +0400 @@ -23,6 +23,7 @@ # THIS FILE IS FOR **OUR** PROFILE (when we edit our INFO) from gi.repository import Gtk +from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import GObject import base64 @@ -46,7 +47,7 @@ def __init__(self, account, transient_for=None): self.xml = gtkgui_helpers.get_gtk_builder('profile_window.ui') self.window = self.xml.get_object('profile_window') - self.set_transient_for(transient_for) + self.window.set_transient_for(transient_for) self.progressbar = self.xml.get_object('progressbar') self.statusbar = self.xml.get_object('statusbar') self.context_id = self.statusbar.get_context_id('profile') @@ -84,7 +85,7 @@ return True # loop forever def remove_statusbar(self, message_id): - self.statusbar.remove_message(self.context_id, message_id) + self.statusbar.remove(self.context_id, message_id) self.remove_statusbar_timeout_id = None def on_profile_window_destroy(self, widget): @@ -288,7 +289,7 @@ self.set_value(i + '_entry', vcard_[i]) if self.update_progressbar_timeout_id is not None: if self.message_id: - self.statusbar.remove_message(self.context_id, self.message_id) + self.statusbar.remove(self.context_id, self.message_id) self.message_id = self.statusbar.push(self.context_id, _('Information received')) self.remove_statusbar_timeout_id = GObject.timeout_add_seconds(3, @@ -398,7 +399,7 @@ if obj.conn.name != self.account: return if self.message_id: - self.statusbar.remove_message(self.context_id, self.message_id) + self.statusbar.remove(self.context_id, self.message_id) self.message_id = self.statusbar.push(self.context_id, _('Information NOT published')) self.remove_statusbar_timeout_id = GObject.timeout_add_seconds(3,

1 0

gajim: fix plugin window
by Denis Fomin 31 Dec '12

31 Dec '12

changeset 38add2b37075 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=38add2b37075 description: fix plugin window diffstat: data/gui/plugins_window.ui | 4 +++- src/plugins/gui.py | 14 ++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diffs (61 lines): diff -r 3811c43b31b8 -r 38add2b37075 data/gui/plugins_window.ui --- a/data/gui/plugins_window.ui Mon Dec 31 19:38:32 2012 +0400 +++ b/data/gui/plugins_window.ui Mon Dec 31 20:13:35 2012 +0400 @@ -115,8 +115,10 @@ <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">&lt;empty&gt;</property> - <property name="use_markup">True</property> <property name="selectable">True</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="expand">False</property> diff -r 3811c43b31b8 -r 38add2b37075 src/plugins/gui.py --- a/src/plugins/gui.py Mon Dec 31 19:38:32 2012 +0400 +++ b/src/plugins/gui.py Mon Dec 31 20:13:35 2012 +0400 @@ -56,7 +56,7 @@ '''Initialize Plugins window''' self.xml = gtkgui_helpers.get_gtk_builder('plugins_window.ui') self.window = self.xml.get_object('plugins_window') - self.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(gajim.interface.roster.window) widgets_to_extract = ('plugins_notebook', 'plugin_name_label', 'plugin_version_label', 'plugin_authors_label', @@ -67,10 +67,6 @@ for widget_name in widgets_to_extract: setattr(self, widget_name, self.xml.get_object(widget_name)) - attr_list = Pango.AttrList() - attr_list.insert(Pango.AttrWeight(Pango.Weight.BOLD, 0, -1)) - self.plugin_name_label.set_attributes(attr_list) - self.installed_plugins_model = Gtk.ListStore(GObject.TYPE_PYOBJECT, GObject.TYPE_STRING, GObject.TYPE_BOOLEAN, GObject.TYPE_BOOLEAN, GdkPixbuf.Pixbuf) @@ -80,9 +76,9 @@ renderer = Gtk.CellRendererText() col = Gtk.TreeViewColumn(_('Plugin'))#, renderer, text=NAME) cell = Gtk.CellRendererPixbuf() - col.pack_start(cell, False, True, 0) + col.pack_start(cell, False) col.add_attribute(cell, 'pixbuf', ICON) - col.pack_start(renderer, True, True, 0) + col.pack_start(renderer, True) col.add_attribute(renderer, 'text', NAME) self.installed_plugins_treeview.append_column(col) @@ -105,7 +101,9 @@ self._clear_installed_plugin_info() self.fill_installed_plugins_model() - selection.select_iter(self.installed_plugins_model.get_iter_first()) + root_iter = self.installed_plugins_model.get_iter_first() + if root_iter: + selection.select_iter(root_iter ) self.xml.connect_signals(self)

1 0

gajim: fix pixbuf saves and missing import
by Denis Fomin 31 Dec '12

31 Dec '12

changeset 3811c43b31b8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3811c43b31b8 description: fix pixbuf saves and missing import diffstat: src/gtkgui_helpers.py | 6 +++--- src/gui_interface.py | 6 +++--- src/profile_window.py | 2 +- src/vcard.py | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) diffs (82 lines): diff -r 12e91e17fdd9 -r 3811c43b31b8 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Mon Dec 31 19:05:59 2012 +0400 +++ b/src/gtkgui_helpers.py Mon Dec 31 19:38:32 2012 +0400 @@ -421,7 +421,7 @@ return None if want_type: - typ = pixbufloader.get_format()['name'] + typ = pixbufloader.get_format().get_name() return pixbuf, typ else: return pixbuf @@ -828,14 +828,14 @@ # Save image try: - pixbuf.save(file_path, image_format) + pixbuf.savev(file_path, image_format, [], []) 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' def on_ok(file_path, pixbuf): - pixbuf.save(file_path, 'jpeg') + pixbuf.savev(file_path, 'jpeg', [], []) dialogs.ConfirmationDialog(_('Extension not supported'), _('Image cannot be saved in %(type)s format. Save as ' '%(new_filename)s?') % {'type': image_format, diff -r 12e91e17fdd9 -r 3811c43b31b8 src/gui_interface.py --- a/src/gui_interface.py Mon Dec 31 19:05:59 2012 +0400 +++ b/src/gui_interface.py Mon Dec 31 19:38:32 2012 +0400 @@ -2489,7 +2489,7 @@ extension = '.png' path_to_original_file = path_to_file + extension try: - pixbuf.save(path_to_original_file, typ) + pixbuf.savev(path_to_original_file, typ, [], []) except Exception, e: log.error('Error writing avatar file %s: %s' % ( path_to_original_file, str(e))) @@ -2499,7 +2499,7 @@ path_to_normal_file = path_to_file + '_notif_size_colored' + \ extension try: - pixbuf.save(path_to_normal_file, 'png') + pixbuf.savev(path_to_normal_file, 'png', [], []) except Exception, e: log.error('Error writing avatar file %s: %s' % \ (path_to_original_file, str(e))) @@ -2509,7 +2509,7 @@ if bwbuf: path_to_bw_file = path_to_file + '_notif_size_bw' + extension try: - bwbuf.save(path_to_bw_file, 'png') + bwbuf.savev(path_to_bw_file, 'png', [], []) except Exception, e: log.error('Error writing avatar file %s: %s' % \ (path_to_original_file, str(e))) diff -r 12e91e17fdd9 -r 3811c43b31b8 src/profile_window.py --- a/src/profile_window.py Mon Dec 31 19:05:59 2012 +0400 +++ b/src/profile_window.py Mon Dec 31 19:38:32 2012 +0400 @@ -150,7 +150,7 @@ if scaled_pixbuf: path_to_file = os.path.join(gajim.TMP, 'avatar_scaled.png') - scaled_pixbuf.save(path_to_file, 'png') + scaled_pixbuf.savev(path_to_file, 'png', [], []) must_delete = True fd = open(path_to_file, 'rb') diff -r 12e91e17fdd9 -r 3811c43b31b8 src/vcard.py --- a/src/vcard.py Mon Dec 31 19:05:59 2012 +0400 +++ b/src/vcard.py Mon Dec 31 19:38:32 2012 +0400 @@ -33,6 +33,7 @@ from gi.repository import Gtk from gi.repository import GObject +from gi.repository import Gdk import base64 import time import locale

1 0

gajim: fix time in tooltips
by Denis Fomin 31 Dec '12

31 Dec '12

changeset 12e91e17fdd9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=12e91e17fdd9 description: fix time in tooltips diffstat: src/tooltips.py | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diffs (51 lines): diff -r 5aba9c99b414 -r 12e91e17fdd9 src/tooltips.py --- a/src/tooltips.py Mon Dec 31 13:48:15 2012 +0100 +++ b/src/tooltips.py Mon Dec 31 19:05:59 2012 +0400 @@ -644,8 +644,10 @@ 'tooltip_idle_color') cs += '%s' properties.append((str(), None)) - properties.append(((cs % _("Idle since %s")) % formatted, None)) - properties.append(((cs % _("Idle for %s")) % str(diff), None)) + idle_since = helpers.ensure_utf8_string(cs % _("Idle since %s")) + properties.append((idle_since % formatted, None)) + idle_for = helpers.ensure_utf8_string(cs % _("Idle for %s")) + properties.append((idle_for % str(diff), None)) while properties: property_ = properties.pop(0) @@ -658,14 +660,15 @@ if property_[1]: label.set_markup(property_[0]) vcard_table.attach(label, 1, 2, vcard_current_row, - vcard_current_row + 1, Gtk.AttachOptions.FILL, vertical_fill, 0, 0) + vcard_current_row + 1, Gtk.AttachOptions.FILL, + vertical_fill, 0, 0) label = Gtk.Label() label.set_alignment(0, 0) label.set_markup(property_[1]) label.set_line_wrap(True) vcard_table.attach(label, 2, 3, vcard_current_row, - vcard_current_row + 1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, - vertical_fill, 0, 0) + vcard_current_row + 1, Gtk.AttachOptions.EXPAND | \ + Gtk.AttachOptions.FILL, vertical_fill, 0, 0) else: if isinstance(property_[0], (unicode, str)): # FIXME: rm unicode? label.set_markup(property_[0]) @@ -673,11 +676,13 @@ else: label = property_[0] vcard_table.attach(label, 1, 3, vcard_current_row, - vcard_current_row + 1, Gtk.AttachOptions.FILL, vertical_fill, 0) + vcard_current_row + 1, Gtk.AttachOptions.FILL, + vertical_fill, 0) self.avatar_image.set_alignment(0, 0) if table_size == 4: vcard_table.attach(self.avatar_image, 3, 4, 2, - vcard_current_row + 1, Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL | Gtk.AttachOptions.EXPAND, 3, 3) + vcard_current_row + 1, Gtk.AttachOptions.FILL, + Gtk.AttachOptions.FILL | Gtk.AttachOptions.EXPAND, 3, 3) gajim.plugin_manager.gui_extension_point('roster_tooltip_populate', self, contacts, vcard_table)

1 0

gajim: fix dubble click on a boolean value in ACE
by Yann Leboulanger 31 Dec '12

31 Dec '12

changeset 5aba9c99b414 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5aba9c99b414 description: fix dubble click on a boolean value in ACE diffstat: src/advanced_configuration_window.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (20 lines): diff -r 0104896629b8 -r 5aba9c99b414 src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Mon Dec 31 13:38:08 2012 +0100 +++ b/src/advanced_configuration_window.py Mon Dec 31 13:48:15 2012 +0100 @@ -197,12 +197,12 @@ if modelrow[2] == self.types['boolean']: for key in self.right_true_dict.keys(): if self.right_true_dict[key] == modelrow[1]: - modelrow[1] = key + modelrow[1] = str(key) newval = {'False': True, 'True': False}[modelrow[1]] - if len(modelpath) > 1: - optnamerow = self.model[modelpath[0]] + if len(modelpath.get_indices()) > 1: + optnamerow = self.model[modelpath.get_indices()[0]] optname = optnamerow[0].decode('utf-8') - keyrow = self.model[modelpath[:2]] + keyrow = self.model[modelpath.get_indices()[:2]] key = keyrow[0].decode('utf-8') self.remember_option(option + '\n' + key + '\n' + optname, modelrow[1], newval)

1 0

gajim: fix about dialog
by Yann Leboulanger 31 Dec '12

31 Dec '12

changeset 0104896629b8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0104896629b8 description: fix about dialog diffstat: src/dialogs.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diffs (34 lines): diff -r be0c8201a654 -r 0104896629b8 src/dialogs.py --- a/src/dialogs.py Mon Dec 31 15:43:53 2012 +0400 +++ b/src/dialogs.py Mon Dec 31 13:38:08 2012 +0100 @@ -1275,9 +1275,11 @@ text = open(copying_file_path).read() dlg.set_license(text) + gtk_ver = '%i.%i.%i' % (Gtk.get_major_version(), + Gtk.get_minor_version(), Gtk.get_micro_version()) + gobject_ver = self.tuple2str(GObject.pygobject_version) dlg.set_comments('%s\n%s %s\n%s %s' % (_('A GTK+ Jabber/XMPP client'), - _('GTK+ Version:'), self.tuple2str(Gtk.gtk_version), \ - _('PyGTK Version:'), self.tuple2str(Gtk.pygtk_version))) + _('GTK+ Version:'), gtk_ver, _('PyGobject Version:'), gobject_ver)) dlg.set_website('http://gajim.org/') authors_file_path = self.get_path('AUTHORS') @@ -1297,12 +1299,13 @@ if thanks_file_path: authors.append('\n' + _('THANKS:')) - text = open(thanks_file_path).read() + text = helpers.ensure_utf8_string(open(thanks_file_path).read()) text_splitted = text.split('\n') text = '\n'.join(text_splitted[:-2]) # remove one english sentence # and add it manually as translatable - text += '\n%s\n' % _('Last but not least, we would like to thank all ' - 'the package maintainers.') + text += helpers.ensure_utf8_string('\n%s\n' % _('Last but not ' + 'least, we would like to thank all the package maintainers.' + )) authors.append(text) dlg.set_authors(authors)

1 0

gajim: fix ace
by Denis Fomin 31 Dec '12

31 Dec '12

changeset be0c8201a654 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=be0c8201a654 description: fix ace diffstat: src/advanced_configuration_window.py | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diffs (86 lines): diff -r 544aa46ead4e -r be0c8201a654 src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Sun Dec 30 23:49:05 2012 +0100 +++ b/src/advanced_configuration_window.py Mon Dec 31 15:43:53 2012 +0400 @@ -28,6 +28,7 @@ from gi.repository import GObject from common import gajim +from common import helpers ( OPT_TYPE, @@ -76,7 +77,7 @@ def __init__(self): self.xml = gtkgui_helpers.get_gtk_builder('advanced_configuration_window.ui') self.window = self.xml.get_object('advanced_configuration_window') - self.set_transient_for( + self.window.set_transient_for( gajim.interface.instances['preferences'].window) self.entry = self.xml.get_object('advanced_entry') self.desc_label = self.xml.get_object('advanced_desc_label') @@ -105,22 +106,22 @@ self.modelfilter.set_visible_func(self.visible_func) renderer_text = Gtk.CellRendererText() - col = treeview.insert_column_with_attributes(-1, _('Preference Name'), - renderer_text, text = 0) + col = Gtk.TreeViewColumn(_('Preference Name'), renderer_text, text = 0) + treeview.insert_column(col, -1) col.set_resizable(True) renderer_text = Gtk.CellRendererText() renderer_text.connect('edited', self.on_config_edited) - col = treeview.insert_column_with_attributes(-1, _('Value'), - renderer_text, text = 1) + col = Gtk.TreeViewColumn(_('Value'),renderer_text, text = 1) + treeview.insert_column(col, -1) col.set_cell_data_func(renderer_text, self.cb_value_column_data) col.props.resizable = True col.set_max_width(250) renderer_text = Gtk.CellRendererText() - treeview.insert_column_with_attributes(-1, _('Type'), - renderer_text, text = 2) + col = Gtk.TreeViewColumn(_('Type'), renderer_text, text = 2) + treeview.insert_column(col, -1) treeview.set_model(self.modelfilter) @@ -133,7 +134,7 @@ self.restart_label.hide() gajim.interface.instances['advanced_config'] = self - def cb_value_column_data(self, col, cell, model, iter_): + def cb_value_column_data(self, col, cell, model, iter_, data): """ Check if it's boolen or holds password stuff and if yes make the cellrenderertext not editable, else - it's editable @@ -228,8 +229,10 @@ def on_config_edited(self, cell, path, text): # convert modelfilter path to model path + path=Gtk.TreePath.new_from_string(path) modelpath = self.modelfilter.convert_path_to_child_path(path) modelrow = self.model[modelpath] + modelpath = modelpath.get_indices() option = modelrow[0].decode('utf-8') text = text.decode('utf-8') if len(modelpath) > 1: @@ -305,10 +308,14 @@ if type_ == self.types['boolean']: value = self.right_true_dict[option] else: - value = option + try: + value = str(option) + except: + value = option + value = helpers.ensure_utf8_string(value) self.model.append(parent, [name, value, type_]) - def visible_func(self, model, treeiter): + def visible_func(self, model, treeiter, data): search_string = self.entry.get_text().decode('utf-8').lower() for it in tree_model_pre_order(model, treeiter): if model[it][C_TYPE] != '':

1 0

gajim: fix one more unicode error
by Yann Leboulanger 30 Dec '12

30 Dec '12

changeset 544aa46ead4e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=544aa46ead4e description: fix one more unicode error diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 01881561712e -r 544aa46ead4e src/common/connection.py --- a/src/common/connection.py Sun Dec 30 23:47:31 2012 +0100 +++ b/src/common/connection.py Sun Dec 30 23:49:05 2012 +0100 @@ -619,7 +619,7 @@ conn=self, stanza_str=unicode(data, errors='ignore'))) elif event == nbxmpp.transports_nb.DATA_SENT: gajim.nec.push_incoming_event(StanzaSentEvent(None, conn=self, - stanza_str=unicode(data))) + stanza_str=data)) def change_status(self, show, msg, auto=False): if not msg:

1 0

gajim: [Dicson and I] fix some unicode issues
by Yann Leboulanger 30 Dec '12

30 Dec '12

changeset 01881561712e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=01881561712e description: [Dicson and I] fix some unicode issues diffstat: src/common/helpers.py | 12 ++++++++++++ src/tooltips.py | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diffs (46 lines): diff -r e55ebbfa86c7 -r 01881561712e src/common/helpers.py --- a/src/common/helpers.py Sun Dec 30 23:29:51 2012 +0100 +++ b/src/common/helpers.py Sun Dec 30 23:47:31 2012 +0100 @@ -46,6 +46,7 @@ import socket import time +from gi.repository import GObject from encodings.punycode import punycode_encode from string import Template @@ -474,6 +475,17 @@ pass return string +def wrapped_ensure_utf8_string(fn): + def wrapped(n): + return ensure_utf8_string(n) + return wrapped + +@wrapped_ensure_utf8_string +def escape_text(text): + return GObject.markup_escape_text(text) + +GObject.markup_escape_text = escape_text + def get_windows_reg_env(varname, default=''): """ Ask for paths commonly used but not exposed as ENVs in english Windows 2003 diff -r e55ebbfa86c7 -r 01881561712e src/tooltips.py --- a/src/tooltips.py Sun Dec 30 23:29:51 2012 +0100 +++ b/src/tooltips.py Sun Dec 30 23:47:31 2012 +0100 @@ -487,11 +487,11 @@ vcard_current_row = 1 properties = [] - name_markup = u'' + \ + name_markup = '' + \ GObject.markup_escape_text(prim_contact.get_shown_name())\ + '' if gajim.config.get('mergeaccounts'): - name_markup += u" (%s)" % ( + name_markup += " (%s)" % ( gajim.config.get('tooltip_account_name_color'), GObject.markup_escape_text(prim_contact.account.name))

1 0

gajim: some GTK3 fixes
by Yann Leboulanger 30 Dec '12

30 Dec '12

changeset e55ebbfa86c7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e55ebbfa86c7 description: some GTK3 fixes diffstat: src/dialogs.py | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diffs (35 lines): diff -r 200dc114404c -r e55ebbfa86c7 src/dialogs.py --- a/src/dialogs.py Fri Dec 28 22:00:24 2012 +0100 +++ b/src/dialogs.py Sun Dec 30 23:29:51 2012 +0100 @@ -201,17 +201,18 @@ column.set_expand(True) self.treeview.append_column(column) renderer = Gtk.CellRendererText() - column.pack_start(renderer, True, True, 0) - column.set_attributes(renderer, text=0) + column.pack_start(renderer, True) + column.add_attribute(renderer, 'text', 0) column = Gtk.TreeViewColumn(_('In the group')) column.set_expand(False) self.treeview.append_column(column) renderer = Gtk.CellRendererToggle() - column.pack_start(renderer, True, True, 0) + column.pack_start(renderer, True) renderer.set_property('activatable', True) renderer.connect('toggled', self.group_toggled_cb) - column.set_attributes(renderer, active=1, inconsistent=2) + column.add_attribute(renderer, 'active', 1) + column.add_attribute(renderer, 'inconsistent', 2) class PassphraseDialog: """ @@ -1963,7 +1964,7 @@ def on_okbutton_clicked(self, widget): user_input = self.get_text() if user_input: - user_input = user_input.decode('utf-8') + user_input = user_input self.cancel_handler = None self.dialog.destroy() if isinstance(self.ok_handler, tuple):

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