Commits

commits@gajim.org

17632 discussions

gajim: fix menuitem
by Denis Fomin 12 Jan '13

12 Jan '13

changeset e9215c242d1e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e9215c242d1e description: fix menuitem diffstat: src/gui_menu_builder.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 52e80f7a6cfb -r e9215c242d1e src/gui_menu_builder.py --- a/src/gui_menu_builder.py Sat Jan 12 22:00:52 2013 +0400 +++ b/src/gui_menu_builder.py Sat Jan 12 22:15:33 2013 +0400 @@ -91,7 +91,8 @@ return invite_to_submenu = Gtk.Menu() invite_menuitem.set_submenu(invite_to_submenu) - invite_to_new_room_menuitem = Gtk.ImageMenuItem(_('_New Group Chat')) + invite_to_new_room_menuitem = Gtk.ImageMenuItem.new_with_mnemonic(_( + '_New Group Chat')) icon = Gtk.Image.new_from_stock(Gtk.STOCK_NEW, Gtk.IconSize.MENU) invite_to_new_room_menuitem.set_image(icon) if len(contact_list) > 1: # several resources

1 0

gajim: fix add contact window
by Denis Fomin 12 Jan '13

12 Jan '13

changeset 52e80f7a6cfb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=52e80f7a6cfb description: fix add contact window diffstat: src/dialogs.py | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diffs (66 lines): diff -r 6298d24088d0 -r 52e80f7a6cfb src/dialogs.py --- a/src/dialogs.py Sat Jan 12 21:05:37 2013 +0400 +++ b/src/dialogs.py Sat Jan 12 22:00:52 2013 +0400 @@ -1036,7 +1036,9 @@ self._nec_gateway_prompt_received) def on_register_button_clicked(self, widget): - jid = self.protocol_jid_combobox.get_active_text() + model = self.protocol_jid_combobox.get_model() + row = self.protocol_jid_combobox.get_active() + jid = model[row][0] gajim.connections[self.account].request_register_agent_info(jid) def on_add_new_contact_window_key_press_event(self, widget, event): @@ -1058,11 +1060,12 @@ return model = self.protocol_combobox.get_model() - iter_ = self.protocol_combobox.get_active_iter() - type_ = model[iter_][2] + row = self.protocol_combobox.get_active_iter() + type_ = model[row][2] if type_ != 'jabber': - transport = self.protocol_jid_combobox.get_active_text().decode( - 'utf-8') + model = self.protocol_jid_combobox.get_model() + row = self.protocol_jid_combobox.get_active() + transport = model[row][0] if self.account: self.adding_jid = (jid, transport, type_) gajim.connections[self.account].request_gateway_prompt( @@ -1210,7 +1213,9 @@ else: self.register_hbox.hide() if type_ != 'jabber': - jid = self.protocol_jid_combobox.get_active_text() + model = self.protocol_jid_combobox.get_model() + row = self.protocol_jid_combobox.get_active() + jid = model[row][0] contact = gajim.contacts.get_first_contact_from_jid( self.account, jid) if contact.show in ('offline', 'error'): @@ -1225,7 +1230,10 @@ self.add_button.set_sensitive(True) def transport_signed_in(self, jid): - if self.protocol_jid_combobox.get_active_text() == jid: + model = self.protocol_jid_combobox.get_model() + row = self.protocol_jid_combobox.get_active() + _jid = model[row][0] + if _jid == jid: self.register_hbox.hide() self.connected_label.hide() self.subscription_table.show() @@ -1233,7 +1241,10 @@ self.add_button.set_sensitive(True) def transport_signed_out(self, jid): - if self.protocol_jid_combobox.get_active_text() == jid: + model = self.protocol_jid_combobox.get_model() + row = self.protocol_jid_combobox.get_active() + _jid = model[row][0] + if _jid == jid: self.subscription_table.hide() self.auto_authorize_checkbutton.hide() self.connected_label.show()

1 0

gajim: fix PrivacyList window
by Denis Fomin 12 Jan '13

12 Jan '13

changeset 6298d24088d0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6298d24088d0 description: fix PrivacyList window diffstat: src/dialogs.py | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diffs (83 lines): diff -r 825c36632481 -r 6298d24088d0 src/dialogs.py --- a/src/dialogs.py Sat Jan 12 15:36:20 2013 +0400 +++ b/src/dialogs.py Sat Jan 12 21:05:37 2013 +0400 @@ -4057,11 +4057,12 @@ if action == 'EDIT': self.refresh_rules() + model = self.edit_type_group_combobox.get_model() count = 0 for group in gajim.groups[self.account]: self.list_of_groups[group] = count count += 1 - self.edit_type_group_combobox.append_text(group) + model.append([group]) self.edit_type_group_combobox.set_active(0) self.window.set_title(title) @@ -4098,7 +4099,8 @@ self.privacy_list_default_checkbutton.set_active(False) def privacy_list_received(self, rules): - self.list_of_rules_combobox.get_model().clear() + model = self.list_of_rules_combobox.get_model() + model.clear() self.global_rules = {} for rule in rules: if 'type' in rule: @@ -4112,7 +4114,7 @@ if int(rule['order']) > self.max_order: self.max_order = int(rule['order']) self.global_rules[text_item] = rule - self.list_of_rules_combobox.append_text(text_item) + model.append([text_item]) if len(rules) == 0: self.title_hbox.set_sensitive(False) self.list_of_rules_combobox.set_sensitive(False) @@ -4142,9 +4144,12 @@ gajim.connections[self.account].get_privacy_list(self.privacy_list_name) def on_delete_rule_button_clicked(self, widget): + model = self.list_of_rules_combobox.get_model() + iter_ = self.list_of_rules_combobox.get_active_iter() + _rule = model[iter_][0] tags = [] for rule in self.global_rules: - if rule != self.list_of_rules_combobox.get_active_text(): + if rule != _rule: tags.append(self.global_rules[rule]) gajim.connections[self.account].set_privacy_list( self.privacy_list_name, tags) @@ -4163,8 +4168,9 @@ if active_num == -1: self.active_rule = '' else: - self.active_rule = \ - self.list_of_rules_combobox.get_active_text() + model = self.list_of_rules_combobox.get_model() + iter_ = self.list_of_rules_combobox.get_active_iter() + self.active_rule = model[iter_][0] if self.active_rule != '': rule_info = self.global_rules[self.active_rule] self.edit_order_spinbutton.set_value(int(rule_info['order'])) @@ -4277,7 +4283,9 @@ edit_value = self.edit_type_jabberid_entry.get_text() elif self.edit_type_group_radiobutton.get_active(): edit_type = 'group' - edit_value = self.edit_type_group_combobox.get_active_text() + model = self.edit_type_group_combobox.get_model() + iter_ = self.edit_type_group_combobox.get_active_iter() + edit_value = model[iter_][0] elif self.edit_type_subscription_radiobutton.get_active(): edit_type = 'subscription' subs = ['none', 'both', 'from', 'to'] @@ -4401,7 +4409,8 @@ def add_privacy_list_to_combobox(self, privacy_list): if privacy_list in self.privacy_lists_save: return - self.list_of_privacy_lists_combobox.append_text(privacy_list) + model = self.list_of_privacy_lists_combobox.get_model() + model.append([privacy_list]) self.privacy_lists_save.append(privacy_list) def draw_privacy_lists_in_combobox(self, privacy_lists):

1 0

gajim: fix change status via the combobox
by Denis Fomin 12 Jan '13

12 Jan '13

changeset 825c36632481 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=825c36632481 description: fix change status via the combobox diffstat: src/roster_window.py | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diffs (23 lines): diff -r 87cf4c45b862 -r 825c36632481 src/roster_window.py --- a/src/roster_window.py Sat Jan 12 13:34:04 2013 +0400 +++ b/src/roster_window.py Sat Jan 12 15:36:20 2013 +0400 @@ -3571,8 +3571,7 @@ if keyval == Gdk.KEY_s: # CTRL + s model = self.status_combobox.get_model() accounts = list(gajim.connections.keys()) - status = model[self.previous_status_combobox_active][2].decode( - 'utf-8') + status = model[self.previous_status_combobox_active][2] def on_response(message, pep_dict): if message is not None: # None if user pressed Cancel for account in accounts: @@ -3841,8 +3840,7 @@ not statuses_unified): # 'Change status message' selected: # do not change show, just show change status dialog - status = model[self.previous_status_combobox_active][2].decode( - 'utf-8') + status = model[self.previous_status_combobox_active][2] def on_response(message, pep_dict): if message is not None: # None if user pressed Cancel for account in accounts:

1 0

gajim: fix menu in conversation textview
by Denis Fomin 12 Jan '13

12 Jan '13

changeset 87cf4c45b862 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=87cf4c45b862 description: fix menu in conversation textview diffstat: src/conversation_textview.py | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diffs (42 lines): diff -r e2d33e5743bf -r 87cf4c45b862 src/conversation_textview.py --- a/src/conversation_textview.py Fri Jan 11 22:54:12 2013 +0400 +++ b/src/conversation_textview.py Sat Jan 12 13:34:04 2013 +0400 @@ -834,7 +834,6 @@ iter_ = self.tv.get_iter_at_location(x, y) tags = iter_.get_tags() - if tags: # we clicked on sth special (it can be status message too) for tag in tags: tag_name = tag.get_property('name') @@ -864,8 +863,8 @@ helpers.launch_browser_mailer(kind, text) def on_copy_link_activate(self, widget, text): - clip = Gtk.clipboard_get() - clip.set_text(text) + clip = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + clip.set_text(text, -1) def on_start_chat_activate(self, widget, jid): gajim.interface.new_chat_from_jid(self.account, jid) @@ -947,7 +946,8 @@ childs[0].hide() # copy link location childs[1].hide() # open link in browser - menu.popup(None, None, None, None, event.button, event.time) + menu.attach_to_widget(self.tv, None) + menu.popup(None, None, None, None, event.button.button, event.time) def hyperlink_handler(self, texttag, widget, event, iter_, kind): if event.type == Gdk.EventType.BUTTON_PRESS: @@ -972,8 +972,7 @@ kind = 'sth_at_sth' else: word = self.tv.get_buffer().get_text(begin_iter, end_iter, True) - - if event.button == 3: # right click + if event.button.button == 3: # right click self.make_link_menu(event, kind, word) return True else:

1 0

gajim: fix export in history manager
by Denis Fomin 11 Jan '13

11 Jan '13

changeset 2771bf0bedd8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2771bf0bedd8 description: fix export in history manager diffstat: src/history_manager.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 4cf7302158c0 -r 2771bf0bedd8 src/history_manager.py --- a/src/history_manager.py Thu Jan 10 17:21:05 2013 +0100 +++ b/src/history_manager.py Fri Jan 11 23:00:14 2013 +0400 @@ -458,7 +458,7 @@ if event.button == 3: # right click xml = gtkgui_helpers.get_gtk_builder('history_manager.ui', 'context_menu') - if widget.name != 'jids_listview': + if gtk.Buildable.get_name(widget) != 'jids_listview': xml.get_object('export_menuitem').hide() xml.get_object('delete_menuitem').connect('activate', self.on_delete_menuitem_activate, widget)

1 0

gajim: fix export in history manager
by Denis Fomin 11 Jan '13

11 Jan '13

changeset 65365e38d240 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=65365e38d240 description: fix export in history manager diffstat: src/history_manager.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 1cceb6e48a2d -r 65365e38d240 src/history_manager.py --- a/src/history_manager.py Thu Jan 10 17:21:05 2013 +0100 +++ b/src/history_manager.py Fri Jan 11 22:57:22 2013 +0400 @@ -458,7 +458,7 @@ if event.button == 3: # right click xml = gtkgui_helpers.get_gtk_builder('history_manager.ui', 'context_menu') - if widget.name != 'jids_listview': + if gtk.Buildable.get_name(widget) != 'jids_listview': xml.get_object('export_menuitem').hide() xml.get_object('delete_menuitem').connect('activate', self.on_delete_menuitem_activate, widget)

1 0

gajim: fix history manager
by Denis Fomin 11 Jan '13

11 Jan '13

changeset e2d33e5743bf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e2d33e5743bf description: fix history manager diffstat: src/config.py | 2 +- src/dataforms_widget.py | 2 +- src/history_manager.py | 27 ++++++++++++--------------- 3 files changed, 14 insertions(+), 17 deletions(-) diffs (138 lines): diff -r 44125d2b2cb2 -r e2d33e5743bf src/config.py --- a/src/config.py Fri Jan 11 20:44:29 2013 +0400 +++ b/src/config.py Fri Jan 11 22:54:12 2013 +0400 @@ -2942,7 +2942,7 @@ model, paths = selection.get_selected_rows() row_refs = [] for path in paths: - row_refs.append(Gtk.TreeRowReference(model, path)) + row_refs.append(Gtk.TreeRowReference.new(model, path)) for row_ref in row_refs: path = row_ref.get_path() iter_ = model.get_iter(path) diff -r 44125d2b2cb2 -r e2d33e5743bf src/dataforms_widget.py --- a/src/dataforms_widget.py Fri Jan 11 20:44:29 2013 +0400 +++ b/src/dataforms_widget.py Fri Jan 11 22:54:12 2013 +0400 @@ -279,7 +279,7 @@ model, rowrefs = selection.get_selected_rows() # rowref is a list of paths for i in list(range(len(rowrefs))): - rowrefs[i] = Gtk.TreeRowReference(model, rowrefs[i]) + rowrefs[i] = Gtk.TreeRowReference.new(model, rowrefs[i]) # rowref is a list of row references; need to convert because we will # modify the model, paths would change for rowref in rowrefs: diff -r 44125d2b2cb2 -r e2d33e5743bf src/history_manager.py --- a/src/history_manager.py Fri Jan 11 20:44:29 2013 +0400 +++ b/src/history_manager.py Fri Jan 11 22:54:12 2013 +0400 @@ -110,7 +110,7 @@ def __init__(self): pix = gtkgui_helpers.get_icon_pixmap('gajim') # set the icon to all newly opened windows - Gtk.window_set_default_icon(pix) + Gtk.Window.set_default_icon(pix) if not os.path.exists(LOG_DB_PATH): dialogs.ErrorDialog(_('Cannot find history logs database'), @@ -199,7 +199,7 @@ def _init_search_results_listview(self): # log_line_id (HIDDEN), jid, time, message, subject, nickname - self.search_results_liststore = Gtk.ListStore(str, str, str, str, str, + self.search_results_liststore = Gtk.ListStore(int, str, str, str, str, str) self.search_results_listview.set_model(self.search_results_liststore) @@ -268,7 +268,7 @@ rows = self.cur.fetchall() for row in rows: self.jids_already_in.append(row[0]) # jid - self.jids_liststore.append(row) # jid, jid_id + self.jids_liststore.append([row[0], str(row[1])]) # jid, jid_id def on_jids_listview_selection_changed(self, widget, data=None): liststore, list_of_paths = self.jids_listview.get_selection()\ @@ -285,7 +285,7 @@ list_of_rowrefs = [] for path in list_of_paths: # make them treerowrefs (it's needed) - list_of_rowrefs.append(Gtk.TreeRowReference(liststore, path)) + list_of_rowrefs.append(Gtk.TreeRowReference.new(liststore, path)) for rowref in list_of_rowrefs: # FILL THE STORE, for all rows selected path = rowref.get_path() @@ -384,8 +384,7 @@ log_line_id, jid_id, time_, kind, message, subject, nickname, \ show = row try: - time_ = time.strftime('%x', time.localtime(float(time_)) - ).decode(locale.getpreferredencoding()) + time_ = time.strftime('%x', time.localtime(float(time_))) except ValueError: pass else: @@ -414,7 +413,7 @@ message_ += ' foreground="%s"' % color message_ += '>%s</span>' % \ GObject.markup_escape_text(message) - self.logs_liststore.append((log_line_id, jid_id, time_, + self.logs_liststore.append((str(log_line_id), str(jid_id), time_, message_, subject, nickname)) def _fill_search_results_listview(self, text): @@ -438,8 +437,7 @@ # log_line_id, jid (from jid_id), time, message, subject, nickname log_line_id, jid_id, time_, message, subject, nickname = row try: - time_ = time.strftime('%x', time.localtime(float(time_)) - ).decode(locale.getpreferredencoding()) + time_ = time.strftime('%x', time.localtime(float(time_))) except ValueError: pass else: @@ -458,7 +456,7 @@ if event.button == 3: # right click xml = gtkgui_helpers.get_gtk_builder('history_manager.ui', 'context_menu') - if widget.name != 'jids_listview': + if Gtk.Buildable.get_name(widget) != 'jids_listview': xml.get_object('export_menuitem').hide() xml.get_object('delete_menuitem').connect('activate', self.on_delete_menuitem_activate, widget) @@ -511,7 +509,7 @@ list_of_rowrefs = [] for path in list_of_paths: # make them treerowrefs (it's needed) - list_of_rowrefs.append(Gtk.TreeRowReference(liststore, path)) + list_of_rowrefs.append(Gtk.TreeRowReference.new(liststore, path)) for rowref in list_of_rowrefs: path = rowref.get_path() @@ -546,8 +544,7 @@ continue try: - time_ = time.strftime('%c', time.localtime(float(time_)) - ).decode(locale.getpreferredencoding()) + time_ = time.strftime('%c', time.localtime(float(time_))) except ValueError: pass @@ -563,7 +560,7 @@ # delete all rows from db that match jid_id list_of_rowrefs = [] for path in list_of_paths: # make them treerowrefs (it's needed) - list_of_rowrefs.append(Gtk.TreeRowReference(liststore, path)) + list_of_rowrefs.append(Gtk.TreeRowReference.new(liststore, path)) for rowref in list_of_rowrefs: path = rowref.get_path() @@ -612,7 +609,7 @@ # delete rows from db that match log_line_id list_of_rowrefs = [] for path in list_of_paths: # make them treerowrefs (it's needed) - list_of_rowrefs.append(Gtk.TreeRowReference(liststore, path)) + list_of_rowrefs.append(Gtk.TreeRowReference.new(liststore, path)) for rowref in list_of_rowrefs: path = rowref.get_path()

1 0

gajim: fix ad hoc commands
by Denis Fomin 11 Jan '13

11 Jan '13

changeset 44125d2b2cb2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=44125d2b2cb2 description: fix ad hoc commands diffstat: src/adhoc_commands.py | 6 +++--- src/dataforms_widget.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diffs (37 lines): diff -r c92876fcdbb7 -r 44125d2b2cb2 src/adhoc_commands.py --- a/src/adhoc_commands.py Fri Jan 11 19:54:52 2013 +0400 +++ b/src/adhoc_commands.py Fri Jan 11 20:44:29 2013 +0400 @@ -236,7 +236,7 @@ # build the commands list radiobuttons first_radio = None for (commandnode, commandname) in self.commandlist: - radio = Gtk.RadioButton(first_radio, label=commandname) + radio = Gtk.RadioButton.new_with_label_from_widget(first_radio, commandname) radio.connect("toggled", self.on_command_radiobutton_toggled, commandnode) if not first_radio: @@ -255,9 +255,9 @@ """ Remove widgets we created. Not needed when the window is destroyed """ - def remove_widget(widget): + def remove_widget(widget, param): self.command_list_vbox.remove(widget) - self.command_list_vbox.foreach(remove_widget) + self.command_list_vbox.foreach(remove_widget, None) def stage2_close_button_clicked(self, widget): self.stage_finish() diff -r c92876fcdbb7 -r 44125d2b2cb2 src/dataforms_widget.py --- a/src/dataforms_widget.py Fri Jan 11 19:54:52 2013 +0400 +++ b/src/dataforms_widget.py Fri Jan 11 20:44:29 2013 +0400 @@ -332,7 +332,8 @@ widget """ if field.description != '': - if widget.flags() & Gtk.NO_WINDOW: + if not widget.get_window(): + #if widget.flags() & Gtk.NO_WINDOW: evbox = Gtk.EventBox() evbox.add(widget) widget = evbox

1 0

gajim: fix plugin manager
by Denis Fomin 11 Jan '13

11 Jan '13

changeset c92876fcdbb7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c92876fcdbb7 description: fix plugin manager diffstat: src/plugins/plugin.py | 3 +-- src/plugins/pluginmanager.py | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diffs (36 lines): diff -r 5d6e2cfad8a4 -r c92876fcdbb7 src/plugins/plugin.py --- a/src/plugins/plugin.py Fri Jan 11 18:33:54 2013 +0400 +++ b/src/plugins/plugin.py Fri Jan 11 19:54:52 2013 +0400 @@ -203,8 +203,7 @@ def __init__(self, plugin): self.plugin = plugin self.FILE_PATH = os.path.join(gajim.PLUGINS_CONFIG_DIR, - self.plugin.short_name).decode('utf-8').encode( - locale.getpreferredencoding()) + self.plugin.short_name).encode(locale.getpreferredencoding()) self.data = {} @log_calls('GajimPluginConfig') diff -r 5d6e2cfad8a4 -r c92876fcdbb7 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Fri Jan 11 18:33:54 2013 +0400 +++ b/src/plugins/pluginmanager.py Fri Jan 11 19:54:52 2013 +0400 @@ -468,7 +468,10 @@ os.path.dirname(file_path)) # read metadata from manifest.ini - conf.readfp(open(manifest_path, 'r')) + conf_file = open(manifest_path) + conf.read_file(conf_file) + conf_file.close() + for option in fields: if conf.get('info', option) is '': raise configparser.NoOptionError('field empty') @@ -476,7 +479,6 @@ conf.remove_section('info') plugins_found.append(module_attr) - except TypeError: # set plugin localization try:

1 0

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