Philipp Hörist pushed to branch master at gajim / gajim
Commits:
d0029580 by Daniel Brötzmann at 2019-06-19T21:42:41Z
RosterWindow: Enable invite on drop to group chat
- - - - -
a59679f5 by Daniel Brötzmann at 2019-06-19T21:42:41Z
Roster build_invite_submenu: Enable MUC invite menu for offline contacts
- - - - -
2 changed files:
- gajim/gui_menu_builder.py
- gajim/roster_window.py
Changes:
=====================================
gajim/gui_menu_builder.py
=====================================
@@ -97,7 +97,7 @@ show_bookmarked=False, force_resource=False):
if len(contact_list) > 1: # several resources
invite_to_new_room_menuitem.set_submenu(build_resources_submenu(
contact_list, account, roster.on_invite_to_new_room, cap=NS_MUC))
- elif len(list_) == 1 and contact.supports(NS_MUC):
+ elif len(list_) == 1:
invite_menuitem.set_sensitive(True)
# use resource if it's self contact
if contact.jid == app.get_jid_from_account(account) or force_resource:
=====================================
gajim/roster_window.py
=====================================
@@ -4271,8 +4271,12 @@ class RosterWindow:
return
if type_dest == 'groupchat':
- # drop on a minimized groupchat
- # TODO: Invite to groupchat if type_dest = contact
+ # Drop on a minimized groupchat
+ if type_source != 'contact':
+ return
+ contact_jid = data
+ con = app.connections[account_dest]
+ con.get_module('MUC').invite(jid_dest, contact_jid)
return
if type_source == 'group':
@@ -4287,6 +4291,9 @@ class RosterWindow:
new_grp = grp_source_list[-1]
elif type_dest == 'group':
grp_dest = model[iter_dest][Column.JID]
+ # Don't allow to drop on e.g. Groupchats group
+ if grp_dest in helpers.special_groups:
+ return
grp_dest_list = grp_dest.split(delimiter)
# Do not allow to drop on a subgroup of source group
if grp_source_list[0] != grp_dest_list[0]:
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/4e47062a6daeaf0cf088d12a7a5785ec9dc10b1a...a59679f59847f43a59b3fc8b2fd1c88918ffa206
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/4e47062a6daeaf0cf088d12a7a5785ec9dc10b1a...a59679f59847f43a59b3fc8b2fd1c88918ffa206
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
