Daniel Brötzmann pushed to branch mainwindow at gajim / gajim
Commits:
-
0375c447
by wurstsalat at 2021-09-11T18:38:22+02:00
-
5fe98de6
by wurstsalat at 2021-09-11T19:19:38+02:00
-
1f5d3999
by wurstsalat at 2021-09-11T19:45:30+02:00
5 changed files:
- gajim/gtk/add_contact.py
- gajim/gtk/chat_list.py
- gajim/gtk/discovery.py
- gajim/gui_interface.py
- gajim/remote_control.py
Changes:
| ... | ... | @@ -41,7 +41,7 @@ class AddContact(Assistant): |
| 41 | 41 |
def __init__(self, account=None, jid=None, nick=None):
|
| 42 | 42 |
Assistant.__init__(self)
|
| 43 | 43 |
self.account = account
|
| 44 |
- self._jid = jid
|
|
| 44 |
+ self.jid = jid
|
|
| 45 | 45 |
self._nick = nick
|
| 46 | 46 |
|
| 47 | 47 |
self._result = None
|
| ... | ... | @@ -248,6 +248,7 @@ def remove_chat(self, account, jid): |
| 248 | 248 |
row = self._chats.pop((account, jid))
|
| 249 | 249 |
self.remove(row)
|
| 250 | 250 |
row.destroy()
|
| 251 |
+ self.emit_unread_changed()
|
|
| 251 | 252 |
|
| 252 | 253 |
def remove_chats_for_account(self, account):
|
| 253 | 254 |
for row_account, jid in list(self._chats.keys()):
|
| ... | ... | @@ -1357,7 +1357,7 @@ def _on_join_button_clicked(self, widget): |
| 1357 | 1357 |
if not iter_:
|
| 1358 | 1358 |
return
|
| 1359 | 1359 |
service = model[iter_][0]
|
| 1360 |
- app.interface.show_or_join_groupchat(self.account, service)
|
|
| 1360 |
+ app.interface.show_add_join_groupchat(self.account, service)
|
|
| 1361 | 1361 |
|
| 1362 | 1362 |
def update_actions(self):
|
| 1363 | 1363 |
if self.execute_button:
|
| ... | ... | @@ -1723,7 +1723,7 @@ def _on_join_button_clicked(self, *args): |
| 1723 | 1723 |
if not iter_:
|
| 1724 | 1724 |
return
|
| 1725 | 1725 |
service = model[iter_][0]
|
| 1726 |
- app.interface.show_or_join_groupchat(self.account, service)
|
|
| 1726 |
+ app.interface.show_add_join_groupchat(self.account, service)
|
|
| 1727 | 1727 |
|
| 1728 | 1728 |
def update_actions(self):
|
| 1729 | 1729 |
sens = \
|
| ... | ... | @@ -1078,10 +1078,12 @@ def create_groupchat(self, account, room_jid, config): |
| 1078 | 1078 |
client = app.get_client(account)
|
| 1079 | 1079 |
client.get_module('MUC').create(room_jid, config)
|
| 1080 | 1080 |
|
| 1081 |
- def show_add_join_groupchat(self, account, jid, nickname=None):
|
|
| 1081 |
+ def show_add_join_groupchat(self, account, jid, nickname=None,
|
|
| 1082 |
+ password=None):
|
|
| 1082 | 1083 |
if not app.window.chat_exists(account, jid):
|
| 1083 | 1084 |
client = app.get_client(account)
|
| 1084 |
- client.get_module('MUC').join(jid, nick=nickname)
|
|
| 1085 |
+ client.get_module('MUC').join(
|
|
| 1086 |
+ jid, nick=nickname, password=password)
|
|
| 1085 | 1087 |
|
| 1086 | 1088 |
app.window.add_group_chat(account, str(jid), select=True)
|
| 1087 | 1089 |
|
| ... | ... | @@ -858,9 +858,9 @@ def join_room(self, room_jid, password, account): |
| 858 | 858 |
# zeroconf not support groupchats
|
| 859 | 859 |
return
|
| 860 | 860 |
|
| 861 |
- app.interface.show_or_join_groupchat(account,
|
|
| 862 |
- room_jid,
|
|
| 863 |
- password=password)
|
|
| 861 |
+ app.interface.show_add_join_groupchat(account,
|
|
| 862 |
+ room_jid,
|
|
| 863 |
+ password=password)
|
|
| 864 | 864 |
|
| 865 | 865 |
def Introspect(self):
|
| 866 | 866 |
return self.__doc__
|