Commits

commits@gajim.org

17632 discussions

gajim: Merge
by Denis Fomin 03 Jan '13

03 Jan '13

changeset c22cbb47abd8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c22cbb47abd8 description: Merge diffstat: src/dialogs.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diffs (54 lines): diff -r a5a62ce905af -r c22cbb47abd8 src/dialogs.py --- a/src/dialogs.py Thu Jan 03 19:42:44 2013 +0100 +++ b/src/dialogs.py Thu Jan 03 23:07:51 2013 +0400 @@ -374,12 +374,13 @@ act = category + '_other' if group: - rbtns[act] = Gtk.RadioButton(group) + rbtns[act] = new = Gtk.RadioButton() + new.join_group(group) else: rbtns[act] = group = Gtk.RadioButton() hbox = Gtk.HBox(False, 5) - hbox.pack_start(gtkgui_helpers.load_activity_icon(category, True, True, 0), False, + hbox.pack_start(gtkgui_helpers.load_activity_icon(category, activity), False, False, 0) lbl = Gtk.Label(label='<b>' + pep.ACTIVITIES[category]['category'] + '</b>') lbl.set_use_markup(True) @@ -393,7 +394,6 @@ for activity in pep.ACTIVITIES[category]: activities.append(activity) activities.sort() - for activity in activities: if activity == 'category': continue @@ -401,14 +401,15 @@ act = category + '_' + activity if group: - rbtns[act] = Gtk.RadioButton(group) + rbtns[act] = new = Gtk.RadioButton() + new.join_group(group) else: rbtns[act] = group = Gtk.RadioButton() hbox = Gtk.HBox(False, 5) hbox.pack_start(gtkgui_helpers.load_activity_icon(category, activity), False, False, 0) - hbox.pack_start(Gtk.Label(pep.ACTIVITIES[category][activity], True, True, 0), + hbox.pack_start(Gtk.Label(pep.ACTIVITIES[category][activity]), False, False, 0) rbtns[act].connect('toggled', self.on_rbtn_toggled, [category, activity]) @@ -638,7 +639,7 @@ self.message_combobox = self.xml.get_object('message_combobox') self.message_combobox.set_model(self.message_liststore) cellrenderertext = Gtk.CellRendererText() - self.message_combobox.pack_start(cellrenderertext, True, True, 0) + self.message_combobox.pack_start(cellrenderertext, True) self.message_combobox.add_attribute(cellrenderertext, 'text', 0) for msg_name in sorted_keys_list: self.message_liststore.append((msg_name,))

1 0

gajim: fix change activity window
by Denis Fomin 03 Jan '13

03 Jan '13

changeset 8af1ff025353 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8af1ff025353 description: fix change activity window diffstat: src/dialogs.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diffs (54 lines): diff -r df54e4a483f1 -r 8af1ff025353 src/dialogs.py --- a/src/dialogs.py Thu Jan 03 21:34:19 2013 +0400 +++ b/src/dialogs.py Thu Jan 03 23:01:24 2013 +0400 @@ -374,12 +374,13 @@ act = category + '_other' if group: - rbtns[act] = Gtk.RadioButton(group) + rbtns[act] = new = Gtk.RadioButton() + new.join_group(group) else: rbtns[act] = group = Gtk.RadioButton() hbox = Gtk.HBox(False, 5) - hbox.pack_start(gtkgui_helpers.load_activity_icon(category, True, True, 0), False, + hbox.pack_start(gtkgui_helpers.load_activity_icon(category, activity), False, False, 0) lbl = Gtk.Label(label='<b>' + pep.ACTIVITIES[category]['category'] + '</b>') lbl.set_use_markup(True) @@ -393,7 +394,6 @@ for activity in pep.ACTIVITIES[category]: activities.append(activity) activities.sort() - for activity in activities: if activity == 'category': continue @@ -401,14 +401,15 @@ act = category + '_' + activity if group: - rbtns[act] = Gtk.RadioButton(group) + rbtns[act] = new = Gtk.RadioButton() + new.join_group(group) else: rbtns[act] = group = Gtk.RadioButton() hbox = Gtk.HBox(False, 5) hbox.pack_start(gtkgui_helpers.load_activity_icon(category, activity), False, False, 0) - hbox.pack_start(Gtk.Label(pep.ACTIVITIES[category][activity], True, True, 0), + hbox.pack_start(Gtk.Label(pep.ACTIVITIES[category][activity]), False, False, 0) rbtns[act].connect('toggled', self.on_rbtn_toggled, [category, activity]) @@ -638,7 +639,7 @@ self.message_combobox = self.xml.get_object('message_combobox') self.message_combobox.set_model(self.message_liststore) cellrenderertext = Gtk.CellRendererText() - self.message_combobox.pack_start(cellrenderertext, True, True, 0) + self.message_combobox.pack_start(cellrenderertext, True) self.message_combobox.add_attribute(cellrenderertext, 'text', 0) for msg_name in sorted_keys_list: self.message_liststore.append((msg_name,))

1 0

gajim: fix setting option in ACE
by Yann Leboulanger 03 Jan '13

03 Jan '13

changeset a5a62ce905af in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a5a62ce905af description: fix setting option in ACE diffstat: src/advanced_configuration_window.py | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diffs (23 lines): diff -r 3a5a87ebcc0b -r a5a62ce905af src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Thu Jan 03 19:01:18 2013 +0100 +++ b/src/advanced_configuration_window.py Thu Jan 03 19:42:44 2013 +0100 @@ -232,13 +232,14 @@ 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] - if len(modelpath) > 1: - optnamerow = self.model[modelpath[0]] + if modelpath.get_depth() > 2: + modelpath.up() # Get parent + keyrow = self.model[modelpath] + key = keyrow[0] + modelpath.up() # Get parent + optnamerow = self.model[modelpath] optname = optnamerow[0] - keyrow = self.model[modelpath[:2]] - key = keyrow[0] self.remember_option(option + '\n' + key + '\n' + optname, modelrow[1], text) gajim.config.set_per(optname, key, option, text)

1 0

gajim: partly fix hmac usage
by Yann Leboulanger 03 Jan '13

03 Jan '13

changeset 3a5a87ebcc0b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3a5a87ebcc0b description: partly fix hmac usage diffstat: src/common/connection.py | 6 +++--- src/common/connection_handlers_events.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diffs (43 lines): diff -r df54e4a483f1 -r 3a5a87ebcc0b src/common/connection.py --- a/src/common/connection.py Thu Jan 03 21:34:19 2013 +0400 +++ b/src/common/connection.py Thu Jan 03 19:01:18 2013 +0100 @@ -715,7 +715,7 @@ self.private_storage_supported = True self.privacy_rules_requested = False self.streamError = '' - self.secret_hmac = str(random.random())[2:] + self.secret_hmac = str(random.random())[2:].encode('utf-8') self.sm = Smacks(self) # Stream Management @@ -2374,7 +2374,7 @@ p = nbxmpp.Presence(to='%s/%s' % (room_jid, nick), show=show, status=self.status) - h = hmac.new(self.secret_hmac, room_jid).hexdigest()[:6] + h = hmac.new(self.secret_hmac, room_jid.encode('utf-8')).hexdigest()[:6] id_ = self.connection.getAnID() id_ = 'gajim_muc_' + id_ + '_' + h p.setID(id_) @@ -2459,7 +2459,7 @@ xmpp_show = helpers.get_xmpp_show(show) p = nbxmpp.Presence(to='%s/%s' % (jid, nick), typ=ptype, show=xmpp_show, status=status) - h = hmac.new(self.secret_hmac, jid).hexdigest()[:6] + h = hmac.new(self.secret_hmac, jid.encode('utf-8')).hexdigest()[:6] id_ = self.connection.getAnID() id_ = 'gajim_muc_' + id_ + '_' + h p.setID(id_) diff -r df54e4a483f1 -r 3a5a87ebcc0b src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Jan 03 21:34:19 2013 +0400 +++ b/src/common/connection_handlers_events.py Thu Jan 03 19:01:18 2013 +0100 @@ -795,7 +795,8 @@ and self.ptype == 'error': # Error presences may not include sent stanza, so we don't detect # it's a muc presence. So detect it by ID - h = hmac.new(self.conn.secret_hmac, self.jid).hexdigest()[:6] + h = hmac.new(self.conn.secret_hmac, self.jid.encode('utf-8')).\ + hexdigest()[:6] if self.id_.split('_')[-1] == h: self.is_gc = True self.status = self.stanza.getStatus() or ''

1 0

gajim: fix time in log
by Denis Fomin 03 Jan '13

03 Jan '13

changeset df54e4a483f1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=df54e4a483f1 description: fix time in log diffstat: src/conversation_textview.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (16 lines): diff -r 50bffcc88777 -r df54e4a483f1 src/conversation_textview.py --- a/src/conversation_textview.py Thu Jan 03 21:21:38 2013 +0400 +++ b/src/conversation_textview.py Thu Jan 03 21:34:19 2013 +0400 @@ -1297,9 +1297,9 @@ # get difference in days since epoch (86400 = 24*3600) # number of days since epoch for current time (in GMT) - # number of days since epoch for message (in GMT) - diff_day = int(timegm(time.localtime())) / 86400 -\ - int(timegm(tim)) / 86400 - if diff_day == 0: + diff_day = int(int(timegm(time.localtime())) / 86400 -\ + int(timegm(tim)) / 86400) + if diff_day == 0.0: day_str = '' else: #%i is day in year (1-365)

1 0

gajim: fix clipbord
by Denis Fomin 03 Jan '13

03 Jan '13

changeset 50bffcc88777 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=50bffcc88777 description: fix clipbord diffstat: src/conversation_textview.py | 6 ++---- src/htmltextview.py | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diffs (36 lines): diff -r a6f809a46d21 -r 50bffcc88777 src/conversation_textview.py --- a/src/conversation_textview.py Thu Jan 03 21:04:54 2013 +0400 +++ b/src/conversation_textview.py Thu Jan 03 21:21:38 2013 +0400 @@ -856,8 +856,7 @@ finish_sel = iter_.copy() if not finish_sel.ends_word(): finish_sel.forward_word_end() - self.selected_phrase = buffer_.get_text(start_sel, finish_sel, True).decode( - 'utf-8') + self.selected_phrase = buffer_.get_text(start_sel, finish_sel, True) def on_open_link_activate(self, widget, kind, text): helpers.launch_browser_mailer(kind, text) @@ -970,8 +969,7 @@ # it's a JID or mail kind = 'sth_at_sth' else: - word = self.tv.get_buffer().get_text(begin_iter, end_iter, True).decode( - 'utf-8') + word = self.tv.get_buffer().get_text(begin_iter, end_iter, True) if event.button == 3: # right click self.make_link_menu(event, kind, word) diff -r a6f809a46d21 -r 50bffcc88777 src/htmltextview.py --- a/src/htmltextview.py Thu Jan 03 21:04:54 2013 +0400 +++ b/src/htmltextview.py Thu Jan 03 21:21:38 2013 +0400 @@ -904,7 +904,8 @@ # textview can be hidden while we add a new line in it. if self.has_screen(): clipboard = self.get_clipboard(Gdk.SELECTION_PRIMARY) - clipboard.set_text(self.get_selected_text()) + text = self.get_selected_text() + clipboard.set_text(text, len(text)) def get_selected_text(self): bounds = self.get_buffer().get_selection_bounds()

1 0

gajim: fix urllib
by Denis Fomin 03 Jan '13

03 Jan '13

changeset a6f809a46d21 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a6f809a46d21 description: fix urllib diffstat: src/conversation_textview.py | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diffs (24 lines): diff -r 264c08b5285c -r a6f809a46d21 src/conversation_textview.py --- a/src/conversation_textview.py Thu Jan 03 20:50:01 2013 +0400 +++ b/src/conversation_textview.py Thu Jan 03 21:04:54 2013 +0400 @@ -756,7 +756,7 @@ menu.prepend(item) submenu = Gtk.Menu() item.set_submenu(submenu) - phrase_for_url = urllib.quote(self.selected_phrase.encode('utf-8')) + phrase_for_url = urllib.parse.quote(self.selected_phrase.encode('utf-8')) always_use_en = gajim.config.get('always_english_wikipedia') if always_use_en: @@ -847,9 +847,8 @@ if return_val: # if sth was selected when we right-clicked # get the selected text start_sel, finish_sel = return_val[0], return_val[1] - self.selected_phrase = buffer_.get_text(start_sel, finish_sel, True).decode( - 'utf-8') - elif ord(iter_.get_char()) > 31: + self.selected_phrase = buffer_.get_text(start_sel, finish_sel, True) + elif iter_.get_char() and ord(iter_.get_char()) > 31: # we clicked on a word, do as if it's selected for context menu start_sel = iter_.copy() if not start_sel.starts_word():

1 0

gajim: fix get os info
by Denis Fomin 03 Jan '13

03 Jan '13

changeset 264c08b5285c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=264c08b5285c description: fix get os info diffstat: src/common/helpers.py | 4 +++- src/roster_window.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diffs (36 lines): diff -r 0bb88fc343a5 -r 264c08b5285c src/common/helpers.py --- a/src/common/helpers.py Thu Jan 03 20:09:40 2013 +0400 +++ b/src/common/helpers.py Thu Jan 03 20:50:01 2013 +0400 @@ -992,8 +992,10 @@ p.wait() output = temp_failure_retry(p.stdout.readline).strip() # some distros put n/a in places, so remove those - output = output.replace('n/a', '').replace('N/A', '') + output = output.decode('utf-8').replace('n/a', '').replace('N/A', '') gajim.os_info = output + p.stdout.close() + p.stdin.close() return output # lsb_release executable not available, so parse files diff -r 0bb88fc343a5 -r 264c08b5285c src/roster_window.py --- a/src/roster_window.py Thu Jan 03 20:09:40 2013 +0400 +++ b/src/roster_window.py Thu Jan 03 20:50:01 2013 +0400 @@ -1518,7 +1518,7 @@ self.tree.collapse_row(path) else: self.tree.expand_row(path, False) - self.modelfilter.foreach(func) + self.modelfilter.foreach(func, None) def _adjust_account_expand_collapse_state(self, account): """ @@ -4441,7 +4441,7 @@ col = self.tree.get_column(0) self.tree.set_cursor_on_cell(path, col) return True - self.modelfilter.foreach(_func) + self.modelfilter.foreach(_func, None) def on_rfilter_entry_icon_press(self, widget, icon, event): """

1 0

gajim: fix window mode
by Denis Fomin 03 Jan '13

03 Jan '13

changeset 0bb88fc343a5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0bb88fc343a5 description: fix window mode diffstat: src/message_window.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (30 lines): diff -r 922d66465fe1 -r 0bb88fc343a5 src/message_window.py --- a/src/message_window.py Thu Jan 03 19:39:04 2013 +0400 +++ b/src/message_window.py Thu Jan 03 20:09:40 2013 +0400 @@ -252,7 +252,7 @@ self._controls.clear() # Clean up handlers connected to the parent window, this is important since # self.window may be the RosterWindow - for i in self.handlers.keys(): + for i in list(self.handlers.keys()): if self.handlers[i].handler_is_connected(i): self.handlers[i].disconnect(i) del self.handlers[i] @@ -1150,7 +1150,7 @@ return ctrls def windows(self): - for w in self._windows.values(): + for w in list(self._windows.values()): yield w def controls(self): @@ -1237,7 +1237,7 @@ else: # Stash current size so it can be restored if the MessageWindow # is not longer embedded - roster_width = w.parent_paned.get_child1().allocation.width + roster_width = w.parent_paned.get_position() gajim.config.set('roster_width', roster_width) while w.notebook.get_n_pages():

1 0

gajim: fix popup emoticons menu coordinates
by Denis Fomin 03 Jan '13

03 Jan '13

changeset 922d66465fe1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=922d66465fe1 description: fix popup emoticons menu coordinates diffstat: src/gtkgui_helpers.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diffs (28 lines): diff -r 263cf1c24c6a -r 922d66465fe1 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Thu Jan 03 17:26:12 2013 +0400 +++ b/src/gtkgui_helpers.py Thu Jan 03 19:39:04 2013 +0400 @@ -124,17 +124,22 @@ Popup the emoticons menu under button, which is in parent_win """ window_x1, window_y1 = parent_win.get_origin()[1:] + def position_menu_under_button(menu, data): # inline function, which will not keep refs, when used as CB alloc = button.get_allocation() button_x, button_y = alloc.x, alloc.y - + translated_coordinates = button.translate_coordinates( + gajim.interface.roster.window, 0, 0) + if translated_coordinates: + button_x, button_y = translated_coordinates + _alloc = parent_win.notebook.get_allocation() # now convert them to X11-relative window_x, window_y = window_x1, window_y1 x = window_x + button_x y = window_y + button_y - menu_height = menu.size_request()[1] + menu_height = menu.size_request().height ## should we pop down or up? if (y + alloc.height + menu_height < Gdk.Screen.height()):

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