Commits November 2013

commits@gajim.org

2 participants
61 discussions

gajim: fix inviting several contacts to a room. And don't allow ...
by Gajim 01 Nov '13

01 Nov '13

changeset 7ba03a1683f2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=7ba03a1683f2 description: fix inviting several contacts to a room. And don't allow to invite transports. Fixes 7527 diffstat: src/gui_menu_builder.py | 12 +++++++++++- src/roster_window.py | 15 ++++++++------- 2 files changed, 19 insertions(+), 8 deletions(-) diffs (48 lines): diff -r a00b2edfde49 -r 7ba03a1683f2 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Thu Oct 31 15:14:06 2013 +0100 +++ b/src/gui_menu_builder.py Fri Nov 01 12:08:05 2013 +0100 @@ -108,8 +108,18 @@ resource = None invite_to_new_room_menuitem.connect('activate', roster.on_invite_to_new_room, list_, resource) + elif len(list_) > 1: + list2 = [] + for (c, a) in list_: + if c.supports(NS_MUC): + list2.append((c, a)) + if len(list2) > 0: + invite_to_new_room_menuitem.connect('activate', + roster.on_invite_to_new_room, list2, None) + else: + invite_menuitem.set_sensitive(False) else: - invite_menuitem.set_sensitive(True) + invite_menuitem.set_sensitive(False) # transform None in 'jabber' c_t = contacts_transport or 'jabber' muc_jid = {} diff -r a00b2edfde49 -r 7ba03a1683f2 src/roster_window.py --- a/src/roster_window.py Thu Oct 31 15:14:06 2013 +0100 +++ b/src/roster_window.py Fri Nov 01 12:08:05 2013 +0100 @@ -5756,13 +5756,14 @@ self.on_send_single_message_menuitem_activate, account, list_) # Invite to - invite_menuitem = gtk.ImageMenuItem(_('In_vite to')) - muc_icon = gtkgui_helpers.load_icon('muc_active') - if muc_icon: - invite_menuitem.set_image(muc_icon) - - gui_menu_builder.build_invite_submenu(invite_menuitem, list_online) - menu.append(invite_menuitem) + if group != _('Transports'): + invite_menuitem = gtk.ImageMenuItem(_('In_vite to')) + muc_icon = gtkgui_helpers.load_icon('muc_active') + if muc_icon: + invite_menuitem.set_image(muc_icon) + + gui_menu_builder.build_invite_submenu(invite_menuitem, list_online) + menu.append(invite_menuitem) # Send Custom Status send_custom_status_menuitem = gtk.ImageMenuItem(

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2013