Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
a8fd4a1f by wurstsalat at 2022-08-31T20:23:05+02:00
cfix: DND: Set source workspace for ChatListEntryParam
- - - - -
2 changed files:
- gajim/gtk/chat_list_stack.py
- gajim/gtk/workspace_side_bar.py
Changes:
=====================================
gajim/gtk/chat_list_stack.py
=====================================
@@ -243,14 +243,7 @@ def _move_chat_to_workspace(self,
if not workspace_id:
workspace_id = app.window.add_workspace(switch=False)
- if not params.source_workspace_id:
- source_chatlist = self.get_current_chat_list()
- if source_chatlist is None:
- return
-
- else:
- source_chatlist = self.get_chatlist(params.source_workspace_id)
-
+ source_chatlist = self.get_chatlist(params.source_workspace_id)
type_ = source_chatlist.get_chat_type(params.account, params.jid)
if type_ is None:
return
=====================================
gajim/gtk/workspace_side_bar.py
=====================================
@@ -157,8 +157,10 @@ def _process_chat_list_drop(self,
if workspace_row.workspace_id == 'add':
workspace_id = ''
+ source_workspace = app.window.get_active_workspace()
+ assert source_workspace is not None
params = ChatListEntryParam(workspace_id=workspace_id,
- source_workspace_id='',
+ source_workspace_id=source_workspace,
account=account,
jid=jid)
app.window.activate_action('move-chat-to-workspace',
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/a8fd4a1f47749524766b1cb5f5a9e1b5cf00f521
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/a8fd4a1f47749524766b1cb5f5a9e1b5cf00f521
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
