Commits September 2019

commits@gajim.org

1 participants
59 discussions

[Git][gajim/gajim][master] CI: Disable pylint E1136 for now
by Philipp Hörist 23 Sep '19

23 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a01c130a by Philipp Hörist at 2019-09-23T20:23:36Z CI: Disable pylint E1136 for now This reports a false positiv, see https://gitlab.gnome.org/GNOME/pygobject/issues/361 - - - - - 1 changed file: - scripts/dev/pylint-ci.sh Changes: ===================================== scripts/dev/pylint-ci.sh ===================================== @@ -2,7 +2,7 @@ PYLINT=${PYLINT:-pylint} "$PYLINT" --version -"$PYLINT" --disable=C0103,C0302,C0301,C0330,E0401,E0611,E1101,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0212,W0221,W0223,W0231,W0233,W0603,W0613 "$@" +"$PYLINT" --disable=C0103,C0302,C0301,C0330,E0401,E0611,E1101,E1136,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0212,W0221,W0223,W0231,W0233,W0603,W0613 "$@" # C0103 invalid-name # C0301 line-too-long @@ -11,6 +11,7 @@ PYLINT=${PYLINT:-pylint} # E0401 import-error # E0611 no-name-in-module # E1101 no-member +# E1136 unsubscriptable-object # R0201 no-self-use # R0901 too-many-ancestors # R0904 too-many-public-methods View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a01c130afad9965977cd41534a821b380c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a01c130afad9965977cd41534a821b380c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update gitlab-ci.yml
by Philipp Hörist 23 Sep '19

23 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1d4f0a58 by Philipp Hörist at 2019-09-23T19:36:15Z Update gitlab-ci.yml - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -15,7 +15,7 @@ run-tests: - pip3 install mypy - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git@master - pip3 install pylint==2.3.1 - - mypy gajim + - /home/gitlab-runner/.local/bin/mypy gajim - scripts/dev/pylint-ci.sh --jobs=2 gajim - python3 setup.py test -s test.no_gui - deactivate View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1d4f0a58aba1a981e85684b2f99e596451… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1d4f0a58aba1a981e85684b2f99e596451… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update pylint-ci.sh
by Philipp Hörist 23 Sep '19

23 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1e37087a by Philipp Hörist at 2019-09-23T19:16:49Z Update pylint-ci.sh - - - - - 1 changed file: - scripts/dev/pylint-ci.sh Changes: ===================================== scripts/dev/pylint-ci.sh ===================================== @@ -1,6 +1,7 @@ #!/bin/sh PYLINT=${PYLINT:-pylint} +"$PYLINT" --version "$PYLINT" --disable=C0103,C0302,C0301,C0330,E0401,E0611,E1101,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0212,W0221,W0223,W0231,W0233,W0603,W0613 "$@" # C0103 invalid-name @@ -10,8 +11,6 @@ PYLINT=${PYLINT:-pylint} # E0401 import-error # E0611 no-name-in-module # E1101 no-member -# E1133 not-an-iterable -# E1136 unsubscriptable-object # R0201 no-self-use # R0901 too-many-ancestors # R0904 too-many-public-methods View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1e37087a0670a65b863756f59341ac4325… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1e37087a0670a65b863756f59341ac4325… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Groupchat: Remove traces of continued conversations
by Philipp Hörist 23 Sep '19

23 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9922ce1d by Philipp Hörist at 2019-09-23T15:16:23Z Groupchat: Remove traces of continued conversations - - - - - ca328a67 by Philipp Hörist at 2019-09-23T15:20:19Z Groupchat: Remove unused argument - - - - - 19e862c2 by Philipp Hörist at 2019-09-23T18:17:46Z Update pylint-ci.sh - - - - - 4 changed files: - gajim/common/events.py - gajim/groupchat_control.py - gajim/gtk/dialogs.py - scripts/dev/pylint-ci.sh Changes: ===================================== gajim/common/events.py ===================================== @@ -44,7 +44,7 @@ class Event: printed_chat: [message, subject, control, msg_log_id] printed_*: None messages that are already printed in chat, but not read - gc-invitation: [room_jid, reason, password, is_continued, jid_from] + gc-invitation: [room_jid, reason, password, jid_from] subscription_request: [text, nick] unsubscribed: contact jingle-incoming: (fulljid, sessionid, content_types) ===================================== gajim/groupchat_control.py ===================================== @@ -87,11 +87,10 @@ class GroupchatControl(ChatControlBase): # will be processed with this command host. COMMAND_HOST = GroupChatCommands - def __init__(self, parent_win, contact, muc_data, acct, is_continued=False): + def __init__(self, parent_win, contact, muc_data, acct): ChatControlBase.__init__(self, self.TYPE_ID, parent_win, - 'groupchat_control', contact, acct) + 'groupchat_control', contact, acct) self.force_non_minimizable = False - self.is_continued = is_continued self.is_anonymous = True # Keep error dialog instance to be sure to have only once at a time @@ -760,12 +759,7 @@ class GroupchatControl(ChatControlBase): and not self.attention_flag: color = 'tab-muc-msg' - if self.is_continued: - # if this is a continued conversation - label_str = self.get_continued_conversation_name() - else: - label_str = self.room_name - label_str = GLib.markup_escape_text(label_str) + label_str = GLib.markup_escape_text(self.room_name) # count waiting highlighted messages unread = '' @@ -829,23 +823,6 @@ class GroupchatControl(ChatControlBase): self.xml.gc_banner_status_image.set_from_surface(surface) - def get_continued_conversation_name(self): - """ - Get the name of a continued conversation. Will return Continued - Conversation if there isn't any other contact in the room - """ - nicks = [] - for nick in app.contacts.get_nick_list(self.account, - self.room_jid): - if nick != self.nick: - nicks.append(nick) - if nicks != []: - title = ', ' - title = _('Conversation with ') + title.join(nicks) - else: - title = _('Continued conversation') - return title - def draw_banner_text(self): """ Draw the text in the fat line at the top of the window that houses the @@ -1638,7 +1615,7 @@ class GroupchatControl(ChatControlBase): return app.config.get_per('rooms', self.contact.jid, 'minimize_on_close', True) - def minimize(self, status='offline'): + def minimize(self): # Minimize it win = app.interface.msg_win_mgr.get_window(self.contact.jid, self.account) ===================================== gajim/gtk/dialogs.py ===================================== @@ -603,7 +603,6 @@ class InvitationReceivedDialog(Gtk.ApplicationWindow): self.room_jid = str(event.muc) self.from_ = str(event.from_) self.password = event.password - self.is_continued = event.continued if event.from_.bareMatch(event.muc): contact_text = event.from_.getResource() @@ -615,15 +614,10 @@ class InvitationReceivedDialog(Gtk.ApplicationWindow): else: contact_text = contact.get_shown_name() - # is_continued when invited from 1:1 chat - if self.is_continued: - invitation_label = _('%s has invited you to join ' - 'a discussion') % contact_text - else: - invitation_label = _('%(contact)s has invited you to the ' - 'group chat %(room_jid)s') % \ - {'contact': contact_text, - 'room_jid': self.room_jid} + invitation_label = _('%(contact)s has invited you to the ' + 'group chat %(room_jid)s') % \ + {'contact': contact_text, + 'room_jid': self.room_jid} self._ui.invitation_label.set_markup(invitation_label) if event.reason: ===================================== scripts/dev/pylint-ci.sh ===================================== @@ -1,7 +1,7 @@ #!/bin/sh PYLINT=${PYLINT:-pylint} -"$PYLINT" --disable=C0103,C0302,C0301,C0330,E0401,E0611,E1101,E1133,E1136,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0212,W0221,W0223,W0231,W0233,W0603,W0613 "$@" +"$PYLINT" --disable=C0103,C0302,C0301,C0330,E0401,E0611,E1101,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0212,W0221,W0223,W0231,W0233,W0603,W0613 "$@" # C0103 invalid-name # C0301 line-too-long View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/44e6b0f0048f176ea2ede69302903033f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/44e6b0f0048f176ea2ede69302903033f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Consider private variables for @event_filter
by Philipp Hörist 22 Sep '19

22 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c230f5c4 by Philipp Hörist at 2019-09-22T16:43:17Z Consider private variables for @event_filter - - - - - 94b058cd by Philipp Hörist at 2019-09-22T16:59:32Z Add account-disconnected event This is a dedicated event so we dont have to use the our-show event - - - - - 44e6b0f0 by Philipp Hörist at 2019-09-22T19:58:58Z MUC: Refactor auto-rejoin - Rewrite auto-rejoin code and move it into muc module - - - - - 4 changed files: - gajim/common/connection.py - gajim/common/helpers.py - gajim/common/modules/muc.py - gajim/groupchat_control.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -595,6 +595,8 @@ class Connection(CommonConnection, ConnectionHandlers): self.get_module('Bytestream').remove_all_transfers() self._unregister_new_handlers(self.connection) self.connection = None + app.nec.push_incoming_event(NetworkEvent('account-disconnected', + account=self.name)) def _set_reconnect_timer(self): self.connected = -1 ===================================== gajim/common/helpers.py ===================================== @@ -1471,8 +1471,12 @@ def event_filter(filter_): @wraps(func) def func_wrapper(self, event, *args, **kwargs): for attr in filter_: - if getattr(event, attr) != getattr(self, attr): - return + try: + if getattr(event, attr) != getattr(self, attr): + return + except AttributeError: + if getattr(event, attr) != getattr(self, '_%s' % attr): + return return func(self, event, *args, **kwargs) return func_wrapper return event_filter_decorator ===================================== gajim/common/modules/muc.py ===================================== @@ -24,6 +24,7 @@ from datetime import timezone import nbxmpp from nbxmpp.const import InviteType from nbxmpp.const import PresenceType +from nbxmpp.const import StatusCode from nbxmpp.structs import StanzaHandler from nbxmpp.util import is_error_result @@ -31,6 +32,7 @@ from gi.repository import GLib from gajim.common import app from gajim.common import helpers +from gajim.common import ged from gajim.common.const import KindConstant from gajim.common.const import MUCJoinedState from gajim.common.const import SyncThreshold @@ -38,6 +40,7 @@ from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_default_muc_config from gajim.common.helpers import get_sync_threshold from gajim.common.helpers import to_user_string +from gajim.common.helpers import event_filter from gajim.common import idle from gajim.common.nec import NetworkEvent from gajim.common.modules.bits_of_binary import store_bob_data @@ -106,8 +109,17 @@ class MUC(BaseModule): priority=49) ] + self._event_handlers = [ + ('account-disconnected', ged.CORE, self._on_account_disconnected), + ] + + for handler in self._event_handlers: + app.ged.register_event_handler(*handler) + self._muc_data = {} + self._rejoin_muc = set() self._join_timeouts = {} + self._rejoin_timeouts = {} def pass_disco(self, info): for identity in info.identities: @@ -187,6 +199,13 @@ class MUC(BaseModule): self._set_muc_state(muc_data.jid, MUCJoinedState.JOINING) self._con.connection.send(presence) + def _rejoin(self, room_jid): + muc_data = self._get_muc_data(room_jid) + if muc_data.state == MUCJoinedState.NOT_JOINED: + self._log.info('Rejoin %s', room_jid) + self._join(muc_data) + return True + def _create(self, muc_data): show = helpers.get_xmpp_show(app.SHOW_LIST[self._con.connected]) @@ -204,6 +223,7 @@ class MUC(BaseModule): def leave(self, room_jid, reason=None): self._log.info('Leave MUC: %s', room_jid) self._remove_join_timeout(room_jid) + self._remove_rejoin_timeout(room_jid) self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) muc_data = self._get_muc_data(room_jid) self._con.get_module('Presence').send_presence( @@ -361,20 +381,23 @@ class MUC(BaseModule): if muc_data.state == MUCJoinedState.JOINING: if properties.error.condition == 'conflict': + self._remove_rejoin_timeout(room_jid) muc_data.nick += '_' self._log.info('Nickname conflict: %s change to %s', muc_data.jid, muc_data.nick) self._join(muc_data) elif properties.error.condition == 'not-authorized': + self._remove_rejoin_timeout(room_jid) self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) self._raise_muc_event('muc-password-required', properties) else: self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) - app.nec.push_incoming_event( - NetworkEvent('muc-join-failed', - account=self._account, - room_jid=room_jid, - error=properties.error)) + if room_jid not in self._rejoin_muc: + app.nec.push_incoming_event( + NetworkEvent('muc-join-failed', + account=self._account, + room_jid=room_jid, + error=properties.error)) elif muc_data.state == MUCJoinedState.CREATING: self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) @@ -467,6 +490,9 @@ class MUC(BaseModule): if properties.is_muc_self_presence and properties.is_kicked: self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) self._raise_muc_event('muc-self-kicked', properties) + status_codes = properties.muc_status_codes or [] + if StatusCode.REMOVED_SERVICE_SHUTDOWN in status_codes: + self._start_rejoin_timeout(room_jid) return if properties.is_muc_self_presence and properties.type.is_unavailable: @@ -527,6 +553,21 @@ class MUC(BaseModule): properties.show) self._raise_muc_event('muc-user-status-show-changed', properties) + def _start_rejoin_timeout(self, room_jid): + self._remove_rejoin_timeout(room_jid) + self._rejoin_muc.add(room_jid) + self._log.info('Start rejoin timeout for: %s', room_jid) + id_ = GLib.timeout_add_seconds(2, self._rejoin, room_jid) + self._rejoin_timeouts[room_jid] = id_ + + def _remove_rejoin_timeout(self, room_jid): + self._rejoin_muc.discard(room_jid) + id_ = self._rejoin_timeouts.get(room_jid) + if id_ is not None: + self._log.info('Remove rejoin timeout for: %s', room_jid) + GLib.source_remove(id_) + del self._rejoin_timeouts[room_jid] + def _start_join_timeout(self, room_jid): self._remove_join_timeout(room_jid) self._log.info('Start join timeout for: %s', room_jid) @@ -644,6 +685,7 @@ class MUC(BaseModule): def _room_join_complete(self, muc_data): self._remove_join_timeout(muc_data.jid) self._set_muc_state(muc_data.jid, MUCJoinedState.JOINED) + self._remove_rejoin_timeout(muc_data.jid) # We successfully joined a MUC, set add bookmark with autojoin self._con.get_module('Bookmarks').modify(muc_data.jid, @@ -695,6 +737,7 @@ class MUC(BaseModule): muc_data.captcha_id = properties.id self._set_muc_state(properties.jid, MUCJoinedState.CAPTCHA_REQUEST) + self._remove_rejoin_timeout(properties.jid) app.nec.push_incoming_event( NetworkEvent('muc-captcha-challenge', @@ -792,10 +835,18 @@ class MUC(BaseModule): self._log.info('Invite %s to %s', to, room) self._nbxmpp('MUC').invite(room, to, reason, password, continue_, type_) - def cleanup(self): + @event_filter(['account']) + def _on_account_disconnected(self, event): + for room_jid in list(self._rejoin_timeouts.keys()): + self._remove_rejoin_timeout(room_jid) + for room_jid in list(self._join_timeouts.keys()): self._remove_join_timeout(room_jid) + def cleanup(self): + for handler in self._event_handlers: + app.ged.remove_event_handler(*handler) + def get_instance(*args, **kwargs): return MUC(*args, **kwargs), 'MUC' ===================================== gajim/groupchat_control.py ===================================== @@ -94,14 +94,6 @@ class GroupchatControl(ChatControlBase): self.is_continued = is_continued self.is_anonymous = True - # Controls the state of autorejoin. - # None - autorejoin is neutral. - # False - autorejoin is to be prevented (gets reset to initial state in - # got_connected()). - # int - autorejoin is being active and working (gets reset to initial - # state in got_connected()). - self.autorejoin = None - # Keep error dialog instance to be sure to have only once at a time self.error_dialog = None @@ -1194,10 +1186,6 @@ class GroupchatControl(ChatControlBase): def got_connected(self): self.roster.draw() - # Make autorejoin stop. - if self.autorejoin: - GLib.source_remove(self.autorejoin) - self.autorejoin = None if self.disco_info.has_mam: # Request MAM @@ -1252,14 +1240,6 @@ class GroupchatControl(ChatControlBase): if self.parent_win: self.parent_win.redraw_tab(self) - # Autorejoin stuff goes here. - # Notice that we don't need to activate autorejoin if connection is lost - # or in progress. - if self.autorejoin is None and app.account_is_connected(self.account): - ar_to = app.config.get('muc_autorejoin_timeout') - if ar_to: - self.autorejoin = GLib.timeout_add_seconds(ar_to, self.rejoin) - self.update_actions() def leave(self, reason=None): @@ -1267,10 +1247,7 @@ class GroupchatControl(ChatControlBase): self._close_control(reason=reason) def rejoin(self): - if not self.autorejoin: - return False app.connections[self.account].get_module('MUC').join(self._muc_data) - return True def send_pm(self, nick, message=None): ctrl = self._start_private_message(nick) @@ -1421,8 +1398,6 @@ class GroupchatControl(ChatControlBase): @event_filter(['account', 'room_jid']) def _on_self_kicked(self, event): - self.autorejoin = False - status_codes = event.properties.muc_status_codes or [] reason = event.properties.muc_user.reason @@ -1473,7 +1448,6 @@ class GroupchatControl(ChatControlBase): reason = ': System shutdown' message = message.format(actor=actor, reason=reason) self.add_info_message(message) - self.autorejoin = True self.got_disconnected() @@ -1566,7 +1540,6 @@ class GroupchatControl(ChatControlBase): def _on_muc_join_failed(self, event): self.xml.error_label.set_text(to_user_string(event.error)) self._show_page('error') - self.autorejoin = False @event_filter(['account', 'room_jid']) def _on_muc_creation_failed(self, event): @@ -1594,7 +1567,6 @@ class GroupchatControl(ChatControlBase): 'instead: xmpp:%s?join') % alternate self.add_info_message(join_message) - self.autorejoin = False self.got_disconnected() con = app.connections[self.account] @@ -1695,9 +1667,6 @@ class GroupchatControl(ChatControlBase): del win._controls[self.account][self.contact.jid] def shutdown(self, reason=None): - # Preventing autorejoin from being activated - self.autorejoin = False - # Leave MUC if we are still joined if self._muc_data.state != MUCJoinedState.NOT_JOINED: self.got_disconnected() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/837e9a1a27942d3abcf3ba3e736d00460… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/837e9a1a27942d3abcf3ba3e736d00460… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] MUC: Recognize server shutdown as room kick
by Philipp Hörist 22 Sep '19

22 Sep '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 589c0417 by Philipp Hörist at 2019-09-22T15:42:57Z MUC: Recognize server shutdown as room kick - - - - - 1 changed file: - nbxmpp/structs.py Changes: ===================================== nbxmpp/structs.py ===================================== @@ -659,6 +659,7 @@ class PresenceProperties: StatusCode.REMOVED_KICKED, StatusCode.REMOVED_AFFILIATION_CHANGE, StatusCode.REMOVED_NONMEMBER_IN_MEMBERS_ONLY, + StatusCode.REMOVED_SERVICE_SHUTDOWN, StatusCode.REMOVED_ERROR } return (self.from_muc and View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/589c0417455010c0ba1a41aae2… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/589c0417455010c0ba1a41aae2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Icons: Add 32 px feather icons for HiDPI Screens
by Philipp Hörist 22 Sep '19

22 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 837e9a1a by Philipp Hörist at 2019-09-22T09:35:22Z Icons: Add 32 px feather icons for HiDPI Screens - - - - - 13 changed files: - + gajim/data/icons/hicolor/32x32/devices/feather-clock-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-eye-off-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-eye-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-globe-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-hard-drive-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-lock-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-mic-off-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-mic-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-server-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-shield-off-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-shield-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-unlock-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-user-check-symbolic.symbolic.png Changes: ===================================== gajim/data/icons/hicolor/32x32/devices/feather-clock-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-clock-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-eye-off-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-eye-off-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-eye-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-eye-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-globe-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-globe-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-hard-drive-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-hard-drive-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-lock-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-lock-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-mic-off-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-mic-off-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-mic-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-mic-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-server-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-server-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-shield-off-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-shield-off-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-shield-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-shield-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-unlock-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-unlock-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-user-check-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-user-check-symbolic.symbolic.png differ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/837e9a1a27942d3abcf3ba3e736d004608… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/837e9a1a27942d3abcf3ba3e736d004608… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] AdHoc: Dont report empty command list as stanza-malformed
by Philipp Hörist 22 Sep '19

22 Sep '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 67a5562d by Philipp Hörist at 2019-09-22T09:21:58Z AdHoc: Dont report empty command list as stanza-malformed - - - - - 1 changed file: - nbxmpp/modules/adhoc.py Changes: ===================================== nbxmpp/modules/adhoc.py ===================================== @@ -54,7 +54,7 @@ class AdHoc: return raise_error(log.info, stanza) payload = stanza.getQueryPayload() - if not payload: + if payload is None: return raise_error(log.warning, stanza, 'stanza-malformed') command_list = [] View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/67a5562db9d3d335aa21eab56d… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/67a5562db9d3d335aa21eab56d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused import
by Philipp Hörist 22 Sep '19

22 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: dcbd5f9c by Philipp Hörist at 2019-09-22T08:31:49Z Remove unused import - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -59,7 +59,6 @@ import nbxmpp from nbxmpp.util import compute_caps_hash from nbxmpp.stringprepare import nameprep from nbxmpp.structs import DiscoInfo -from nbxmpp.const import Affiliation from nbxmpp.const import Role from nbxmpp.protocol import JID from nbxmpp.protocol import InvalidJid View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dcbd5f9c4d99ef5c85cd4be9e47ac87806… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dcbd5f9c4d99ef5c85cd4be9e47ac87806… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: MUC: Improve change affiliation logic
by Philipp Hörist 22 Sep '19

22 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: e1cdd603 by Philipp Hörist at 2019-09-22T07:29:36Z MUC: Improve change affiliation logic - - - - - 933702df by Philipp Hörist at 2019-09-22T08:22:52Z MUC: Show Make/Revoke Member menu entry correctly - - - - - 2 changed files: - gajim/common/helpers.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1665,10 +1665,21 @@ def get_alternative_venue(error): return uri.data['jid'] -def is_affiliation_change_allowed(self_contact, contact): - if self_contact.affiliation < Affiliation.ADMIN: +def is_affiliation_change_allowed(self_contact, contact, target_aff): + if contact.affiliation.value == target_aff: + # Contact has already the target affiliation return False - return self_contact.affiliation >= contact.affiliation + + if self_contact.affiliation.is_owner: + return True + + if not self_contact.affiliation.is_admin: + return False + + if target_aff in ('admin', 'owner'): + # Admin cant edit admin/owner list + return False + return self_contact.affiliation > contact.affiliation def is_role_change_allowed(self_contact, contact): ===================================== gajim/gui_menu_builder.py ===================================== @@ -897,7 +897,7 @@ def get_groupchat_roster_menu(account, control_id, self_contact, contact): item = Gtk.MenuItem(label=_('Ban')) action = 'win.ban-%s::%s' % (control_id, contact.jid or '') - if is_affiliation_change_allowed(self_contact, contact): + if is_affiliation_change_allowed(self_contact, contact, 'outcast'): item.set_detailed_action_name(action) else: item.set_sensitive(False) @@ -908,8 +908,7 @@ def get_groupchat_roster_menu(account, control_id, self_contact, contact): item = Gtk.MenuItem(label=_('Make Owner')) action = 'win.change-affiliation-%s(["%s", "owner"])' % (control_id, contact.jid) - if (is_affiliation_change_allowed(self_contact, contact) and - not contact.affiliation.is_owner): + if is_affiliation_change_allowed(self_contact, contact, 'owner'): item.set_detailed_action_name(action) else: item.set_sensitive(False) @@ -918,26 +917,25 @@ def get_groupchat_roster_menu(account, control_id, self_contact, contact): item = Gtk.MenuItem(label=_('Make Admin')) action = 'win.change-affiliation-%s(["%s", "admin"])' % (control_id, contact.jid) - if (is_affiliation_change_allowed(self_contact, contact) and - not contact.affiliation.is_admin): + if is_affiliation_change_allowed(self_contact, contact, 'admin'): item.set_detailed_action_name(action) else: item.set_sensitive(False) menu.append(item) - if contact.affiliation.is_none: - label = _('Make Member') - affiliation = 'member' + item = Gtk.MenuItem(label=_('Make Member')) + action = 'win.change-affiliation-%s(["%s", "member"])' % (control_id, + contact.jid) + if is_affiliation_change_allowed(self_contact, contact, 'member'): + item.set_detailed_action_name(action) else: - label = _('Revoke Member') - affiliation = 'none' + item.set_sensitive(False) + menu.append(item) - item = Gtk.MenuItem(label=label) - action = 'win.change-affiliation-%s(["%s", "%s"])' % (control_id, - contact.jid, - affiliation) - if (is_affiliation_change_allowed(self_contact, contact) and - contact.affiliation.value != affiliation): + item = Gtk.MenuItem(label=_('Revoke Member')) + action = 'win.change-affiliation-%s(["%s", "none"])' % (control_id, + contact.jid) + if is_affiliation_change_allowed(self_contact, contact, 'none'): item.set_detailed_action_name(action) else: item.set_sensitive(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/921594c14c5129f0d8030e032f765d40b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/921594c14c5129f0d8030e032f765d40b… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2019