Philipp Hörist pushed to branch master at gajim / gajim
Commits:
1f663a24 by Philipp Hörist at 2019-09-29T08:35:03Z
Remove unused function
- - - - -
f5244e37 by Philipp Hörist at 2019-09-29T11:20:16Z
Bookmarks: Don't accept PEP notificiations before request
- - - - -
2 changed files:
- gajim/common/modules/adhoc_commands.py
- gajim/common/modules/bookmarks.py
Changes:
=====================================
gajim/common/modules/adhoc_commands.py
=====================================
@@ -179,24 +179,6 @@ class ChangeStatusCommand(AdHocCommand):
return False # finish the session
-def find_current_groupchats(account):
- from gajim import message_control
- rooms = []
- for gc_control in app.interface.msg_win_mgr.get_controls(
- message_control.TYPE_GC) + \
- app.interface.minimized_controls[account].values():
- acct = gc_control.account
- # check if account is the good one
- if acct != account:
- continue
- room_jid = gc_control.room_jid
- nick = gc_control.nick
- if (room_jid in app.gc_connected[acct] and
- app.gc_connected[acct][room_jid]):
- rooms.append((room_jid, nick,))
- return rooms
-
-
class AdHocCommands(BaseModule):
_nbxmpp_extends = 'AdHoc'
=====================================
gajim/common/modules/bookmarks.py
=====================================
@@ -48,7 +48,7 @@ class Bookmarks(BaseModule):
self._conversion_2 = False
self._bookmarks = []
self._join_timeouts = []
- self._request_in_progress = False
+ self._request_in_progress = True
@property
def conversion(self):
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/8936a07e46a0e54bb4a43dcb6cd9072862b8b37f...f5244e379d55e603d27be3a6a3d5a1a309dd36fa
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/8936a07e46a0e54bb4a43dcb6cd9072862b8b37f...f5244e379d55e603d27be3a6a3d5a1a309dd36fa
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
