Commits December 2013

commits@gajim.org

2 participants
151 discussions

gajim: improve XEP-184 mark colors. see #7476
by Gajim 30 Dec '13

30 Dec '13

changeset 905df90efb40 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=905df90efb40 description: improve XEP-184 mark colors. see #7476 diffstat: src/conversation_textview.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (16 lines): diff -r 64a1590d8962 -r 905df90efb40 src/conversation_textview.py --- a/src/conversation_textview.py Sat Nov 30 10:00:10 2013 +0100 +++ b/src/conversation_textview.py Sat Nov 30 10:04:50 2013 +0100 @@ -311,10 +311,10 @@ self.displaymarking_tags = {} tag = buffer_.create_tag('xep0184-warning') - tag.set_property('foreground', 'red') + tag.set_property('foreground', '#cc0000') tag = buffer_.create_tag('xep0184-received') - tag.set_property('foreground', 'green') + tag.set_property('foreground', '#73d216') # One mark at the begining then 2 marks between each lines size = gajim.config.get('max_conversation_lines')

1 0

gajim: [fedor] fix gpg signature when hash algo is not SHA-1. Fi...
by Gajim 30 Dec '13

30 Dec '13

changeset 7da647dc8429 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=7da647dc8429 description: [fedor] fix gpg signature when hash algo is not SHA-1. Fixes #7569 diffstat: src/common/gpg.py | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diffs (32 lines): diff -r 905df90efb40 -r 7da647dc8429 src/common/gpg.py --- a/src/common/gpg.py Sat Nov 30 10:04:50 2013 +0100 +++ b/src/common/gpg.py Sat Nov 30 10:10:39 2013 +0100 @@ -80,14 +80,21 @@ def verify(self, str_, sign): if str_ is None: return '' - data = '-----BEGIN PGP SIGNED MESSAGE-----' + os.linesep - data = data + 'Hash: SHA1' + os.linesep + os.linesep - data = data + str_ + os.linesep - data = data + self._addHeaderFooter(sign, 'SIGNATURE') - result = super(GnuPG, self).verify(data) + # Hash algorithm is not transfered in the signed presence stanza so try + # all algorithms. Text name for hash algorithms from RFC 4880 - section 9.4 + hash_algorithms = ['SHA512', 'SHA384', 'SHA256', 'SHA224', 'SHA1', 'RIPEMD160'] + for algo in hash_algorithms: + data = os.linesep.join( + ['-----BEGIN PGP SIGNED MESSAGE-----', + 'Hash: ' + algo, + '', + str_, + self._addHeaderFooter(sign, 'SIGNATURE')] + ) + result = super(GnuPG, self).verify(data) + if result.valid: + return result.key_id - if result.valid: - return result.key_id return '' def get_keys(self, secret=False):

1 0

gajim: [Dicson] Do not display dialog confirm_metacontacts when ...
by Gajim 30 Dec '13

30 Dec '13

changeset 412a4f2b9809 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=412a4f2b9809 description: [Dicson] Do not display dialog confirm_metacontacts when using Make CONTACT first contact. Fixes #7576 diffstat: src/roster_window.py | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diffs (43 lines): diff -r 7da647dc8429 -r 412a4f2b9809 src/roster_window.py --- a/src/roster_window.py Sat Nov 30 10:10:39 2013 +0100 +++ b/src/roster_window.py Sat Nov 30 10:33:04 2013 +0100 @@ -4571,8 +4571,12 @@ self.draw_account(account_source) context.finish(True, True, etime) + dest_family = gajim.contacts.get_metacontacts_family(account_dest, + c_dest.jid) + source_family = gajim.contacts.get_metacontacts_family(account_source, + c_source.jid) confirm_metacontacts = gajim.config.get('confirm_metacontacts') - if confirm_metacontacts == 'no': + if confirm_metacontacts == 'no' or dest_family == source_family: merge_contacts() return pritext = _('You are about to create a metacontact. Are you sure you ' @@ -4846,8 +4850,9 @@ # c_dest is None if jid_dest doesn't belong to account return menu = Gtk.Menu() - item = Gtk.MenuItem(_('Send %s to %s') % (c_source.get_shown_name(), - c_dest.get_shown_name())) + item = Gtk.MenuItem(_('Send %s to %s') % ( + c_source.get_shown_name(), c_dest.get_shown_name()), + use_underline=False) item.connect('activate', self.on_drop_rosterx, account_source, c_source, account_dest, c_dest, is_big_brother, context, etime) menu.append(item) @@ -4858,10 +4863,11 @@ account_source, c_source.jid) if dest_family == source_family and dest_family: item = Gtk.MenuItem(_('Make %s first contact') % ( - c_source.get_shown_name())) + c_source.get_shown_name()), use_underline=False) else: item = Gtk.MenuItem(_('Make %s and %s metacontacts') % ( - c_source.get_shown_name(), c_dest.get_shown_name())) + c_source.get_shown_name(), c_dest.get_shown_name()), + use_underline=False) item.connect('activate', self.on_drop_in_contact, account_source, c_source, account_dest, c_dest, is_big_brother, context, etime)

1 0

gajim: fix adding transport contacts
by Gajim 30 Dec '13

30 Dec '13

changeset 7e5ceacb07ee in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=7e5ceacb07ee description: fix adding transport contacts diffstat: src/dialogs.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (26 lines): diff -r 412a4f2b9809 -r 7e5ceacb07ee src/dialogs.py --- a/src/dialogs.py Sat Nov 30 10:33:04 2013 +0100 +++ b/src/dialogs.py Sat Nov 30 15:25:21 2013 +0100 @@ -1068,11 +1068,11 @@ model = self.protocol_combobox.get_model() row = self.protocol_combobox.get_active_iter() type_ = model[row][2] - if type_ != 'jabber' and not self.jid_escaped: + if type_ != 'jabber': model = self.protocol_jid_combobox.get_model() row = self.protocol_jid_combobox.get_active() transport = model[row][0] - if self.account: + if self.account and not self.jid_escaped: self.adding_jid = (jid, transport, type_) gajim.connections[self.account].request_gateway_prompt( transport, jid) @@ -5229,7 +5229,7 @@ """ Class for displaying information about a XEP-0116 encrypted session """ - def __init__(self, control): + def __init__(self, control, transient_for=None): xml = gtkgui_helpers.get_gtk_builder('esession_info_window.ui') security_image = xml.get_object('security_image') status_label = xml.get_object('verification_status_label')

1 0

gajim: install dh4096.pem file. Fixes #7563
by Gajim 30 Dec '13

30 Dec '13

changeset a3f4da529bdb in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=a3f4da529bdb description: install dh4096.pem file. Fixes #7563 diffstat: data/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r dd01be31b935 -r a3f4da529bdb data/Makefile.am --- a/data/Makefile.am Sat Nov 16 22:23:13 2013 +0400 +++ b/data/Makefile.am Sun Nov 17 09:40:21 2013 +0100 @@ -12,7 +12,7 @@ sounds_DATA = $(srcdir)/sounds/*.wav otherdir = $(pkgdatadir)/data/other -other_DATA = other/servers.xml other/cacerts.pem +other_DATA = other/servers.xml other/cacerts.pem other/dh4096.pem man_MANS = gajim.1 gajim-remote.1 gajim-history-manager.1

1 0

gajim: fix typo. Fixes #7560
by Gajim 30 Dec '13

30 Dec '13

changeset 0009835330f8 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=0009835330f8 description: fix typo. Fixes #7560 diffstat: src/session.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a3f4da529bdb -r 0009835330f8 src/session.py --- a/src/session.py Sun Nov 17 09:40:21 2013 +0100 +++ b/src/session.py Sun Nov 17 21:52:02 2013 +0100 @@ -238,7 +238,7 @@ self.conn.name, contact) if (not self.control and obj.mtype != 'normal') or \ - (obj.mtype != 'normal' and not obj.popup): + (obj.mtype == 'normal' and not obj.popup): event = gajim.events.create_event(type_, (obj.msgtxt, obj.subject, obj.mtype, obj.timestamp, obj.encrypted, obj.resource, obj.msg_id, obj.xhtml, self, obj.form_node, obj.displaymarking,

1 0

gajim: Add emty line to the end of help strings
by Gajim 30 Dec '13

30 Dec '13

changeset ced012c822ca in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=ced012c822ca description: Add emty line to the end of help strings diffstat: src/gajim.py | 2 +- src/history_manager.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diffs (31 lines): diff -r 0009835330f8 -r ced012c822ca src/gajim.py --- a/src/gajim.py Sun Nov 17 21:52:02 2013 +0100 +++ b/src/gajim.py Mon Nov 18 22:51:56 2013 +0400 @@ -152,7 +152,7 @@ '\n -c, --config-path ' + \ _('Set configuration directory') + \ '\n -l, --loglevel ' + \ - _('Configure logging system')) + _('Configure logging system') + '\n') sys.exit() elif o in ('-q', '--quiet'): logging_helpers.set_quiet() diff -r 0009835330f8 -r ced012c822ca src/history_manager.py --- a/src/history_manager.py Sun Nov 17 21:52:02 2013 +0100 +++ b/src/history_manager.py Mon Nov 18 22:51:56 2013 +0400 @@ -76,13 +76,13 @@ _('Options:') + \ '\n -h, --help ' + \ _('Show this help message and exit') + \ - '\n -c, --config-path ' + _('Set logs directory')) + '\n -c, --config-path ' + _('Set logs directory') + '\n') sys.exit() elif o in ('-c', '--config-path'): config_path = a return config_path -config_path = parseOpts() +onfig_path = parseOpts() del parseOpts import common.configpaths

1 0

gajim: Change cursor on location icon. Fixes #7570
by Gajim 30 Dec '13

30 Dec '13

changeset 6c7ca46d7e40 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=6c7ca46d7e40 description: Change cursor on location icon. Fixes #7570 diffstat: src/chat_control.py | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diffs (34 lines): diff -r ced012c822ca -r 6c7ca46d7e40 src/chat_control.py --- a/src/chat_control.py Mon Nov 18 22:51:56 2013 +0400 +++ b/src/chat_control.py Sat Nov 23 11:20:29 2013 +0400 @@ -1630,6 +1630,12 @@ id_ = widget.connect('button-release-event', self.on_location_eventbox_button_release_event) self.handlers[id_] = widget + id_ = widget.connect('enter-notify-event', + self.on_location_eventbox_enter_notify_event) + self.handlers[id_] = widget + id_ = widget.connect('leave-notify-event', + self.on_location_eventbox_leave_notify_event) + self.handlers[id_] = widget for key in ('1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '0', '#'): widget = self.xml.get_object(key + '_button') @@ -2064,6 +2070,17 @@ 'lon': location['lon']} helpers.launch_browser_mailer('url', uri) + def on_location_eventbox_leave_notify_event(self, widget, event): + """ + Just moved the mouse so show the cursor + """ + cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR) + self.parent_win.window.window.set_cursor(cursor) + + def on_location_eventbox_enter_notify_event(self, widget, event): + cursor = gtk.gdk.Cursor(gtk.gdk.HAND2) + self.parent_win.window.window.set_cursor(cursor) + def _on_window_motion_notify(self, widget, event): """ It gets called no matter if it is the active window or not

1 0

gajim: gtk2 -> gtk3
by Gajim 30 Dec '13

30 Dec '13

changeset c84c865b8f53 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=c84c865b8f53 description: gtk2 -> gtk3 diffstat: src/chat_control.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (20 lines): diff -r 6c7ca46d7e40 -r c84c865b8f53 src/chat_control.py --- a/src/chat_control.py Sat Nov 23 11:20:29 2013 +0400 +++ b/src/chat_control.py Mon Dec 30 16:27:47 2013 +0100 @@ -2074,12 +2074,12 @@ """ Just moved the mouse so show the cursor """ - cursor = gtk.gdk.Cursor(gtk.gdk.LEFT_PTR) - self.parent_win.window.window.set_cursor(cursor) + cursor = Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR) + self.parent_win.window.get_window().set_cursor(cursor) def on_location_eventbox_enter_notify_event(self, widget, event): - cursor = gtk.gdk.Cursor(gtk.gdk.HAND2) - self.parent_win.window.window.set_cursor(cursor) + cursor = Gdk.Cursor.new(Gdk.CursorType.HAND2) + self.parent_win.window.get_window().set_cursor(cursor) def _on_window_motion_notify(self, widget, event): """

1 0

gajim: missing return
by Gajim 30 Dec '13

30 Dec '13

changeset 4c59a680b4c5 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=4c59a680b4c5 description: missing return diffstat: src/roster_window.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r c84c865b8f53 -r 4c59a680b4c5 src/roster_window.py --- a/src/roster_window.py Mon Dec 30 16:27:47 2013 +0100 +++ b/src/roster_window.py Wed Nov 27 18:20:49 2013 +0100 @@ -2012,6 +2012,7 @@ elif event.type_ == 'file-hash-error': ft.show_hash_error(jid, data, account) gajim.events.remove_events(account, jid, event) + return True elif event.type_ == 'file-completed': ft.show_completed(jid, data) gajim.events.remove_events(account, jid, event)

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 December 2013