Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] Fix private chat
by Philipp Hörist 01 Mar '21

01 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 5b75c68a by lovetox at 2021-03-01T22:30:11+01:00 Fix private chat - - - - - 8 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/modules/contacts.py - gajim/common/modules/vcard_avatars.py - gajim/groupchat_control.py - gajim/gtk/chat_stack.py - gajim/gtk/main.py - gajim/privatechat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -101,17 +101,10 @@ class ChatControl(ChatControlBase): COMMAND_HOST = ChatCommands # type: ClassVar[Type[CommandHost]] def __init__(self, parent_win, jid, acct, session, resource=None): - - contact = app.get_client(acct).get_module('Contacts').get_contact(jid) - contact.connect('presence-update', self._on_presence_update) - contact.connect('chatstate-update', self._on_chatstate_update) - contact.connect('nickname-update', self._on_nickname_update) - contact.connect('avatar-update', self._on_avatar_update) - ChatControlBase.__init__(self, parent_win, 'chat_control', - contact, + jid, acct, resource) @@ -225,6 +218,14 @@ def __init__(self, parent_win, jid, acct, session, resource=None): app.plugin_manager.gui_extension_point('chat_control', self) self.update_actions() + def _connect_contact_signals(self): + self.contact.multi_connect({ + 'presence-update': self._on_presence_update, + 'chatstate-update': self._on_chatstate_update, + 'nickname-update': self._on_nickname_update, + 'avatar-update': self._on_avatar_update, + }) + @property def jid(self): return self.contact.jid @@ -315,7 +316,7 @@ def update_actions(self): # Send file (Jingle) jingle_support = self.contact.supports(Namespace.JINGLE_FILE_TRANSFER_5) - jingle_conditions = jingle_support and not self.contact.show.is_offline + jingle_conditions = jingle_support and self.contact.is_available jingle = win.lookup_action('send-file-jingle-' + self.control_id) jingle.set_enabled(online and jingle_conditions) @@ -532,7 +533,7 @@ def _on_update_client_info(self, event): return self.xml.phone_image.set_visible(contact.uses_phone) - def _on_chatstate_update(self, _contact, _signal_name): + def _on_chatstate_update(self, *args): self.draw_banner_text() def _on_nickname_update(self, _contact, _signal_name): ===================================== gajim/chat_control_base.py ===================================== @@ -43,7 +43,6 @@ from gajim.common.i18n import _ from gajim.common.nec import EventHelper from gajim.common.helpers import AdditionalDataDict -from gajim.common.contacts import GC_Contact from gajim.common.structs import OutgoingMessage from gajim import gtkgui_helpers @@ -99,7 +98,7 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): _type = None # type: ControlType - def __init__(self, parent_win, widget_name, contact, acct, + def __init__(self, parent_win, widget_name, jid, acct, resource=None): EventHelper.__init__(self) # Undo needs this variable to know if space has been pressed. @@ -108,7 +107,13 @@ def __init__(self, parent_win, widget_name, contact, acct, self.handlers = {} self.parent_win = parent_win + + groupchat = self._type != ControlType.CHAT + contact = app.get_client(acct).get_module('Contacts').get_contact( + jid, groupchat=groupchat) self.contact = contact + self._connect_contact_signals() + self.account = acct self.resource = resource @@ -267,6 +272,9 @@ def __init__(self, parent_win, widget_name, contact, acct, # to properly use the super, because of the old code. CommandTools.__init__(self) + def _connect_contact_signals(self): + raise NotImplementedError + def process_event(self, event): method_name = event.name.replace('-', '_') method_name = f'_on_{method_name}' @@ -470,9 +478,7 @@ def setup_seclabel(self): # text to show is in in first column of liststore self.xml.label_selector.add_attribute(cell, 'text', 0) con = app.connections[self.account] - jid = self.contact.jid - if self._type.is_privatechat: - jid = self.gc_contact.room_jid + jid = self.contact.jid.bare if con.get_module('SecLabels').supported: con.get_module('SecLabels').request_catalog(jid) @@ -480,9 +486,7 @@ def _sec_labels_received(self, event): if event.account != self.account: return - jid = self.contact.jid - if self._type.is_privatechat: - jid = self.gc_contact.room_jid + jid = self.contact.jid.bare if event.jid != jid: return @@ -971,9 +975,7 @@ def get_seclabel(self): return None con = app.connections[self.account] - jid = self.contact.jid - if self._type.is_privatechat: - jid = self.gc_contact.room_jid + jid = self.contact.jid.bare catalog = con.get_module('SecLabels').get_catalog(jid) labels, label_list = catalog.labels, catalog.get_label_names() lname = label_list[idx] ===================================== gajim/common/modules/contacts.py ===================================== @@ -393,6 +393,10 @@ def affiliation(self): def role(self): return self._presence.role + @property + def chatstate(self): + return self._module('Chatstate').get_remote_chatstate(self._jid) + @property def avatar_sha(self): return self._client.get_module('VCardAvatars').get_avatar_sha(self._jid) ===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -163,7 +163,8 @@ def _process_update(self, jid, state, avatar_sha, groupchat): self._request_vcard(jid, avatar_sha, 'contact') def _muc_update_received(self, properties): - contact = self._con.get_module('Contacts').get_contact(properties.jid) + contact = self._con.get_module('Contacts').get_contact(properties.jid, + groupchat=True) nick = properties.jid.resource if properties.avatar_state == AvatarState.EMPTY: ===================================== gajim/groupchat_control.py ===================================== @@ -86,40 +86,12 @@ class GroupchatControl(ChatControlBase): COMMAND_HOST = GroupChatCommands def __init__(self, parent_win, jid, muc_data, acct): - - contact = app.get_client(acct).get_module('Contacts').get_contact( - jid, groupchat=True) - contact.multi_connect({ - 'avatar-update': self._on_avatar_update, - 'user-joined': self._on_user_joined, - 'user-left': self._on_user_left, - 'user-affiliation-changed': self._on_user_affiliation_changed, - 'user-role-changed': self._on_user_role_changed, - 'user-status-show-changed': self._on_user_status_show_changed, - 'user-nickname-changed': self._on_user_nickname_changed, - 'room-kicked': self._on_room_kicked, - 'room-destroyed': self._on_room_destroyed, - 'room-config-finished': self._on_room_config_finished, - 'room-config-failed': self._on_room_config_failed, - 'room-config-changed': self._on_room_config_changed, - 'room-password-required': self._on_room_password_required, - 'room-creation-failed': self._on_room_creation_failed, - 'room-presence-error': self._on_room_presence_error, - 'room-voice-request': self._on_room_voice_request, - 'room-captcha-challenge': self._on_room_captcha_challenge, - 'room-captcha-error': self._on_room_captcha_error, - 'room-subject': self._on_room_subject, - 'room-joined': self._on_room_joined, - 'room-join-failed': self._on_room_join_failed, - }) - - # contact.connect('user-avatar-update', self._on_user_avatar_update) - ChatControlBase.__init__(self, parent_win, 'groupchat_control', - contact, + jid, acct) + self.force_non_minimizable = False self.is_anonymous = True @@ -247,6 +219,31 @@ def __init__(self, parent_win, jid, muc_data, acct): app.plugin_manager.gui_extension_point('groupchat_control', self) self._restore_conversation() + def _connect_contact_signals(self): + self.contact.multi_connect({ + 'avatar-update': self._on_avatar_update, + 'user-joined': self._on_user_joined, + 'user-left': self._on_user_left, + 'user-affiliation-changed': self._on_user_affiliation_changed, + 'user-role-changed': self._on_user_role_changed, + 'user-status-show-changed': self._on_user_status_show_changed, + 'user-nickname-changed': self._on_user_nickname_changed, + 'room-kicked': self._on_room_kicked, + 'room-destroyed': self._on_room_destroyed, + 'room-config-finished': self._on_room_config_finished, + 'room-config-failed': self._on_room_config_failed, + 'room-config-changed': self._on_room_config_changed, + 'room-password-required': self._on_room_password_required, + 'room-creation-failed': self._on_room_creation_failed, + 'room-presence-error': self._on_room_presence_error, + 'room-voice-request': self._on_room_voice_request, + 'room-captcha-challenge': self._on_room_captcha_challenge, + 'room-captcha-error': self._on_room_captcha_error, + 'room-subject': self._on_room_subject, + 'room-joined': self._on_room_joined, + 'room-join-failed': self._on_room_join_failed, + }) + def _on_muc_state_changed(self, _muc_manager, _signal_name, state): if state == MUCJoinedState.JOINED: self.roster.initial_draw() ===================================== gajim/gtk/chat_stack.py ===================================== @@ -71,7 +71,7 @@ def add_group_chat(self, account, jid): def add_private_chat(self, account, jid): mw = self.get_toplevel() - control = PrivateChatControl(mw, jid, None, account, None) + control = PrivateChatControl(mw, jid, account) self._controls[(account, str(jid))] = control self.add_named(control.widget, f'{account}:{jid}') control.widget.show_all() ===================================== gajim/gtk/main.py ===================================== @@ -487,6 +487,7 @@ def _load_chats(self): for account, jid, type_, pinned in open_chats: if account not in active_accounts: continue + self.add_chat_for_workspace(workspace_id, account, jid, type_, pinned=pinned) @@ -511,9 +512,13 @@ def _on_event(self, event): if not self.chat_exists(event.account, event.jid): if event.name == 'message-received': if event.properties.is_muc_pm: - self.add_private_chat(event.account, event.jid, 'pm') + self.add_private_chat(event.account, + event.properties.jid, + 'pm') else: - self.add_chat(event.account, event.jid, 'contact') + self.add_chat(event.account, + event.properties.jid, + 'contact') else: # No chat is open, dont handle any gui events return ===================================== gajim/privatechat_control.py ===================================== @@ -46,56 +46,48 @@ class PrivateChatControl(ChatControl): # will be processed with this command host. COMMAND_HOST = PrivateChatCommands - def __init__(self, parent_win, gc_contact, contact, account, session): - room_jid = gc_contact.room_jid - self.room_ctrl = app.window.get_control(account, room_jid) - self.gc_contact = gc_contact - ChatControl.__init__(self, parent_win, contact, account, session) + def __init__(self, parent_win, jid, account): + client = app.get_client(account) + self._room_contact = client.get_module('Contacts').get_contact(jid.bare) + self._manager = client.get_module('MUC').get_manager() + + ChatControl.__init__(self, parent_win, jid, account, None) - # pylint: disable=line-too-long # self.register_events([ # ('update-gc-avatar', ged.GUI1, self._on_update_gc_avatar), # ('caps-update', ged.GUI1, self._on_caps_update), - # ('muc-user-joined', ged.GUI1, self._on_user_joined), - # ('muc-user-left', ged.GUI1, self._on_user_left), - # ('muc-nickname-changed', ged.GUI1, self._on_nickname_changed), - # ('muc-self-presence', ged.GUI1, self._on_self_presence), - # ('muc-self-kicked', ged.GUI1, self._on_disconnected), - # ('muc-user-status-show-changed', ged.GUI1, self._on_status_show_changed), - # ('muc-destroyed', ged.GUI1, self._on_disconnected), - # ]) - # pylint: enable=line-too-long - - @property - def contact(self): - return self.gc_contact.as_contact() - @contact.setter - def contact(self, _value): - # TODO: remove all code that sets the contact here - return + def _connect_contact_signals(self): + self.contact.multi_connect({ + 'user-avatar-update': self._on_user_avatar_update, + 'user-joined': self._on_user_joined, + 'user-left': self._on_user_left, + 'user-status-show-changed': self._on_user_status_show_changed, + 'user-nickname-changed': self._on_user_nickname_changed, + # 'room-kicked': self._on_room_kicked, + # 'room-destroyed': self._on_room_destroyed, + 'room-joined': self._on_room_joined, + # 'room-left': self._on_room_left + 'chatstate-update': self._on_chatstate_update, + }) @property def room_name(self): - if self.room_ctrl is not None: - return self.room_ctrl.room_name - return self.gc_contact.room_jid + return self._room_contact.name def get_our_nick(self): - return self.room_ctrl.nick - - def _on_caps_update(self, event): - if event.fjid != self.gc_contact.get_full_jid(): - return - self.update_contact() - - def _on_nickname_changed(self, event): - if event.properties.new_jid != self.gc_contact.get_full_jid(): - return - - nick = event.properties.muc_nickname - new_nick = event.properties.muc_user.nick - if event.properties.is_muc_self_presence: + muc_data = self._manager.get(self._room_contact.jid) + return muc_data.nick + + def _on_user_nickname_changed(self, + _contact, + _signal_name, + _user_contact, + properties): + + nick = properties.muc_nickname + new_nick = properties.muc_user.nick + if properties.is_muc_self_presence: message = _('You are now known as %s') % new_nick else: message = _('{nick} is now known ' @@ -104,31 +96,23 @@ def _on_nickname_changed(self, event): self.add_info_message(message) self.draw_banner() - app.interface.msg_win_mgr.change_key(str(event.properties.jid), - str(event.properties.new_jid), - self.account) - - self.parent_win.redraw_tab(self) self.update_ui() - @event_filter(['account']) - def _on_status_show_changed(self, event): - if event.properties.jid != self.gc_contact.get_full_jid(): - return - - nick = event.properties.muc_nickname - status = event.properties.status + def _on_user_status_show_changed(self, + _contact, + _signal_name, + _user_contact, + properties): + nick = properties.muc_nickname + status = properties.status status = '' if status is None else ' - %s' % status - show = helpers.get_uf_show(event.properties.show.value) + show = helpers.get_uf_show(properties.show.value) - if not app.settings.get_group_chat_setting(self.account, - self.gc_contact.room_jid, - 'print_status'): - self.parent_win.redraw_tab(self) + if not self._room_contact.settings.get('print_status'): self.update_ui() return - if event.properties.is_muc_self_presence: + if properties.is_muc_self_presence: message = _('You are now {show}{status}').format(show=show, status=status) @@ -137,46 +121,24 @@ def _on_status_show_changed(self, event): show=show, status=status) self.add_status_message(message) - self.parent_win.redraw_tab(self) self.update_ui() - @event_filter(['account']) - def _on_disconnected(self, event): - if event.properties.jid != self.gc_contact.get_full_jid(): - return + # def _on_disconnected(self, event): + # if event.properties.jid != self.gc_contact.get_full_jid(): + # return + # self.got_disconnected() + def _on_user_left(self, *args): self.got_disconnected() - @event_filter(['account']) - def _on_user_left(self, event): - if event.properties.jid != self.gc_contact.get_full_jid(): - return - - self.got_disconnected() - - @event_filter(['account']) - def _on_user_joined(self, event): - if event.properties.jid != self.gc_contact.get_full_jid(): - return - - self.gc_contact = app.contacts.get_gc_contact( - self.account, self.gc_contact.room_jid, self.gc_contact.name) - self.parent_win.redraw_tab(self) + def _on_user_joined(self, *args): self.got_connected() - @event_filter(['account']) - def _on_self_presence(self, event): - if event.properties.jid != self.gc_contact.get_full_jid(): + def _on_room_joined(self, *args): + if not self.contact.is_available: return - - self.parent_win.redraw_tab(self) self.got_connected() - def _on_update_gc_avatar(self, event): - if event.contact != self.gc_contact: - return - self._update_avatar() - def send_message(self, message, xhtml=None, process_commands=True, attention=False): """ @@ -188,14 +150,13 @@ def send_message(self, message, xhtml=None, process_commands=True, # We need to make sure that we can still send through the room and that # the recipient did not go away - if self.gc_contact.presence.is_unavailable: + if not self.contact.is_available: ErrorDialog( _('Sending private message failed'), #in second %s code replaces with nickname _('You are no longer in group chat "%(room)s" or ' '"%(nick)s" has left.') % { - 'room': self.room_name, 'nick': self.gc_contact.name}, - transient_for=self.parent_win.window) + 'room': self.room_name, 'nick': self.contact.name}) return ChatControl.send_message(self, message, @@ -204,35 +165,16 @@ def send_message(self, message, xhtml=None, process_commands=True, attention=attention) def update_ui(self): - if self.gc_contact.presence.is_unavailable: + if not self.contact.is_available: self.got_disconnected() else: self.got_connected() - def _update_avatar(self): - scale = self.parent_win.window.get_scale_factor() - surface = self.gc_contact.get_avatar(AvatarSize.CHAT, - scale, - self.gc_contact.show.value) - - self.xml.avatar_image.set_from_surface(surface) - - def get_tab_image(self): - if self.gc_contact.presence.is_unavailable: - show = 'offline' - else: - show = self.gc_contact.show.value - scale = self.parent_win.window.get_scale_factor() - return self.gc_contact.get_avatar(AvatarSize.ROSTER, - scale, - show) - - def update_contact(self): - self.contact = self.gc_contact.as_contact() + def _on_user_avatar_update(self, *args): + self._update_avatar() def got_disconnected(self): ChatControl.got_disconnected(self) - self.parent_win.redraw_tab(self) ChatControl.update_ui(self) def got_connected(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5b75c68ae0c582db97b5120b280e57c8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5b75c68ae0c582db97b5120b280e57c8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Add room-left signal
by Philipp Hörist 01 Mar '21

01 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: b8d30875 by lovetox at 2021-03-01T17:41:28+01:00 Add room-left signal - - - - - 57394b05 by lovetox at 2021-03-01T17:46:08+01:00 Fix muc user avatar update - - - - - 3 changed files: - gajim/common/modules/contacts.py - gajim/common/modules/muc.py - gajim/gui_interface.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -147,10 +147,6 @@ def get_resource(self, resource): contact = self.add_resource(resource) return contact - # @property - # def groups(self): - # return self._module('Roster').get_groups(self._jid) - @property def is_available(self): return any([contact.is_available for contact in self._resources.values()]) @@ -333,7 +329,7 @@ def update_avatar(self, *args): def set_not_joined(self): for contact in self._resources.values(): - contact.update_presence(UNKNOWN_MUC_PRESENCE) + contact.update_presence(UNKNOWN_MUC_PRESENCE, notify=False) def get_user_nicknames(self): client = app.get_client(self._account) @@ -411,7 +407,11 @@ def get_avatar(self, return app.interface.avatar_storage.get_surface( self, size, scale, show, style=style) - def update_presence(self, presence, *args): + def update_presence(self, presence, *args, notify=True): + if not notify: + self._presence = presence + return + if not self._presence.available and presence.available: self._presence = presence self.notify('user-joined', *args) @@ -443,7 +443,7 @@ def set_state(self, state, presence): def update_avatar(self, *args): app.interface.avatar_storage.invalidate_cache(self._jid) - self.notify('avatar-update') + self.notify('user-avatar-update') def get_instance(*args: Any, **kwargs: Any) -> Tuple[Contacts, str]: ===================================== gajim/common/modules/muc.py ===================================== @@ -261,6 +261,7 @@ def leave(self, room_jid, reason=None): self._manager.set_state(room_jid, MUCJoinedState.NOT_JOINED) room = self._get_contact(room_jid) room.set_not_joined() + room.notify('room-left') def configure_room(self, room_jid): self._nbxmpp('MUC').request_config(room_jid, @@ -825,8 +826,9 @@ def reset_state(self): for muc in self._mucs.values(): self.set_state(muc.jid, MUCJoinedState.NOT_JOINED) self._joined_users.pop(muc.jid, None) - contact = client.get_module('Contacts').get_contact(muc.jid) - contact.set_not_joined() + room = client.get_module('Contacts').get_contact(muc.jid) + room.set_not_joined() + room.notify('room-left') def __contains__(self, room_jid): return room_jid in self._mucs ===================================== gajim/gui_interface.py ===================================== @@ -186,8 +186,7 @@ def _response(account, answer): args=[obj, 'yes'])]).show() def handle_event_iq_error(self, event): - ctrl = self.msg_win_mgr.get_control(event.properties.jid.bare, - event.account) + ctrl = app.window.get_control(event.account, event.properties.jid.bare) if ctrl and ctrl.is_groupchat: ctrl.add_info_message('Error: %s' % event.properties.error) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6d5e9c5f5ce4980aab8a8e9a43ca010… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6d5e9c5f5ce4980aab8a8e9a43ca010… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 109 commits: Adapt to nbxmpp chatstate changes
by Philipp Hörist 01 Mar '21

01 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 213ee3cd by lovetox at 2021-02-27T11:44:52+01:00 Adapt to nbxmpp chatstate changes - - - - - 97080f7a by lovetox at 2021-02-27T12:16:09+01:00 UserAvatar: Handle empty data nodes - - - - - 508a0604 by lovetox at 2021-02-28T11:01:55+01:00 Use bare_match() bareMatch() is deprecated - - - - - 2bef238b by lovetox at 2021-03-01T16:26:37+01:00 StatusIcon: Only hide application when its focused - - - - - db6f0aa6 by lovetox at 2021-03-01T16:28:38+01:00 Windows: Open uris with webbrowser lib Trying to work around #10455 - - - - - 67cc179d by lovetox at 2021-03-01T17:03:06+01:00 StatusIcon: Refactor on_left_click() behavior - - - - - c553c29f by lovetox at 2021-03-01T17:25:42+01:00 Start - - - - - 4fafaecb by lovetox at 2021-03-01T17:25:42+01:00 Disable CI - - - - - f9e86897 by lovetox at 2021-03-01T17:25:42+01:00 Really disable CI - - - - - 7b71336d by lovetox at 2021-03-01T17:25:42+01:00 Add Workspace settings API - - - - - ac378186 by lovetox at 2021-03-01T17:25:42+01:00 Store and Open chats - - - - - 2f5be63f by lovetox at 2021-03-01T17:25:42+01:00 Add remove_chat() - - - - - 9f3db1cf by lovetox at 2021-03-01T17:25:42+01:00 Account Side Bar - - - - - 05a4c812 by lovetox at 2021-03-01T17:25:42+01:00 Add Workspace Side Bar - - - - - 5d8745f1 by wurstsalat at 2021-03-01T17:25:42+01:00 ChatList: Add basic elements - - - - - c08acfb0 by wurstsalat at 2021-03-01T17:25:42+01:00 ChatListStack: Add Start Chat - - - - - 5cf9031c by wurstsalat at 2021-03-01T17:25:42+01:00 Add basic Sidebar styling - - - - - beece50d by wurstsalat at 2021-03-01T17:25:42+01:00 Improve styling for Sidebar and ChatList - - - - - c9fc7716 by lovetox at 2021-03-01T17:25:42+01:00 Store chatlist on remove - - - - - 587648c7 by lovetox at 2021-03-01T17:25:42+01:00 Add/Remove Workspaces - - - - - 23edfcc7 by lovetox at 2021-03-01T17:25:42+01:00 Allow to add chats to different workspaces - - - - - 723f908d by lovetox at 2021-03-01T17:25:42+01:00 Add transparent backgrounds - - - - - 1ecd0417 by wurstsalat at 2021-03-01T17:25:42+01:00 AccountSideBar: Improve styling - - - - - 02267fd0 by wurstsalat at 2021-03-01T17:25:42+01:00 WorkspaceSidebar: Improve styling - - - - - 2c6f6074 by lovetox at 2021-03-01T17:25:42+01:00 Improve left sidebar - - - - - 12b843ae by lovetox at 2021-03-01T17:25:42+01:00 css - - - - - 3985de7a by lovetox at 2021-03-01T17:25:42+01:00 Dont fail when account is disabled - - - - - cdaed4a3 by lovetox at 2021-03-01T17:25:42+01:00 CSS - - - - - 95d8f9fb by wurstsalat at 2021-03-01T17:25:42+01:00 AvatarSelector: Add Load Image button - - - - - 62c3badc by Daniel Brötzmann at 2021-03-01T17:25:42+01:00 Workspace: Add Workspace edit dialog - - - - - 5de91862 by wurstsalat at 2021-03-01T17:25:42+01:00 Workspace: Add title and editing functionality - - - - - 028601b2 by wurstsalat at 2021-03-01T17:25:42+01:00 MainWindow: Add Paned for chat list and chat controls - - - - - aab34e84 by lovetox at 2021-03-01T17:25:42+01:00 Store type for open chats - - - - - 7051329d by lovetox at 2021-03-01T17:25:42+01:00 Store workspace dialog settings - - - - - ef1d8329 by lovetox at 2021-03-01T17:25:42+01:00 Fix adding new Workspace - - - - - 8194de85 by lovetox at 2021-03-01T17:25:42+01:00 Fix some selection bugs - - - - - 7947f848 by Daniel Brötzmann at 2021-03-01T17:25:42+01:00 ChatListStack: Wrap in ScrolledWindow - - - - - 0f3d7274 by lovetox at 2021-03-01T17:25:42+01:00 Move scrolled window into gui xml - - - - - 00b3635e by lovetox at 2021-03-01T17:25:42+01:00 sytle chatlist - - - - - 99e0dc76 by wurstsalat at 2021-03-01T17:25:42+01:00 ChatList: Styling - - - - - d9c82a5b by wurstsalat at 2021-03-01T17:25:42+01:00 MainWindow: Styling - - - - - f2e3338a by wurstsalat at 2021-03-01T17:25:42+01:00 Accounts: Add basic account page - - - - - 7d4b8ec4 by lovetox at 2021-03-01T17:25:42+01:00 Refactor Groupchats - - - - - 7d46af73 by lovetox at 2021-03-01T17:25:42+01:00 Start Chat: Destroy after joining MUC - - - - - eedc6248 by lovetox at 2021-03-01T17:25:42+01:00 Disable Roster - - - - - bb42b0da by lovetox at 2021-03-01T17:25:42+01:00 Make quit work - - - - - b0c68318 by lovetox at 2021-03-01T17:25:42+01:00 Stuff - - - - - 51545536 by Daniel Brötzmann at 2021-03-01T17:25:42+01:00 ChatList: Add friendly timestamps - - - - - 93d0c43b by Daniel Brötzmann at 2021-03-01T17:25:42+01:00 ChatList: Unread counter styling - - - - - c1522a93 by Daniel Brötzmann at 2021-03-01T17:25:42+01:00 ChatList: Group chat avatars and message lines - - - - - 5751dfa2 by Daniel Brötzmann at 2021-03-01T17:25:42+01:00 Paned: Improve ChatList resizing - - - - - f71c1212 by Daniel Brötzmann at 2021-03-01T17:25:42+01:00 ChatList: Use groupchat name, improve ellipsizing - - - - - fab002ef by Daniel Brötzmann at 2021-03-01T17:25:42+01:00 ChatList: Add group chat nicks - - - - - 58d1760d by lovetox at 2021-03-01T17:25:42+01:00 Remove unread_messages table - - - - - 377e53b9 by lovetox at 2021-03-01T17:25:42+01:00 add unread cache - - - - - c15c7a30 by lovetox at 2021-03-01T17:25:42+01:00 Add notifications - - - - - ef25d4a1 by lovetox at 2021-03-01T17:25:42+01:00 Fix notifications - - - - - 1d1d16a3 by Daniel Brötzmann at 2021-03-01T17:25:42+01:00 ChatList: Move ui to glade file - - - - - 8d05aa03 by Daniel Brötzmann at 2021-03-01T17:25:42+01:00 ChatList: Add RosterTooltip - - - - - 14db947b by lovetox at 2021-03-01T17:25:42+01:00 Move event handling to main - - - - - e8e8fce3 by lovetox at 2021-03-01T17:25:42+01:00 Fix some events - - - - - 9fec500b by lovetox at 2021-03-01T17:25:42+01:00 Reset unread counter - - - - - 9c442f1a by lovetox at 2021-03-01T17:25:42+01:00 Fix more events - - - - - 2297fbbe by wurstsalat at 2021-03-01T17:25:42+01:00 WorkspaceSidebar: Add unread counter - - - - - 9d6fa97c by lovetox at 2021-03-01T17:25:42+01:00 Unread count improv - - - - - 22fd0ad3 by lovetox at 2021-03-01T17:25:43+01:00 Add unread count to workspace - - - - - 154ec94d by lovetox at 2021-03-01T17:25:43+01:00 Dont allow chats to be opened multiple times - - - - - b7786a2b by lovetox at 2021-03-01T17:25:43+01:00 Don’t notify on messages from ourself - - - - - a6d9e10b by lovetox at 2021-03-01T17:25:43+01:00 Use consistent jid attribute - - - - - 273efa22 by lovetox at 2021-03-01T17:25:43+01:00 Fix some events - - - - - 2d2aebc9 by lovetox at 2021-03-01T17:25:43+01:00 Handle presence - - - - - 17d59aea by lovetox at 2021-03-01T17:25:43+01:00 Sort with activity - - - - - 5f26bcaa by lovetox at 2021-03-01T17:25:43+01:00 Save handle position - - - - - 52763ce1 by lovetox at 2021-03-01T17:25:43+01:00 Connect Menu actions - - - - - 2baf6696 by lovetox at 2021-03-01T17:25:43+01:00 Bring back more actions - - - - - 6bcc94f8 by lovetox at 2021-03-01T17:25:43+01:00 Fix transients - - - - - e2a2ba56 by lovetox at 2021-03-01T17:25:43+01:00 Make Private Chat work - - - - - c2a38c97 by Daniel Brötzmann at 2021-03-01T17:25:43+01:00 ChatList: Add avatar and name for PMs - - - - - fc1873c4 by Daniel Brötzmann at 2021-03-01T17:25:43+01:00 ChatList: Show indicator for group chats - - - - - 966c2aa0 by lovetox at 2021-03-01T17:25:43+01:00 New Contacts - - - - - 8df7764f by wurstsalat at 2021-03-01T17:25:43+01:00 Add Workspace menu - - - - - 6881437a by wurstsalat at 2021-03-01T17:25:43+01:00 WorkspaceSidebar: Add drag and drop - - - - - cacb86b6 by wurstsalat at 2021-03-01T17:25:43+01:00 Add update_workspace method - - - - - b5c06899 by wurstsalat at 2021-03-01T17:25:43+01:00 ChatList: Set message nick, process message-sent event - - - - - 47a8f6b6 by wurstsalat at 2021-03-01T17:25:43+01:00 ChatList: Update time, improve close button - - - - - 53150bde by Daniel Brötzmann at 2021-03-01T17:25:43+01:00 ChatList: Add chatstate icon - - - - - b871a4a6 by wurstsalat at 2021-03-01T17:25:43+01:00 ChatList: Improve chatstate icon - - - - - d2daa0e7 by wurstsalat at 2021-03-01T17:25:43+01:00 ChatList: Add context menu and pinning - - - - - 4c772f29 by wurstsalat at 2021-03-01T17:25:43+01:00 ChatList: Add basic list headers - - - - - 79eaa6ba by wurstsalat at 2021-03-01T17:25:43+01:00 WorkspaceSidebar: Improve item highlighting - - - - - 5be8c92a by wurstsalat at 2021-03-01T17:25:43+01:00 ChatList: Add move to workspace feature - - - - - 97977758 by wurstsalat at 2021-03-01T17:25:43+01:00 ChatList: Add placeholder - - - - - 9d04d256 by wurstsalat at 2021-03-01T17:25:43+01:00 Various improvements - - - - - 579fa223 by wurstsalat at 2021-03-01T17:25:43+01:00 ChatListStack: Fix moving group chats - - - - - 6f56ddfd by Daniel Brötzmann at 2021-03-01T17:25:43+01:00 Store pinned chats - - - - - b87378cf by Daniel Brötzmann at 2021-03-01T17:25:43+01:00 ChatList: Improve sorting - - - - - e0f301c0 by wurstsalat at 2021-03-01T17:25:43+01:00 WorkspaceDialog: Improvements - - - - - 8c8d1e4d by lovetox at 2021-03-01T17:25:43+01:00 Make contacts module work - - - - - 03cde334 by lovetox at 2021-03-01T17:26:45+01:00 further contacts - - - - - e4ac8914 by lovetox at 2021-03-01T17:26:45+01:00 Roster: add iter_contacts() - - - - - 0a432269 by lovetox at 2021-03-01T17:26:45+01:00 Fix receipt processing - - - - - 3ffcfbbf by lovetox at 2021-03-01T17:26:45+01:00 Fix subscription check - - - - - 488f706f by lovetox at 2021-03-01T17:26:45+01:00 Chatlist: Remove tooltip - - - - - 3b2b7a67 by lovetox at 2021-03-01T17:26:45+01:00 Destroy roster correctly - - - - - bdd43677 by lovetox at 2021-03-01T17:26:45+01:00 Move finalize check to app module - - - - - c3f9500f by lovetox at 2021-03-01T17:26:45+01:00 Settings: Add json encoder/decoder - - - - - 4425b19b by lovetox at 2021-03-01T17:26:45+01:00 Fix MUC rejoins - - - - - aa0c169d by lovetox at 2021-03-01T17:26:45+01:00 Refactor roster request code - - - - - 6d5e9c5f by lovetox at 2021-03-01T17:26:45+01:00 Contacts: Fix access to roster attr - - - - - 30 changed files: - − .gitlab-ci.yml - gajim/app_actions.py - gajim/application.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/app.py - gajim/common/connection_handlers_events.py - gajim/common/const.py - gajim/common/contacts.py - gajim/common/helpers.py - gajim/common/modules/__init__.py - gajim/common/modules/base.py - gajim/common/modules/blocking.py - gajim/common/modules/bookmarks.py - gajim/common/modules/chat_markers.py - gajim/common/modules/chatstates.py - + gajim/common/modules/contacts.py - gajim/common/modules/discovery.py - gajim/common/modules/httpupload.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/common/modules/presence.py - gajim/common/modules/receipts.py - gajim/common/modules/roster.py - gajim/common/modules/roster_item_exchange.py - gajim/common/modules/user_activity.py - gajim/common/modules/user_avatar.py - gajim/common/modules/user_location.py - gajim/common/modules/user_mood.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e9f3deb7e763a92ed4d110b719650f7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e9f3deb7e763a92ed4d110b719650f7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.3.1
by Philipp Hörist 01 Mar '21

01 Mar '21

Philipp Hörist pushed new tag gajim-1.3.1 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/gajim-1.3.1 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] 1.3.1
by Philipp Hörist 01 Mar '21

01 Mar '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 8000e11a by lovetox at 2021-03-01T17:08:43+01:00 1.3.1 - - - - - 3 changed files: - appveyor.yml - data/org.gajim.Gajim.appdata.xml.in - gajim/__init__.py Changes: ===================================== appveyor.yml ===================================== @@ -39,8 +39,8 @@ build_script: bash "git clone C:/projects/gajim C:/msys64/home/appveyor/gajim" bash "C:/msys64/home/appveyor/gajim/win/build.sh $($env:MSYS_ARCH)" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.3.0-$($env:ARCH)-$($env:TIME_STRING).exe" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.3.0-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.3.1-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.3.1-$($env:ARCH)-$($env:TIME_STRING).exe" # on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -72,6 +72,7 @@ <content_attribute id="social-audio">intense</content_attribute> </content_rating> <releases> + <release version="1.3.1" date="2021-03-01" /> <release version="1.3.0" date="2021-02-08" /> <release version="1.2.2" date="2020-08-15" /> <release version="1.2.1" date="2020-07-08" /> ===================================== gajim/__init__.py ===================================== @@ -2,7 +2,7 @@ import sys from pathlib import Path -__version__ = "1.3.0" +__version__ = "1.3.1" IS_FLATPAK = Path('/app/share/run-as-flatpak').exists() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8000e11adb50a8596d9360e2cbd34d69… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8000e11adb50a8596d9360e2cbd34d69… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] Translated using Weblate (German)
by Philipp Hörist 01 Mar '21

01 Mar '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 8e7d57ee by Daniel Brötzmann at 2021-03-01T17:02:57+01:00 Translated using Weblate (German) Currently translated at 100.0% (2219 of 2219 strings) Translation: Gajim/1.3 Translate-URL: https://translate.gajim.org/projects/gajim/1-3/de/ - - - - - 1 changed file: - po/de.po Changes: ===================================== po/de.po ===================================== @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: gajim 0.13\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-01 17:44+0100\n" -"PO-Revision-Date: 2021-01-20 20:26+0000\n" +"PO-Revision-Date: 2021-02-15 17:22+0000\n" "Last-Translator: Daniel Brötzmann <mailtrash(a)posteo.de>\n" "Language-Team: German <https://translate.gajim.org/projects/gajim/1-3/de/>\n" "Language: de\n" @@ -3855,7 +3855,7 @@ msgid "" "Do you want to join?" msgstr "" "hat dich in einen Gruppenchat eingeladen.\n" -"Willst du beitreten?" +"Möchtest du beitreten?" #: gajim/gtk/groupchat_invitation.py:75 gajim/gtk/discovery.py:1706 #: gajim/gtk/groupchat_join.py:68 gajim/data/gui/groupchat_control.ui:899 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8e7d57ee42fb98d553f2e3dfff26d982… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8e7d57ee42fb98d553f2e3dfff26d982… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StatusIcon: Refactor on_left_click() behavior
by Philipp Hörist 01 Mar '21

01 Mar '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 67cc179d by lovetox at 2021-03-01T17:03:06+01:00 StatusIcon: Refactor on_left_click() behavior - - - - - 1 changed file: - gajim/gtk/statusicon.py Changes: ===================================== gajim/gtk/statusicon.py ===================================== @@ -312,19 +312,24 @@ def _on_quit(_widget): def _on_left_click(self): win = app.interface.roster.window - if not app.events.get_systray_events(): - # No pending events, so toggle visible/hidden for roster window - if win.get_property('has-toplevel-focus'): - save_roster_position(win) - win.hide() - else: - win.show_all() - restore_roster_position(win) - if not app.settings.get('roster_window_skip_taskbar'): - win.set_property('skip-taskbar-hint', False) - win.present_with_time(Gtk.get_current_event_time()) - else: + if app.events.get_systray_events(): self._handle_first_event() + return + + if win.get_property('has-toplevel-focus'): + save_roster_position(win) + win.hide() + return + + visible = win.get_property('visible') + win.show_all() + if not visible: + # Window was minimized + restore_roster_position(win) + + if not app.settings.get('roster_window_skip_taskbar'): + win.set_property('skip-taskbar-hint', False) + win.present_with_time(Gtk.get_current_event_time()) @staticmethod def _handle_first_event(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/67cc179de367773bac11c029c6261a01… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/67cc179de367773bac11c029c6261a01… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] StatusIcon: Refactor on_left_click() behavior
by Philipp Hörist 01 Mar '21

01 Mar '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 87deec9c by lovetox at 2021-03-01T17:02:15+01:00 StatusIcon: Refactor on_left_click() behavior - - - - - 1 changed file: - gajim/gtk/statusicon.py Changes: ===================================== gajim/gtk/statusicon.py ===================================== @@ -312,19 +312,24 @@ def _on_quit(_widget): def _on_left_click(self): win = app.interface.roster.window - if not app.events.get_systray_events(): - # No pending events, so toggle visible/hidden for roster window - if win.get_property('has-toplevel-focus'): - save_roster_position(win) - win.hide() - else: - win.show_all() - restore_roster_position(win) - if not app.settings.get('roster_window_skip_taskbar'): - win.set_property('skip-taskbar-hint', False) - win.present_with_time(Gtk.get_current_event_time()) - else: + if app.events.get_systray_events(): self._handle_first_event() + return + + if win.get_property('has-toplevel-focus'): + save_roster_position(win) + win.hide() + return + + visible = win.get_property('visible') + win.show_all() + if not visible: + # Window was minimized + restore_roster_position(win) + + if not app.settings.get('roster_window_skip_taskbar'): + win.set_property('skip-taskbar-hint', False) + win.present_with_time(Gtk.get_current_event_time()) @staticmethod def _handle_first_event(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/87deec9cd4ae68741f67570f7211c9c6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/87deec9cd4ae68741f67570f7211c9c6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] Update ChangeLog
by Philipp Hörist 01 Mar '21

01 Mar '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 2a039f6a by lovetox at 2021-03-01T16:49:17+01:00 Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,29 @@ +Gajim 1.3.1 (01 March 2021) + + New + + * Add setting for GSSAPI authentication + + Changes + + * #10416 Remove conversion of ASCII emojis + + Bug fixes + + * #10273 VcardWindow: Fix resource string if resource is missing + * #10424 GroupChatInvitation: Show account badge + * #10430 Preferences: Check for pipeline before removing elements + * #10436 Stop early when handling connection-failed in handle_event + * #10438 Set account window stack as non-vhomogeneous + * #10443 ServiceRegistration: Use nbxmpp register methods + * #10445 Change dataform to href markup URLs in fixed field + * #10450 Workaround for crash on clicking links + * AvatarSelector: Improve error handling + * Profile: Show error if avatar upload fails + * UserAvatar: Handle empty data nodes + * StatusIcon: Only hide application when its focused + + Gajim 1.3.0 (08 February 2021) New View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2a039f6a3c5bcfda721f1e3a500ec3d3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2a039f6a3c5bcfda721f1e3a500ec3d3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] StatusIcon: Only hide application when its focused
by Philipp Hörist 01 Mar '21

01 Mar '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 2c41eee1 by lovetox at 2021-03-01T16:27:32+01:00 StatusIcon: Only hide application when its focused - - - - - 1 changed file: - gajim/gtk/statusicon.py Changes: ===================================== gajim/gtk/statusicon.py ===================================== @@ -314,10 +314,9 @@ def _on_left_click(self): win = app.interface.roster.window if not app.events.get_systray_events(): # No pending events, so toggle visible/hidden for roster window - if win.get_property('visible'): - if win.get_property('has-toplevel-focus') or os.name == 'nt': - save_roster_position(win) - win.hide() # else we hide it from VD that was visible in + if win.get_property('has-toplevel-focus'): + save_roster_position(win) + win.hide() else: win.show_all() restore_roster_position(win) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2c41eee113255731660ae6beacdb0c0d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2c41eee113255731660ae6beacdb0c0d… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits