Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
7cbc01eb
by Philipp Hörist at 2019-07-12T21:43:09Z
2 changed files:
Changes:
| ... | ... | @@ -294,6 +294,7 @@ class Config: |
| 294 | 294 |
'show_chatstate_in_banner': [opt_bool, True, _('Shows a text in the banner that describes the current chatstate of the contact')],
|
| 295 | 295 |
'send_chatstate_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to contacts. Possible values: all, composing_only, disabled')],
|
| 296 | 296 |
'send_chatstate_muc_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to the group chat. Possible values: all, composing_only, disabled')],
|
| 297 |
+ 'muclumbus_api_jid': [opt_str, 'rodrigo.de.mucobedo@dreckshal.de'],
|
|
| 297 | 298 |
}, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]]
|
| 298 | 299 |
|
| 299 | 300 |
__options_per_key = {
|
| ... | ... | @@ -37,9 +37,6 @@ from gajim.gtk.util import get_builder |
| 37 | 37 |
from gajim.gtk.util import ensure_not_destroyed
|
| 38 | 38 |
|
| 39 | 39 |
|
| 40 |
-SERVICE_JID = 'rodrigo.de.mucobedo@dreckshal.de'
|
|
| 41 |
- |
|
| 42 |
- |
|
| 43 | 40 |
class Search(IntEnum):
|
| 44 | 41 |
CONTACT = 0
|
| 45 | 42 |
MUC = 1
|
| ... | ... | @@ -399,14 +396,14 @@ class StartChatDialog(Gtk.ApplicationWindow): |
| 399 | 396 |
|
| 400 | 397 |
if self._parameter_form is None:
|
| 401 | 398 |
con.get_module('Muclumbus').request_parameters(
|
| 402 |
- SERVICE_JID,
|
|
| 399 |
+ app.config.get('muclumbus_api_jid'),
|
|
| 403 | 400 |
callback=self._parameters_received,
|
| 404 | 401 |
user_data=(con, text))
|
| 405 | 402 |
else:
|
| 406 | 403 |
self._parameter_form.vars['q'].value = text
|
| 407 | 404 |
|
| 408 | 405 |
con.get_module('Muclumbus').set_search(
|
| 409 |
- SERVICE_JID,
|
|
| 406 |
+ app.config.get('muclumbus_api_jid'),
|
|
| 410 | 407 |
self._parameter_form,
|
| 411 | 408 |
callback=self._on_search_result,
|
| 412 | 409 |
user_data=con)
|
| ... | ... | @@ -423,7 +420,7 @@ class StartChatDialog(Gtk.ApplicationWindow): |
| 423 | 420 |
self._parameter_form.vars['q'].value = text
|
| 424 | 421 |
|
| 425 | 422 |
con.get_module('Muclumbus').set_search(
|
| 426 |
- SERVICE_JID,
|
|
| 423 |
+ app.config.get('muclumbus_api_jid'),
|
|
| 427 | 424 |
self._parameter_form,
|
| 428 | 425 |
callback=self._on_search_result,
|
| 429 | 426 |
user_data=con)
|
| ... | ... | @@ -445,7 +442,7 @@ class StartChatDialog(Gtk.ApplicationWindow): |
| 445 | 442 |
return
|
| 446 | 443 |
|
| 447 | 444 |
con.get_module('Muclumbus').set_search(
|
| 448 |
- SERVICE_JID,
|
|
| 445 |
+ app.config.get('muclumbus_api_jid'),
|
|
| 449 | 446 |
self._parameter_form,
|
| 450 | 447 |
items_per_page=result.max,
|
| 451 | 448 |
after=result.last,
|