Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: GajimMenu: Add default for value parameter
by Philipp Hörist (＠lovetox) 13 Mar '22

13 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 790a088e by lovetox at 2022-03-14T00:16:14+01:00 GajimMenu: Add default for value parameter - - - - - 9bb23460 by lovetox at 2022-03-14T00:18:39+01:00 Menus: Refactor SingleChat menus - Split into self contact, private chat and single chat menu - Use GajimMenu - - - - - 3 changed files: - gajim/gtk/controls/chat.py - gajim/gtk/menus.py - gajim/gtk/util.py Changes: ===================================== gajim/gtk/controls/chat.py ===================================== @@ -68,6 +68,8 @@ from gajim.command_system.framework import CommandHost from ..menus import get_encryption_menu +from ..menus import get_private_chat_menu +from ..menus import get_self_contact_menu from ..menus import get_singlechat_menu log = logging.getLogger('gajim.gui.controls.chat') @@ -116,8 +118,16 @@ def __init__(self, account: str, jid: JID) -> None: self.conversation_view.connect('call-declined', self._on_call_declined) # Menu for the HeaderBar - self.control_menu = get_singlechat_menu( - self.control_id, self.account, self.contact.jid, self._type) + if self._type == ControlType.CHAT: + if self.contact.is_self: + self.control_menu = get_self_contact_menu(self.control_id, + self.contact) + else: + self.control_menu = get_singlechat_menu(self.control_id, + self.contact) + else: + self.control_menu = get_private_chat_menu(self.control_id, + self.contact) # Settings menu self.xml.settings_menu.set_menu_model(self.control_menu) ===================================== gajim/gtk/menus.py ===================================== @@ -57,73 +57,68 @@ MenuItemListT = list[tuple[str, str, MenuValueT]] +def get_self_contact_menu(control_id: str, + contact: types.BareContact) -> GajimMenu: + account = contact.account + jid = contact.jid + + menu = GajimMenu() + + menu.add_item(_('Profile'), f'app.{account}-profile', f'"{account}"') + submenu = get_send_file_submenu(control_id) + menu.append_submenu(_('Send File'), submenu) + + params = RemoveHistoryActionParams(account=account, jid=jid) + menu.add_item(_('Remove History…'), 'app.remove-history', params) + menu.add_item(_('Search…'), 'win.search-history', None) + return menu + + def get_singlechat_menu(control_id: str, - account: str, - jid: JID, - type_: ControlType - ) -> Gio.Menu: - client = app.get_client(account) - is_self_contact = jid.bare == client.get_own_jid().bare - contact = client.get_module('Contacts').get_contact(jid) + contact: Union[types.BareContact, + types.GroupchatParticipant] + ) -> GajimMenu: - self_contact_menu: list[tuple[str, Any]] = [ - ('profile', _('Profile')), - (_('Send File'), [ - ('win.send-file-httpupload-', _('Upload File…')), - ('win.send-file-jingle-', _('Send File Directly…')) - ]), - ('app.remove-history', _('Remove History…')), - ('win.search-history', _('Search…')) - ] + menu = GajimMenu() + menu.add_item(_('Details'), f'win.information-{control_id}') + menu.add_item(_('Block Contact…'), f'win.block-contact-{control_id}') - singlechat_menu: list[tuple[str, Any]] = [ - ('win.information-', _('Details')), - ('win.block-contact-', _('Block Contact…')), - (_('Send File'), [ - ('win.send-file-httpupload-', _('Upload File…')), - ('win.send-file-jingle-', _('Send File Directly…')) - ]), - ('win.start-call-', _('Start Call…')), - ('win.search-history', _('Search…')) - ] + submenu = get_send_file_submenu(control_id) + menu.append_submenu(_('Send File'), submenu) + + menu.add_item(_('Start Call…'), f'win.start-call-{control_id}') + menu.add_item(_('Search…'), 'win.search-history') if can_add_to_roster(contact): - singlechat_menu.append(('win.add-to-roster-', - _('Add to Contact List…'))) - - def build_menu(preset: list[tuple[str, Any]]): - menu = Gio.Menu() - for item in preset: - if isinstance(item[1], str): - action_name, label = item - if action_name == 'win.search-history': - menuitem = Gio.MenuItem.new(label, action_name) - menuitem.set_action_and_target_value(action_name, None) - menu.append_item(menuitem) - elif action_name == 'profile': - action = f'app.{account}-{action_name}' - menuitem = Gio.MenuItem.new(label, action) - variant = GLib.Variant('s', account) - menuitem.set_action_and_target_value(action, variant) - menu.append_item(menuitem) - elif action_name == 'app.remove-history': - params = RemoveHistoryActionParams(account=account, jid=jid) - menuitem = Gio.MenuItem.new(label, action_name) - menuitem.set_action_and_target_value(action_name, - params.to_variant()) - menu.append_item(menuitem) - else: - menu.append(label, action_name + control_id) - else: - label, sub_menu = item - submenu = build_menu(sub_menu) - menu.append_submenu(label, submenu) - return menu + menu.append(_('Add to Contact List…'), + f'win.add-to-roster-{control_id}') - if is_self_contact: - return build_menu(self_contact_menu) + return menu - return build_menu(singlechat_menu) + +def get_private_chat_menu(control_id: str, + contact: types.GroupchatParticipant + ) -> GajimMenu: + + menu = GajimMenu() + menu.add_item(_('Details'), f'win.information-{control_id}') + menu.add_item(_('Upload File…'), f'win.send-file-httpupload-{control_id}') + menu.add_item(_('Search…'), 'win.search-history') + + if can_add_to_roster(contact): + menu.append(_('Add to Contact List…'), + f'win.add-to-roster-{control_id}') + + return menu + + +def get_send_file_submenu(control_id: str) -> GajimMenu: + menu = GajimMenu() + + menu.add_item(_('Upload File…'), f'win.send-file-httpupload-{control_id}') + menu.add_item(_('Send File Directly…'), + f'win.send-file-jingle-{control_id}') + return menu def get_groupchat_menu(control_id: str, account: str, jid: JID) -> GajimMenu: @@ -207,10 +202,10 @@ def build_accounts_menu() -> None: def get_encryption_menu(control_id: str, control_type: ControlType, - ) -> Optional[Gio.Menu]: - menu = Gio.Menu() - menu.append( - _('Disabled'), f'win.set-encryption-{control_id}::disabled') + ) -> Optional[GajimMenu]: + menu = GajimMenu() + action = f'win.set-encryption-{control_id}' + menu.add_item(_('Disabled'), action, '"disabled"') for name, plugin in app.plugin_manager.encryption_plugins.items(): if control_type.is_groupchat: if not hasattr(plugin, 'allow_groupchat'): @@ -218,8 +213,8 @@ def get_encryption_menu(control_id: str, if control_type.is_privatechat: if not hasattr(plugin, 'allow_privatechat'): continue - menu_action = f'win.set-encryption-{control_id}::{name}' - menu.append(name, menu_action) + menu.add_item(name, action, f'"{name}"') + if menu.get_n_items() == 1: return None return menu ===================================== gajim/gtk/util.py ===================================== @@ -931,7 +931,10 @@ def from_list(cls, menulist: MenuItemListT) -> GajimMenu: menu.append_item(menuitem) return menu - def add_item(self, label: str, action: str, value: MenuValueT) -> None: + def add_item(self, + label: str, + action: str, + value: Optional[MenuValueT] = None) -> None: item = make_menu_item(label, action, value) self.append_item(item) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c36528176c745f8da9546eb11b1d57d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c36528176c745f8da9546eb11b1d57d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: GajimMenu: Add from_list()
by Philipp Hörist (＠lovetox) 13 Mar '22

13 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: a16e3340 by lovetox at 2022-03-13T22:23:48+01:00 GajimMenu: Add from_list() - - - - - 67340fb2 by lovetox at 2022-03-13T22:24:28+01:00 Menus: Use GajimMenu - - - - - c3652817 by lovetox at 2022-03-13T22:33:16+01:00 Menus: Fix move to workspace action - - - - - 2 changed files: - gajim/gtk/menus.py - gajim/gtk/util.py Changes: ===================================== gajim/gtk/menus.py ===================================== @@ -49,7 +49,6 @@ from gajim.gui.structs import ForgetGroupchatActionParams from gajim.gui.structs import MoveChatToWorkspaceAP from gajim.gui.structs import RemoveHistoryActionParams -from gajim.gui.util import make_menu from gajim.gui.util import GajimMenu from gajim.gui.const import ControlType @@ -127,8 +126,8 @@ def build_menu(preset: list[tuple[str, Any]]): return build_menu(singlechat_menu) -def get_groupchat_menu(control_id: str, account: str, jid: JID) -> Gio.Menu: - menulist: MenuItemListT = [ +def get_groupchat_menu(control_id: str, account: str, jid: JID) -> GajimMenu: + menuitems: MenuItemListT = [ (_('Details'), f'win.groupchat-details-{control_id}', None), (_('Change Nickname…'), f'win.change-nickname-{control_id}', None), (_('Request Voice'), f'win.request-voice-{control_id}', None), @@ -136,10 +135,10 @@ def get_groupchat_menu(control_id: str, account: str, jid: JID) -> Gio.Menu: (_('Search…'), 'win.search-history', None) ] - return make_menu(menulist) + return GajimMenu.from_list(menuitems) -def get_account_menu(account: str) -> Gio.Menu: +def get_account_menu(account: str) -> GajimMenu: val = f'"{account}"' @@ -149,7 +148,7 @@ def get_account_menu(account: str) -> Gio.Menu: (_('Server Info'), f'app.{account}-server-info', val), ] - menu = make_menu(menuitems) + menu = GajimMenu.from_list(menuitems) advanced_menuitems: MenuItemListT = [ (_('Archiving Preferences'), f'app.{account}-archive', val), @@ -162,7 +161,7 @@ def get_account_menu(account: str) -> Gio.Menu: advanced_menuitems.append( (_('Bookmarks'), f'app.{account}-bookmarks', val)) - menu.append_submenu(_('Advanced'), make_menu(advanced_menuitems)) + menu.append_submenu(_('Advanced'), GajimMenu.from_list(advanced_menuitems)) return menu @@ -369,7 +368,7 @@ def get_conv_uri_context_menu(account: str, uri: URI) -> Optional[Gtk.Menu]: return menu -def get_roster_menu(account: str, jid: str, gateway: bool = False) -> Gio.Menu: +def get_roster_menu(account: str, jid: str, gateway: bool = False) -> GajimMenu: block_label = _('Block…') if jid_is_blocked(account, jid): @@ -388,10 +387,10 @@ def get_roster_menu(account: str, jid: str, gateway: bool = False) -> Gio.Menu: menuitems.insert( 1, (_('Modify Gateway…'), f'win.modify-gateway-{account}', value)) - return make_menu(menuitems) + return GajimMenu.from_list(menuitems) -def get_subscription_menu(account: str, jid: JID) -> Gio.Menu: +def get_subscription_menu(account: str, jid: JID) -> GajimMenu: params = AddChatActionParams(account=account, jid=jid, type='contact', @@ -405,16 +404,16 @@ def get_subscription_menu(account: str, jid: JID) -> Gio.Menu: (_('Deny'), f'win.subscription-deny-{account}', value), ] - return make_menu(menuitems) + return GajimMenu.from_list(menuitems) -def get_start_chat_row_menu(account: str, jid: JID) -> Gio.Menu: +def get_start_chat_row_menu(account: str, jid: JID) -> GajimMenu: params = ForgetGroupchatActionParams(account=account, jid=jid) menuitems: MenuItemListT = [ (_('Forget this Group Chat'), 'app.forget-groupchat', params), ] - return make_menu(menuitems) + return GajimMenu.from_list(menuitems) def get_chat_list_row_menu(workspace_id: str, @@ -434,12 +433,7 @@ def get_chat_list_row_menu(workspace_id: str, workspaces = app.settings.get_workspaces() if len(workspaces) > 1: submenu = menu.add_submenu(_('Move Chat')) - - params = MoveChatToWorkspaceAP(workspace_id=workspace_id, - account=account, - jid=jid) - - for name in get_workspace_names(workspace_id, account, jid): + for name, params in get_workspace_params(workspace_id, account, jid): submenu.add_item(name, 'win.move-chat-to-workspace', params) if can_add_to_roster(contact): @@ -452,83 +446,87 @@ def get_chat_list_row_menu(workspace_id: str, return menu -def get_workspace_names(current_workspace_id: str, - account: str, - jid: JID - ) -> Iterator[str]: +def get_workspace_params(current_workspace_id: str, + account: str, + jid: JID + ) -> Iterator[tuple[str, MoveChatToWorkspaceAP]]: for workspace_id in app.settings.get_workspaces(): if workspace_id == current_workspace_id: continue - yield app.settings.get_workspace_setting(workspace_id, 'name') + name = app.settings.get_workspace_setting(workspace_id, 'name') + params = MoveChatToWorkspaceAP(workspace_id=workspace_id, + account=account, + jid=jid) + yield name, params def get_groupchat_admin_menu(control_id: str, self_contact: types.GroupchatParticipant, - contact: types.GroupchatParticipant) -> Gio.Menu: + contact: types.GroupchatParticipant) -> GajimMenu: - adminitems: MenuItemListT = [] + menu = GajimMenu() action = f'win.change-affiliation-{control_id}' if is_affiliation_change_allowed(self_contact, contact, 'owner'): value = f'["{contact.real_jid}", "owner"]' - adminitems.append((_('Make Owner'), action, value)) + menu.add_item(_('Make Owner'), action, value) if is_affiliation_change_allowed(self_contact, contact, 'admin'): value = f'["{contact.real_jid}", "admin"]' - adminitems.append((_('Make Admin'), action, value)) + menu.add_item(_('Make Admin'), action, value) if is_affiliation_change_allowed(self_contact, contact, 'member'): value = f'["{contact.real_jid}", "member"]' - adminitems.append((_('Make Member'), action, value)) + menu.add_item(_('Make Member'), action, value) if is_affiliation_change_allowed(self_contact, contact, 'none'): value = f'["{contact.real_jid}", "none"]' - adminitems.append((_('Revoke Member'), action, value)) + menu.add_item(_('Revoke Member'), action, value) if is_affiliation_change_allowed(self_contact, contact, 'outcast'): value = f'"{contact.real_jid}"' - adminitems.append((_('Ban…'), f'win.ban-{control_id}', value)) + menu.add_item(_('Ban…'), f'win.ban-{control_id}', value) - if not adminitems: - adminitems.append((_('Not Available'), 'dummy', None)) + if not menu.get_n_items(): + menu.add_item(_('Not Available'), 'dummy', None) - return make_menu(adminitems) + return menu def get_groupchat_mod_menu(control_id: str, self_contact: types.GroupchatParticipant, contact: types.GroupchatParticipant - ) -> Gio.Menu: + ) -> GajimMenu: - moditems: MenuItemListT = [] + menu = GajimMenu() if is_role_change_allowed(self_contact, contact): value = f'"{contact.name}"' - moditems.append((_('Kick…'), f'win.kick-{control_id}', value)) + menu.add_item(_('Kick…'), f'win.kick-{control_id}', value) action = f'win.change-role-{control_id}' if is_role_change_allowed(self_contact, contact): if contact.role.is_visitor: value = f'["{contact.name}", "participant"]' - moditems.append((_('Grant Voice'), action, value)) + menu.add_item(_('Grant Voice'), action, value) else: value = f'["{contact.name}", "visitor"]' - moditems.append((_('Revoke Voice'), action, value)) + menu.add_item(_('Revoke Voice'), action, value) - if not moditems: - moditems.append((_('Not Available'), 'dummy', None)) + if not menu.get_n_items(): + menu.add_item(_('Not Available'), 'dummy', None) - return make_menu(moditems) + return menu def get_groupchat_roster_menu(account: str, control_id: str, self_contact: types.GroupchatParticipant, contact: types.GroupchatParticipant - ) -> Gio.Menu: + ) -> GajimMenu: value = f'"{contact.name}"' @@ -538,7 +536,7 @@ def get_groupchat_roster_menu(account: str, ] real_contact = contact.get_real_contact() - if real_contact is not None and not real_contact.is_in_roster: + if real_contact is not None and can_add_to_roster(real_contact): value = f'["{account}", "{real_contact.jid}"]' action = f'app.{account}-add-contact' general_items.insert(1, (_('Add to Contact List…'), action, value)) @@ -546,7 +544,7 @@ def get_groupchat_roster_menu(account: str, mod_menu = get_groupchat_mod_menu(control_id, self_contact, contact) admin_menu = get_groupchat_admin_menu(control_id, self_contact, contact) - menu = make_menu(general_items) + menu = GajimMenu.from_list(general_items) menu.append_section(_('Moderation'), mod_menu) menu.append_section(_('Administration'), admin_menu) return menu ===================================== gajim/gtk/util.py ===================================== @@ -919,18 +919,18 @@ def make_menu_item(label: str, return item -def make_menu(menuitems: MenuItemListT) -> Gio.Menu: - menu = Gio.Menu() - for item in menuitems: - menuitem = make_menu_item(*item) - menu.append_item(menuitem) - return menu - - class GajimMenu(Gio.Menu): def __init__(self): Gio.Menu.__init__(self) + @classmethod + def from_list(cls, menulist: MenuItemListT) -> GajimMenu: + menu = cls() + for item in menulist: + menuitem = make_menu_item(*item) + menu.append_item(menuitem) + return menu + def add_item(self, label: str, action: str, value: MenuValueT) -> None: item = make_menu_item(label, action, value) self.append_item(item) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8e1e2d09e3106f7bcfc37de1fafc37d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8e1e2d09e3106f7bcfc37de1fafc37d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: Contacts: Add is_self property
by Philipp Hörist (＠lovetox) 13 Mar '22

13 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: cdfe617b by lovetox at 2022-03-13T22:02:21+01:00 Contacts: Add is_self property - - - - - 76812816 by lovetox at 2022-03-13T22:02:21+01:00 Contacts: Add helper method can_add_to_roster() - - - - - feac903d by lovetox at 2022-03-13T22:02:21+01:00 Menus: Simplify add to roster check - - - - - a6ffdd5f by lovetox at 2022-03-13T22:02:21+01:00 Menus: Simplify unread check - - - - - 389feb73 by lovetox at 2022-03-13T22:02:21+01:00 Add GajimMenu - - - - - 8e1e2d09 by lovetox at 2022-03-13T22:02:21+01:00 Menus: Refactor ChatList menu - Use GajimMenu - Simplify code - - - - - 5 changed files: - gajim/common/modules/contacts.py - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/structs.py - gajim/gtk/util.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -246,6 +246,11 @@ def __init__(self, logger: LogAdapter, jid: JID, account: str) -> None: self._avatar_sha = app.storage.cache.get_contact(jid, 'avatar') + @property + def is_self(self): + own_jid = app.get_client(self._account).get_own_jid().new_as_bare() + return own_jid == self.jid + def supports(self, requested_feature: str) -> bool: for resource in self.iter_resources(): if resource.supports(requested_feature): @@ -780,3 +785,18 @@ def update_presence(self, def update_avatar(self, *args: Any) -> None: app.app.avatar_storage.invalidate_cache(self._jid) self.notify('user-avatar-update') + + +def can_add_to_roster(contact: Union[BareContact, + GroupchatContact, + GroupchatParticipant]) -> bool: + + if isinstance(contact, GroupchatContact): + return False + + if isinstance(contact, GroupchatParticipant): + return contact.real_jid is not None + + if contact.is_self: + return False + return not contact.is_in_roster ===================================== gajim/gtk/main.py ===================================== @@ -57,6 +57,7 @@ from .util import set_urgency_hint from .const import UNLOAD_CHAT_TIME from .structs import AddChatActionParams +from .structs import AddToRosterParams log = logging.getLogger('gajim.gui.main') @@ -275,7 +276,7 @@ def _add_actions(self) -> None: ('activate-workspace', 's', self._activate_workspace), ('add-chat', 'a{sv}', self._add_chat), ('add-group-chat', 'as', self._add_group_chat), - ('add-to-roster', 'as', self._add_to_roster), + ('add-to-roster', 'a{sv}', self._add_to_roster), ] for action in actions: @@ -599,8 +600,8 @@ def select_chat_number(self, number: int) -> None: def _add_to_roster(_action: Gio.SimpleAction, param: GLib.Variant) -> None: - _workspace, account, jid = param.unpack() - open_window('AddContact', account=account, jid=JID.from_string(jid)) + params = AddToRosterParams.from_variant(param) + open_window('AddContact', account=params.account, jid=params.jid) def show_app_page(self) -> None: self._account_side_bar.unselect_all() ===================================== gajim/gtk/menus.py ===================================== @@ -17,6 +17,7 @@ from __future__ import annotations from typing import Any +from typing import Iterator from typing import cast from typing import Optional from typing import Union @@ -41,13 +42,15 @@ from gajim.common.const import URIAction from gajim.common.structs import URI from gajim.common.structs import VariantMixin +from gajim.common.modules.contacts import can_add_to_roster from gajim.gui.structs import AddChatActionParams +from gajim.gui.structs import AddToRosterParams from gajim.gui.structs import ForgetGroupchatActionParams from gajim.gui.structs import MoveChatToWorkspaceAP from gajim.gui.structs import RemoveHistoryActionParams -from gajim.gui.util import make_menu_item from gajim.gui.util import make_menu +from gajim.gui.util import GajimMenu from gajim.gui.const import ControlType @@ -85,11 +88,9 @@ def get_singlechat_menu(control_id: str, ('win.search-history', _('Search…')) ] - if not contact.is_in_roster: - if (type_.is_chat or - (type_.is_privatechat and contact.real_jid is not None)): - singlechat_menu.append( - ('win.add-to-roster-', _('Add to Contact List…'))) + if can_add_to_roster(contact): + singlechat_menu.append(('win.add-to-roster-', + _('Add to Contact List…'))) def build_menu(preset: list[tuple[str, Any]]): menu = Gio.Menu() @@ -420,71 +421,46 @@ def get_chat_list_row_menu(workspace_id: str, account: str, jid: JID, pinned: bool - ) -> Gio.Menu: + ) -> GajimMenu: client = app.get_client(account) contact = client.get_module('Contacts').get_contact(jid) - toggle_label = _('Unpin Chat') if pinned else _('Pin Chat') + menu = GajimMenu() - menu_items: list[Any] = [ - ('toggle-chat-pinned', toggle_label), - ] + toggle_label = _('Unpin Chat') if pinned else _('Pin Chat') + menu.add_item(toggle_label, 'win.toggle-chat-pinned', None) workspaces = app.settings.get_workspaces() if len(workspaces) > 1: - menu_items.append((_('Move Chat'), [])) - - is_self_contact = contact.jid.bare == client.get_own_jid().bare - if (not contact.is_groupchat and not contact.is_in_roster and - not is_self_contact): - if contact.is_pm_contact: - if contact.real_jid is not None: - menu_items.append(('add-to-roster', _('Add to Contact List…'))) - else: - menu_items.append(('add-to-roster', _('Add to Contact List…'))) + submenu = menu.add_submenu(_('Move Chat')) - unread_count = app.window.get_chat_unread_count( - account, jid, include_silent=True) - if unread_count is not None and unread_count > 0: - menu_items.append(('mark-as-read', _('Mark as read'))) + params = MoveChatToWorkspaceAP(workspace_id=workspace_id, + account=account, + jid=jid) - menu = Gio.Menu() - for item in menu_items: - if isinstance(item[1], str): - action, label = item - action = f'win.{action}' - menuitem = Gio.MenuItem.new(label, action) - variant_list = GLib.Variant( - 'as', [workspace_id, account, str(jid)]) - menuitem.set_action_and_target_value(action, variant_list) - menu.append_item(menuitem) - else: - # This is a submenu - if len(workspaces) > 1: - submenu = build_workspaces_submenu( - workspace_id, account, jid) - menu.append_submenu(item[0], submenu) + for name in get_workspace_names(workspace_id, account, jid): + submenu.add_item(name, 'win.move-chat-to-workspace', params) + + if can_add_to_roster(contact): + params = AddToRosterParams(account=account, jid=jid) + menu.add_item(_('Add to Contact List…'), 'win.add-to-roster', params) + + if app.window.get_chat_unread_count(account, jid, include_silent=True): + menu.add_item(_('Mark as read'), 'win.mark-as-read', None) return menu -def build_workspaces_submenu(current_workspace_id: str, - account: str, - jid: JID - ) -> Gio.Menu: - submenu = Gio.Menu() +def get_workspace_names(current_workspace_id: str, + account: str, + jid: JID + ) -> Iterator[str]: + for workspace_id in app.settings.get_workspaces(): if workspace_id == current_workspace_id: continue - name = app.settings.get_workspace_setting(workspace_id, 'name') - params = MoveChatToWorkspaceAP(workspace_id=workspace_id, - account=account, - jid=jid) - - item = make_menu_item(name, 'win.move-chat-to-workspace', params) - submenu.append_item(item) - return submenu + yield app.settings.get_workspace_setting(workspace_id, 'name') def get_groupchat_admin_menu(control_id: str, ===================================== gajim/gtk/structs.py ===================================== @@ -66,6 +66,12 @@ class MoveChatToWorkspaceAP(VariantMixin): jid: JID +@dataclass +class AddToRosterParams(VariantMixin): + account: str + jid: JID + + def get_params_class(func: Callable[..., Any]) -> Any: module = sys.modules[__name__] params = inspect.signature(func).parameters ===================================== gajim/gtk/util.py ===================================== @@ -925,3 +925,17 @@ def make_menu(menuitems: MenuItemListT) -> Gio.Menu: menuitem = make_menu_item(*item) menu.append_item(menuitem) return menu + + +class GajimMenu(Gio.Menu): + def __init__(self): + Gio.Menu.__init__(self) + + def add_item(self, label: str, action: str, value: MenuValueT) -> None: + item = make_menu_item(label, action, value) + self.append_item(item) + + def add_submenu(self, label: str) -> GajimMenu: + menu = GajimMenu() + self.append_submenu(label, menu) + return menu View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/216180ece97a8d4d14e95fb291fed61… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/216180ece97a8d4d14e95fb291fed61… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Profile: Limit spinner size
by Daniel Brötzmann (＠wurstsalat) 13 Mar '22

13 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 216180ec by wurstsalat at 2022-03-13T21:18:03+01:00 Profile: Limit spinner size - - - - - 1 changed file: - gajim/data/gui/profile.ui Changes: ===================================== gajim/data/gui/profile.ui ===================================== @@ -126,6 +126,7 @@ <object class="GtkSpinner" id="spinner"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="halign">center</property> <property name="active">True</property> </object> <packing> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/216180ece97a8d4d14e95fb291fed610… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/216180ece97a8d4d14e95fb291fed610… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Groupchat: Disable quoting messages for visitors
by Daniel Brötzmann (＠wurstsalat) 13 Mar '22

13 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: da0eeb34 by wurstsalat at 2022-03-13T21:04:36+01:00 Groupchat: Disable quoting messages for visitors Fixes #10796 - - - - - 1 changed file: - gajim/gtk/conversation/rows/widgets.py Changes: ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -86,12 +86,20 @@ def _create_popover(self, show_retract: bool) -> None: menu_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) menu_box.get_style_context().add_class('padding-6') + quote_enabled = True + if isinstance(self._contact, GroupchatContact): + if self._contact.is_joined: + self_contact = self._contact.get_self() + assert self_contact is not None + quote_enabled = not self_contact.role.is_visitor + quote_button = Gtk.ModelButton() quote_button.set_halign(Gtk.Align.START) quote_button.connect('clicked', self._row.on_quote_message) quote_button.set_label(_('Quote…')) quote_button.set_image(Gtk.Image.new_from_icon_name( 'mail-reply-sender-symbolic', Gtk.IconSize.MENU)) + quote_button.set_sensitive(quote_enabled) menu_box.add(quote_button) copy_button = Gtk.ModelButton() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/da0eeb343e6440c083687dd5b8a5f11d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/da0eeb343e6440c083687dd5b8a5f11d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag nbxmpp-2.0.5
by Philipp Hörist (＠lovetox) 13 Mar '22

13 Mar '22

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

1 0

[Git][gajim/python-nbxmpp][nbxmpp_2.0] 4 commits: Websocket: Resolve uri via https
by Philipp Hörist (＠lovetox) 13 Mar '22

13 Mar '22

Philipp Hörist pushed to branch nbxmpp_2.0 at gajim / python-nbxmpp Commits: 865d5cd0 by lovetox at 2022-03-13T17:52:22+01:00 Websocket: Resolve uri via https - - - - - f1833875 by lovetox at 2022-03-13T17:53:15+01:00 Remove unused resolver module - - - - - 47acedff by lovetox at 2022-03-13T17:56:54+01:00 Update .gitignore - - - - - d1a86fbf by lovetox at 2022-03-13T17:57:02+01:00 2.0.5 - - - - - 8 changed files: - .gitignore - ChangeLog - nbxmpp/__init__.py - nbxmpp/addresses.py - nbxmpp/namespaces.py - − nbxmpp/resolver.py - nbxmpp/util.py - setup.cfg Changes: ===================================== .gitignore ===================================== @@ -5,3 +5,5 @@ nbxmpp.egg-info dist .idea *~ +*.sublime-workspace +*.sublime-project ===================================== ChangeLog ===================================== @@ -1,3 +1,10 @@ +python-nbxmpp 2.0.5 (13 March 2022) + + Bugfixes + + * Fix bookmarks compat namespace + * Resolve websocket uri only via https + python-nbxmpp 2.0.4 (09 October 2021) Bugfixes ===================================== nbxmpp/__init__.py ===================================== @@ -4,4 +4,4 @@ from .protocol import * gi.require_version('Soup', '2.4') -__version__ = "2.0.4" +__version__ = "2.0.5" ===================================== nbxmpp/addresses.py ===================================== @@ -18,10 +18,13 @@ import logging from collections import namedtuple +from gi.repository import Soup + +import nbxmpp from nbxmpp.util import Observable -from nbxmpp.resolver import GioResolver from nbxmpp.const import ConnectionType from nbxmpp.const import ConnectionProtocol +from nbxmpp.util import parse_websocket_uri log = logging.getLogger('nbxmpp.addresses') @@ -130,8 +133,58 @@ class ServerAddresses(Observable): self._on_request_resolved() return - GioResolver().resolve_alternatives(self._domain, - self._on_alternatives_result) + self._resolve_alternatives() + + def _resolve_alternatives(self) -> None: + session = Soup.Session() + session.props.user_agent = f'nbxmpp/{nbxmpp.__version__}' + message = Soup.Message.new( + 'GET', f'https://{self._domain}/.well-known/host-meta') + session.queue_message(message, self._on_alternatives_result) + + def _on_alternatives_result(self, + _session: Soup.Session, + message: Soup.Message) -> None: + + status = message.props.status_code + if status != Soup.Status.OK: + error = message.props.reason_phrase + log.info('Failed to retrieve host-meta file: %s %s', status, error) + self._on_request_resolved() + return + + response_body = message.props.response_body + if response_body is None or not response_body.data: + log.info('No response body data found') + self._on_request_resolved() + return + + try: + uri = parse_websocket_uri(response_body.data) + except ValueError as error: + log.info('Error parsing websocket uri: %s', error) + self._on_request_resolved() + return + + if uri.startswith('wss'): + type_ = ConnectionType.DIRECT_TLS + elif uri.startswith('ws'): + type_ = ConnectionType.PLAIN + else: + log.warning('Invalid websocket uri: %s', uri) + self._on_request_resolved() + return + + addr = ServerAddress(domain=self._domain, + service=None, + host=None, + uri=uri, + protocol=ConnectionProtocol.WEBSOCKET, + type=type_, + proxy=None) + self._addresses.append(addr) + + self._on_request_resolved() def cancel_resolve(self): self.remove_subscriptions() @@ -161,31 +214,6 @@ class ServerAddresses(Observable): def set_proxy(self, proxy): self._proxy = proxy - def _on_alternatives_result(self, uri): - if uri is None: - self._on_request_resolved() - return - - if uri.startswith('wss'): - type_ = ConnectionType.DIRECT_TLS - elif uri.startswith('ws'): - type_ = ConnectionType.PLAIN - else: - log.warning('Invalid websocket uri: %s', uri) - self._on_request_resolved() - return - - addr = ServerAddress(domain=self._domain, - service=None, - host=None, - uri=uri, - protocol=ConnectionProtocol.WEBSOCKET, - type=type_, - proxy=None) - self._addresses.append(addr) - - self._on_request_resolved() - def _on_request_resolved(self): self._is_resolved = True self.notify('resolved') ===================================== nbxmpp/namespaces.py ===================================== @@ -168,6 +168,7 @@ class _Namespaces: XHTML: str = 'http://www.w3.org/1999/xhtml' XMPP_STREAMS: str = 'urn:ietf:params:xml:ns:xmpp-streams' X_OOB: str = 'jabber:x:oob' + XRD: str = 'http://docs.oasis-open.org/ns/xri/xrd-1.0' Namespace = _Namespaces() ===================================== nbxmpp/resolver.py deleted ===================================== @@ -1,150 +0,0 @@ -# Copyright (C) 2020 Philipp Hörist <philipp AT hoerist.com> -# -# This file is part of nbxmpp. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; If not, see <http://www.gnu.org/licenses/>. - -import logging - -from gi.repository import Gio -from gi.repository import GLib - - -log = logging.getLogger('nbxmpp.resolver') - - -class DNSResolveRequest: - def __init__(self, cache, domain, callback): - self._domain = domain - self._result = self._lookup_cache(cache) - self._callback = callback - - @property - def result(self): - return self._result - - @result.setter - def result(self, value): - self._result = value - - @property - def is_cached(self): - return self.result is not None - - def _lookup_cache(self, cache): - cached_request = cache.get(self) - if cached_request is None: - return None - return cached_request.result - - def finalize(self): - GLib.idle_add(self._callback, self.result) - self._callback = None - - def __hash__(self): - raise NotImplementedError - - def __eq__(self, other): - return hash(other) == hash(self) - - -class AlternativeMethods(DNSResolveRequest): - def __init__(self, *args, **kwargs): - DNSResolveRequest.__init__(self, *args, **kwargs) - - @property - def hostname(self): - return '_xmppconnect.%s' % self._domain - - def __hash__(self): - return hash(self.hostname) - - -class Singleton(type): - _instances = {} - def __call__(cls, *args, **kwargs): - if cls not in cls._instances: - cls._instances[cls] = super(Singleton, cls).__call__(*args, - **kwargs) - return cls._instances[cls] - - -class GioResolver(metaclass=Singleton): - def __init__(self): - self._cache = {} - - def _cache_request(self, request): - self._cache[request] = request - - def resolve_alternatives(self, domain, callback): - request = AlternativeMethods(self._cache, domain, callback) - if request.is_cached: - request.finalize() - return - - Gio.Resolver.get_default().lookup_records_async( - request.hostname, - Gio.ResolverRecordType.TXT, - None, - self._on_alternatives_result, - request) - - def _on_alternatives_result(self, resolver, result, request): - try: - results = resolver.lookup_records_finish(result) - except GLib.Error as error: - log.info(error) - request.finalize() - return - - try: - websocket_uri = self._parse_alternative_methods(results) - except Exception: - log.exception('Failed to parse alternative ' - 'connection methods: %s', results) - request.finalize() - return - - request.result = websocket_uri - self._cache_request(request) - request.finalize() - - @staticmethod - def _parse_alternative_methods(variant_results): - result_list = [res[0][0] for res in variant_results] - for result in result_list: - if result.startswith('_xmpp-client-websocket'): - return result.split('=')[1] - return None - - -if __name__ == '__main__': - import sys - - try: - domain_ = sys.argv[1] - except Exception: - print('Provide domain name as argument') - sys.exit() - - # Execute: - # > python3 -m nbxmpp.resolver domain - - def on_result(result): - print('Result: ', result) - mainloop.quit() - - GioResolver().resolve_alternatives(domain_, on_result) - mainloop = GLib.MainLoop() - mainloop.run() ===================================== nbxmpp/util.py ===================================== @@ -24,6 +24,7 @@ import re import logging from logging import LoggerAdapter from collections import defaultdict +import xml.etree.ElementTree as ET from functools import lru_cache @@ -430,3 +431,24 @@ class LogAdapter(LoggerAdapter): def process(self, msg, kwargs): return '(%s) %s' % (self.extra['context'], msg), kwargs + + +def parse_websocket_uri(data: str) -> str: + ''' + Example: + <?xml version='1.0' encoding='utf-8'?> + <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'> + <Link rel='urn:xmpp:alt-connections:xbosh' + href='https://bosh.domain.org/'/> + <Link rel='urn:xmpp:alt-connections:websocket' + href='wss://ws.domain.org/'/> + </XRD> + ''' + host_meta_xml = ET.fromstring(data) + for link in host_meta_xml.findall(f'{{{Namespace.XRD}}}Link'): + if link.attrib.get('rel') == 'urn:xmpp:alt-connections:websocket': + href = link.attrib.get('href') + if href is None: + raise ValueError('No href attr found') + return href + raise ValueError('no websocket uri found') ===================================== setup.cfg ===================================== @@ -1,6 +1,6 @@ [metadata] name = nbxmpp -version = 2.0.4 +version = 2.0.5 description = XMPP Library author = Yann Leboulanger, Philipp Hoerist author_email = gajim-devel(a)gajim.org View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/c08bb3d54eb3d72248c41d1… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/c08bb3d54eb3d72248c41d1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Websocket: Resolve uri via https
by Philipp Hörist (＠lovetox) 13 Mar '22

13 Mar '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 95711855 by lovetox at 2022-03-13T15:19:46+01:00 Websocket: Resolve uri via https - - - - - db19ead4 by lovetox at 2022-03-13T15:20:51+01:00 Remove unused resolver module - - - - - 4 changed files: - nbxmpp/addresses.py - nbxmpp/namespaces.py - − nbxmpp/resolver.py - nbxmpp/util.py Changes: ===================================== nbxmpp/addresses.py ===================================== @@ -18,10 +18,13 @@ import logging from collections import namedtuple +from gi.repository import Soup + +import nbxmpp from nbxmpp.util import Observable -from nbxmpp.resolver import GioResolver from nbxmpp.const import ConnectionType from nbxmpp.const import ConnectionProtocol +from nbxmpp.util import parse_websocket_uri log = logging.getLogger('nbxmpp.addresses') @@ -130,8 +133,58 @@ class ServerAddresses(Observable): self._on_request_resolved() return - GioResolver().resolve_alternatives(self._domain, - self._on_alternatives_result) + self._resolve_alternatives() + + def _resolve_alternatives(self) -> None: + session = Soup.Session() + session.props.user_agent = f'nbxmpp/{nbxmpp.__version__}' + message = Soup.Message.new( + 'GET', f'https://{self._domain}/.well-known/host-meta') + session.queue_message(message, self._on_alternatives_result) + + def _on_alternatives_result(self, + _session: Soup.Session, + message: Soup.Message) -> None: + + status = message.props.status_code + if status != Soup.Status.OK: + error = message.props.reason_phrase + log.info('Failed to retrieve host-meta file: %s %s', status, error) + self._on_request_resolved() + return + + response_body = message.props.response_body + if response_body is None or not response_body.data: + log.info('No response body data found') + self._on_request_resolved() + return + + try: + uri = parse_websocket_uri(response_body.data) + except ValueError as error: + log.info('Error parsing websocket uri: %s', error) + self._on_request_resolved() + return + + if uri.startswith('wss'): + type_ = ConnectionType.DIRECT_TLS + elif uri.startswith('ws'): + type_ = ConnectionType.PLAIN + else: + log.warning('Invalid websocket uri: %s', uri) + self._on_request_resolved() + return + + addr = ServerAddress(domain=self._domain, + service=None, + host=None, + uri=uri, + protocol=ConnectionProtocol.WEBSOCKET, + type=type_, + proxy=None) + self._addresses.append(addr) + + self._on_request_resolved() def cancel_resolve(self): self.remove_subscriptions() @@ -161,31 +214,6 @@ class ServerAddresses(Observable): def set_proxy(self, proxy): self._proxy = proxy - def _on_alternatives_result(self, uri): - if uri is None: - self._on_request_resolved() - return - - if uri.startswith('wss'): - type_ = ConnectionType.DIRECT_TLS - elif uri.startswith('ws'): - type_ = ConnectionType.PLAIN - else: - log.warning('Invalid websocket uri: %s', uri) - self._on_request_resolved() - return - - addr = ServerAddress(domain=self._domain, - service=None, - host=None, - uri=uri, - protocol=ConnectionProtocol.WEBSOCKET, - type=type_, - proxy=None) - self._addresses.append(addr) - - self._on_request_resolved() - def _on_request_resolved(self): self._is_resolved = True self.notify('resolved') ===================================== nbxmpp/namespaces.py ===================================== @@ -172,6 +172,7 @@ class _Namespaces: XHTML: str = 'http://www.w3.org/1999/xhtml' XMPP_STREAMS: str = 'urn:ietf:params:xml:ns:xmpp-streams' X_OOB: str = 'jabber:x:oob' + XRD: str = 'http://docs.oasis-open.org/ns/xri/xrd-1.0' Namespace: _Namespaces = _Namespaces() ===================================== nbxmpp/resolver.py deleted ===================================== @@ -1,150 +0,0 @@ -# Copyright (C) 2020 Philipp Hörist <philipp AT hoerist.com> -# -# This file is part of nbxmpp. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 3 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; If not, see <http://www.gnu.org/licenses/>. - -import logging - -from gi.repository import Gio -from gi.repository import GLib - - -log = logging.getLogger('nbxmpp.resolver') - - -class DNSResolveRequest: - def __init__(self, cache, domain, callback): - self._domain = domain - self._result = self._lookup_cache(cache) - self._callback = callback - - @property - def result(self): - return self._result - - @result.setter - def result(self, value): - self._result = value - - @property - def is_cached(self): - return self.result is not None - - def _lookup_cache(self, cache): - cached_request = cache.get(self) - if cached_request is None: - return None - return cached_request.result - - def finalize(self): - GLib.idle_add(self._callback, self.result) - self._callback = None - - def __hash__(self): - raise NotImplementedError - - def __eq__(self, other): - return hash(other) == hash(self) - - -class AlternativeMethods(DNSResolveRequest): - def __init__(self, *args, **kwargs): - DNSResolveRequest.__init__(self, *args, **kwargs) - - @property - def hostname(self): - return '_xmppconnect.%s' % self._domain - - def __hash__(self): - return hash(self.hostname) - - -class Singleton(type): - _instances = {} - def __call__(cls, *args, **kwargs): - if cls not in cls._instances: - cls._instances[cls] = super(Singleton, cls).__call__(*args, - **kwargs) - return cls._instances[cls] - - -class GioResolver(metaclass=Singleton): - def __init__(self): - self._cache = {} - - def _cache_request(self, request): - self._cache[request] = request - - def resolve_alternatives(self, domain, callback): - request = AlternativeMethods(self._cache, domain, callback) - if request.is_cached: - request.finalize() - return - - Gio.Resolver.get_default().lookup_records_async( - request.hostname, - Gio.ResolverRecordType.TXT, - None, - self._on_alternatives_result, - request) - - def _on_alternatives_result(self, resolver, result, request): - try: - results = resolver.lookup_records_finish(result) - except GLib.Error as error: - log.info(error) - request.finalize() - return - - try: - websocket_uri = self._parse_alternative_methods(results) - except Exception: - log.exception('Failed to parse alternative ' - 'connection methods: %s', results) - request.finalize() - return - - request.result = websocket_uri - self._cache_request(request) - request.finalize() - - @staticmethod - def _parse_alternative_methods(variant_results): - result_list = [res[0][0] for res in variant_results] - for result in result_list: - if result.startswith('_xmpp-client-websocket'): - return result.split('=')[1] - return None - - -if __name__ == '__main__': - import sys - - try: - domain_ = sys.argv[1] - except Exception: - print('Provide domain name as argument') - sys.exit() - - # Execute: - # > python3 -m nbxmpp.resolver domain - - def on_result(result): - print('Result: ', result) - mainloop.quit() - - GioResolver().resolve_alternatives(domain_, on_result) - mainloop = GLib.MainLoop() - mainloop.run() ===================================== nbxmpp/util.py ===================================== @@ -30,6 +30,7 @@ import re import logging from logging import LoggerAdapter from collections import defaultdict +import xml.etree.ElementTree as ET from functools import lru_cache @@ -434,3 +435,24 @@ class LogAdapter(LoggerAdapter): def process(self, msg, kwargs): return '(%s) %s' % (self.extra['context'], msg), kwargs + + +def parse_websocket_uri(data: str) -> str: + ''' + Example: + <?xml version='1.0' encoding='utf-8'?> + <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'> + <Link rel='urn:xmpp:alt-connections:xbosh' + href='https://bosh.domain.org/'/> + <Link rel='urn:xmpp:alt-connections:websocket' + href='wss://ws.domain.org/'/> + </XRD> + ''' + host_meta_xml = ET.fromstring(data) + for link in host_meta_xml.findall(f'{{{Namespace.XRD}}}Link'): + if link.attrib.get('rel') == 'urn:xmpp:alt-connections:websocket': + href = link.attrib.get('href') + if href is None: + raise ValueError('No href attr found') + return href + raise ValueError('no websocket uri found') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/4a1195ce325bd08dff34b80… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/4a1195ce325bd08dff34b80… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused status icons
by Daniel Brötzmann (＠wurstsalat) 13 Mar '22

13 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 7dab9df1 by André Apitzsch at 2022-03-13T09:54:07+01:00 Remove unused status icons - - - - - 30 changed files: - − gajim/data/icons/hicolor/16x16/status/gnome-away.png - − gajim/data/icons/hicolor/16x16/status/gnome-chat.png - − gajim/data/icons/hicolor/16x16/status/gnome-closed.png - − gajim/data/icons/hicolor/16x16/status/gnome-connecting.png - − gajim/data/icons/hicolor/16x16/status/gnome-dnd.png - − gajim/data/icons/hicolor/16x16/status/gnome-error.png - − gajim/data/icons/hicolor/16x16/status/gnome-event.png - − gajim/data/icons/hicolor/16x16/status/gnome-muc-active.png - − gajim/data/icons/hicolor/16x16/status/gnome-muc-inactive.png - − gajim/data/icons/hicolor/16x16/status/gnome-notinroster.png - − gajim/data/icons/hicolor/16x16/status/gnome-offline.png - − gajim/data/icons/hicolor/16x16/status/gnome-online.png - − gajim/data/icons/hicolor/16x16/status/gnome-opened.png - − gajim/data/icons/hicolor/16x16/status/gnome-requested.png - − gajim/data/icons/hicolor/16x16/status/gnome-xa.png - − gajim/data/icons/hicolor/16x16/status/goojim-away.png - − gajim/data/icons/hicolor/16x16/status/goojim-chat.png - − gajim/data/icons/hicolor/16x16/status/goojim-closed.png - − gajim/data/icons/hicolor/16x16/status/goojim-connecting.png - − gajim/data/icons/hicolor/16x16/status/goojim-dnd.png - − gajim/data/icons/hicolor/16x16/status/goojim-error.png - − gajim/data/icons/hicolor/16x16/status/goojim-event.png - − gajim/data/icons/hicolor/16x16/status/goojim-muc-active.png - − gajim/data/icons/hicolor/16x16/status/goojim-muc-inactive.png - − gajim/data/icons/hicolor/16x16/status/goojim-notinroster.png - − gajim/data/icons/hicolor/16x16/status/goojim-offline.png - − gajim/data/icons/hicolor/16x16/status/goojim-online.png - − gajim/data/icons/hicolor/16x16/status/goojim-opened.png - − gajim/data/icons/hicolor/16x16/status/goojim-requested.png - − gajim/data/icons/hicolor/16x16/status/goojim-xa.png The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7dab9df16d8208b14fe6c4b20d500c85… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7dab9df16d8208b14fe6c4b20d500c85… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update pyrightconfig.json
by Philipp Hörist (＠lovetox) 13 Mar '22

13 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: a1758729 by lovetox at 2022-03-13T09:27:49+01:00 Update pyrightconfig.json - - - - - 1 changed file: - pyrightconfig.json Changes: ===================================== pyrightconfig.json ===================================== @@ -3,6 +3,7 @@ "pythonVersion": "3.9", "typeCheckingMode": "strict", "reportImportCycles": "none", + "reportImplicitStringConcatenation": "none", "include": [ "gajim/gajim.py", "gajim/common/application.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a1758729986b7d4737ca8f1486d18cdf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a1758729986b7d4737ca8f1486d18cdf… 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