Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim
Commits:
889fa149 by Philipp Hörist at 2018-10-14T19:47:42Z
Default to showing offline contacts
Many messengers dont show the status anymore, its not evident to new
users that most of their roster is hidden per default and they have to
show it to access the contacts
- - - - -
895a7a87 by Philipp Hörist at 2018-10-14T19:47:42Z
Add a dedicated folder for plugin data
- - - - -
479bfa56 by Philipp Hörist at 2018-10-14T19:47:42Z
Set password correctly on MUC join
- - - - -
3 changed files:
- gajim/common/config.py
- gajim/common/configpaths.py
- gajim/common/modules/muc.py
Changes:
=====================================
gajim/common/config.py
=====================================
@@ -79,7 +79,7 @@ class Config:
'autopopupaway': [opt_bool, False],
'autopopup_chat_opened': [opt_bool, False, _('Show desktop
notification even when a chat window is opened for this contact and does not
have focus')],
'sounddnd': [opt_bool, False, _('Play sound when user is busy')],
- 'showoffline': [opt_bool, False],
+ 'showoffline': [opt_bool, True],
'show_only_chat_and_online': [opt_bool, False, _('Show only online and
free for chat contacts in roster.')],
'show_transports_group': [opt_bool, True],
'autoaway': [opt_bool, True],
=====================================
gajim/common/configpaths.py
=====================================
@@ -197,6 +197,7 @@ class ConfigPaths:
('SECRETS_FILE', 'secrets', PathLocation.DATA, PathType.FILE),
('MY_PEER_CERTS', 'certs', PathLocation.DATA, PathType.FOLDER),
('DEBUG', 'debug', PathLocation.DATA, PathType.FOLDER),
+ ('PLUGINS_DATA', 'plugins_data', PathLocation.DATA,
PathType.FOLDER),
# Config paths
('CONFIG_FILE', 'config', PathLocation.CONFIG, PathType.FILE),
=====================================
gajim/common/modules/muc.py
=====================================
@@ -59,26 +59,26 @@ class MUC:
presence = self._con.get_module('Presence').get_presence(
*args, **kwargs)
+ muc_x = presence.setTag(nbxmpp.NS_MUC + ' x')
if room_jid is not None:
- self._add_history_query(presence, room_jid, rejoin)
+ self._add_history_query(muc_x, room_jid, rejoin)
if password is not None:
- presence.setTagData('password', password)
+ muc_x.setTagData('password', password)
log.debug('Send MUC join presence:\n%s', presence)
self._con.connection.send(presence)
- def _add_history_query(self, presence, room_jid, rejoin):
+ def _add_history_query(self, muc_x, room_jid, rejoin):
last_date = app.logger.get_room_last_message_time(
self._account, room_jid)
if not last_date:
last_date = 0
- history = presence.setTag(nbxmpp.NS_MUC + ' x')
if muc_caps_cache.has_mam(room_jid):
# The room is MAM capable dont get MUC History
- history.setTag('history', {'maxchars': '0'})
+ muc_x.setTag('history', {'maxchars': '0'})
else:
# Request MUC History (not MAM)
tags = {}
@@ -100,7 +100,7 @@ class MUC:
if nb >= 0:
tags['maxstanzas'] = nb
if tags:
- history.setTag('history', tags)
+ muc_x.setTag('history', tags)
def set_subject(self, room_jid, subject):
if not app.account_is_connected(self._account):
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/c0ae4af7cfbd77d365a9db61544a29af02164483...479bfa56cb5b93268a8b2ac2a9b6a3496e5a34f6
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/c0ae4af7cfbd77d365a9db61544a29af02164483...479bfa56cb5b93268a8b2ac2a9b6a3496e5a34f6
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
