From 6a37ec71efdb861461062cc27c594ab9b318db75 Mon Sep 17 00:00:00 2001 From: Denis Fomin Date: Tue, 23 Nov 2010 22:40:10 +0300 Subject: [PATCH] Change text in menuitem if metacontact order changes --- src/roster_window.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/roster_window.py b/src/roster_window.py index 8af7fe952..2725ddf7f 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -4453,8 +4453,17 @@ class RosterWindow: c_source, account_dest, c_dest, is_big_brother, context, etime) menu.append(item) - item = gtk.MenuItem(_('Make %s and %s metacontacts') % ( + dest_family = gajim.contacts.get_metacontacts_family(account_dest, + c_dest.jid) + source_family = gajim.contacts.get_metacontacts_family( + account_source, c_source.jid) + if dest_family == source_family: + item = gtk.MenuItem(_('Make %s first contact') % ( + c_source.get_shown_name())) + else: + item = gtk.MenuItem(_('Make %s and %s metacontacts') % ( c_source.get_shown_name(), c_dest.get_shown_name())) + item.connect('activate', self.on_drop_in_contact, account_source, c_source, account_dest, c_dest, is_big_brother, context, etime)