changeset 155fdc9f6544 in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=155fdc9f6544 description: [Dicson] Do not display dialog confirm_metacontacts when using Make CONTACT first contact. Fixes #7576

diffstat:

src/roster_window.py | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 4507ce0d9d3a -r 155fdc9f6544 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 @@ -4555,8 +4555,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 ' @@ -4830,7 +4834,7 @@ return menu = gtk.Menu() item = gtk.MenuItem(_('Send %s to %s') % (c_source.get_shown_name(), - c_dest.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) @@ -4841,10 +4845,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)