Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] fix: Avatar: Fallback to default avatar when image is missing
by Philipp Hörist (＠lovetox) 15 May '22

15 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 325198e7 by lovetox at 2022-05-15T13:25:00+02:00 fix: Avatar: Fallback to default avatar when image is missing - - - - - 1 changed file: - gajim/gtk/avatar.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -439,11 +439,14 @@ def get_muc_surface(self, avatar_sha = app.storage.cache.get_muc(jid, 'avatar') if avatar_sha is not None: surface = self.surface_from_filename(avatar_sha, size, scale) - if surface is None: - return None - surface = clip(surface, style) - self._cache[jid][(size, scale)] = surface - return surface + if surface is not None: + surface = clip(surface, style) + self._cache[jid][(size, scale)] = surface + return surface + + # avatar_sha set, but image is missing + # (e.g. avatar cache deleted) + app.storage.cache.set_muc(jid, 'avatar', None) con = app.connections[account] name = get_groupchat_name(con, jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/325198e7302cd10c2e28046c92bc8ae3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/325198e7302cd10c2e28046c92bc8ae3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Windows: Install omemo plugin into correct dir
by Philipp Hörist (＠lovetox) 15 May '22

15 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c4d71952 by lovetox at 2022-05-15T12:48:58+02:00 ci: Windows: Install omemo plugin into correct dir - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -150,7 +150,7 @@ function install_gajim { # Install omemo plugin curl -o "${BUILD_ROOT}"/omemo.zip https://ftp.gajim.org/plugins/master/omemo/omemo_2.8.14.zip - 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/omemo.zip + 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins/omemo "${BUILD_ROOT}"/omemo.zip # Install language dicts curl -o "${BUILD_ROOT}"/speller_dicts.zip https://gajim.org/downloads/snap/win/build/speller_dicts.zip View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c4d719527bb8888d6700354fd2fab436… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c4d719527bb8888d6700354fd2fab436… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Improve joining support chat if single account is online
by Daniel Brötzmann (＠wurstsalat) 14 May '22

14 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e3056b72 by wurstsalat at 2022-05-15T00:48:50+02:00 fix: Improve joining support chat if single account is online - - - - - 1 changed file: - gajim/gtk/application.py Changes: ===================================== gajim/gtk/application.py ===================================== @@ -663,6 +663,11 @@ def _on_content_action(_action: Gio.SimpleAction, @staticmethod def _on_join_support_chat(_action: Gio.SimpleAction, _param: Optional[GLib.Variant]) -> None: + accounts = list(app.connections.keys()) + if len(accounts) == 1: + app.interface.show_add_join_groupchat( + accounts[0], GAJIM_SUPPORT_JID) + return open_window('StartChatDialog', jid=GAJIM_SUPPORT_JID) @staticmethod View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e3056b72d9fe5fad3e9adfc73cb614ab… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e3056b72d9fe5fad3e9adfc73cb614ab… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] fix: AdHoc: Don’t raise on empty nodes
by Philipp Hörist (＠lovetox) 14 May '22

14 May '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 48d6a9b0 by lovetox at 2022-05-14T22:30:12+02:00 fix: AdHoc: Don’t raise on empty nodes - - - - - 1 changed file: - nbxmpp/modules/adhoc.py Changes: ===================================== nbxmpp/modules/adhoc.py ===================================== @@ -50,8 +50,6 @@ class AdHoc(BaseModule): raise StanzaError(response) children = response.getQueryChildren() - if not children: - raise MalformedStanzaError('query children missing', response) command_list = [] for item in children: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/48d6a9b02b096f902bd6f7f0… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/48d6a9b02b096f902bd6f7f0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] feat: Add 'Join Support Chat' help item
by Daniel Brötzmann (＠wurstsalat) 14 May '22

14 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 2386ca8e by wurstsalat at 2022-05-14T18:23:29+02:00 feat: Add 'Join Support Chat' help item - - - - - 4 changed files: - gajim/common/const.py - gajim/data/gui/application_menu.ui - gajim/gtk/application.py - gajim/gtk/start_chat.py Changes: ===================================== gajim/common/const.py ===================================== @@ -919,6 +919,7 @@ def is_active(self): GAJIM_FAQ_URI = 'https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq' GAJIM_WIKI_URI = 'https://dev.gajim.org/gajim/gajim/wikis' +GAJIM_SUPPORT_JID = 'gajim(a)conference.gajim.org' URI_SCHEMES = { 'aaa://', ===================================== gajim/data/gui/application_menu.ui ===================================== @@ -55,6 +55,10 @@ <attribute name="label" translatable="yes">FA_Q (Online)</attribute> <attribute name="action">app.faq</attribute> </item> + <item> + <attribute name="label" translatable="yes">Join Support Chat</attribute> + <attribute name="action">app.join-support-chat</attribute> + </item> <item> <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute> <attribute name="action">app.shortcuts</attribute> ===================================== gajim/gtk/application.py ===================================== @@ -63,6 +63,7 @@ from gajim.common.application import CoreApplication from gajim.common.const import GAJIM_FAQ_URI from gajim.common.const import GAJIM_WIKI_URI +from gajim.common.const import GAJIM_SUPPORT_JID from gajim.common.exceptions import GajimGeneralException from gajim.common.helpers import load_json from gajim.common.helpers import open_uri @@ -393,6 +394,7 @@ def add_actions(self) -> None: ('shortcuts', None, self._on_shortcuts_action), ('features', None, self._on_features_action), ('content', None, self._on_content_action), + ('join-support-chat', None, self._on_join_support_chat), ('about', None, self._on_about_action), ('faq', None, self._on_faq_action), ('ipython', None, self._on_ipython_action), @@ -658,6 +660,11 @@ def _on_content_action(_action: Gio.SimpleAction, _param: Optional[GLib.Variant]) -> None: open_uri(GAJIM_WIKI_URI) + @staticmethod + def _on_join_support_chat(_action: Gio.SimpleAction, + _param: Optional[GLib.Variant]) -> None: + open_window('StartChatDialog', jid=GAJIM_SUPPORT_JID) + @staticmethod def _on_faq_action(_action: Gio.SimpleAction, _param: Optional[GLib.Variant]) -> None: ===================================== gajim/gtk/start_chat.py ===================================== @@ -68,7 +68,7 @@ class Search(IntEnum): class StartChatDialog(Gtk.ApplicationWindow): - def __init__(self) -> None: + def __init__(self, jid: Optional[str] = None) -> None: Gtk.ApplicationWindow.__init__(self) self.set_name('StartChatDialog') self.set_application(app.app) @@ -138,6 +138,9 @@ def __init__(self) -> None: if rows: self._load_contacts(rows) + if jid is not None: + self.set_search_text(jid) + self.select_first_row() self._ui.connect_signals(self) self.show_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2386ca8e8ebd11fbedbf0f3a528e724e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2386ca8e8ebd11fbedbf0f3a528e724e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Update unread counter on mention in public MUCs
by Daniel Brötzmann (＠wurstsalat) 14 May '22

14 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e8fa5a91 by wurstsalat at 2022-05-14T17:34:09+02:00 fix: Update unread counter on mention in public MUCs Fixes #10810 - - - - - 1 changed file: - gajim/gtk/chat_list.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -557,6 +557,7 @@ def __init__(self, workspace_id: str, account: str, jid: JID, type_: str, self.stanza_id: Optional[str] = None self.message_id: Optional[str] = None self._unread_count: int = 0 + self._needs_muc_highlight: bool = False self._pinned: bool = pinned self.get_style_context().add_class('chatlist-row') @@ -788,7 +789,8 @@ def get_real_unread_count(self) -> int: @property def unread_count(self) -> int: - if self.contact.is_groupchat and not self.contact.can_notify(): + if (self.contact.is_groupchat and not self.contact.can_notify() and + not self._needs_muc_highlight): return 0 return self._unread_count @@ -817,8 +819,6 @@ def add_unread(self, text: str) -> None: self._unread_count += 1 self._update_unread() - chat_list = cast(ChatList, self.get_parent()) - chat_list.emit_unread_changed() app.storage.cache.set_unread_count( self.account, self.jid, @@ -832,10 +832,15 @@ def add_unread(self, text: str) -> None: self.contact.nickname, self._client.get_own_jid().bare) if needs_highlight: + self._needs_muc_highlight = True self._ui.unread_label.get_style_context().remove_class( 'unread-counter-silent') + chat_list = cast(ChatList, self.get_parent()) + chat_list.emit_unread_changed() + def reset_unread(self) -> None: + self._needs_muc_highlight = False self._unread_count = 0 self._update_unread() chat_list = cast(ChatList, self.get_parent()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e8fa5a9193113f642a7cf5f7056aae5a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e8fa5a9193113f642a7cf5f7056aae5a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Avatar: Remove superfluous path
by Daniel Brötzmann (＠wurstsalat) 14 May '22

14 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d5368d36 by wurstsalat at 2022-05-14T16:52:36+02:00 fix: Avatar: Remove superfluous path - - - - - 1 changed file: - gajim/gtk/avatar.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -469,11 +469,10 @@ def get_workspace_surface(self, surface = self._load_surface_from_storage(avatar_sha, size, scale) if surface is not None: return clip(surface, 'round-corners') - else: - # avatar_sha set, but image is missing - # (e.g. avatar cache deleted) - app.settings.set_workspace_setting( - workspace_id, 'avatar_sha', '') + + # avatar_sha set, but image is missing + # (e.g. avatar cache deleted) + app.settings.set_workspace_setting(workspace_id, 'avatar_sha', '') rgba = make_rgba(color or DEFAULT_WORKSPACE_COLOR) letter = name[:1].upper() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d5368d3600cbe3725472c24ed8220a2a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d5368d3600cbe3725472c24ed8220a2a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Add workspace avatar fallback for missing images
by Daniel Brötzmann (＠wurstsalat) 14 May '22

14 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 0b2826d9 by wurstsalat at 2022-05-14T16:42:23+02:00 fix: Add workspace avatar fallback for missing images Fixes #10833 - - - - - 1 changed file: - gajim/gtk/avatar.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -467,9 +467,13 @@ def get_workspace_surface(self, workspace_id, 'avatar_sha') if avatar_sha: surface = self._load_surface_from_storage(avatar_sha, size, scale) - if surface is None: - return None - return clip(surface, 'round-corners') + if surface is not None: + return clip(surface, 'round-corners') + else: + # avatar_sha set, but image is missing + # (e.g. avatar cache deleted) + app.settings.set_workspace_setting( + workspace_id, 'avatar_sha', '') rgba = make_rgba(color or DEFAULT_WORKSPACE_COLOR) letter = name[:1].upper() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0b2826d99e2c757e1752c658e97e8692… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0b2826d99e2c757e1752c658e97e8692… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Handle missing trust data when displaying messages
by Daniel Brötzmann (＠wurstsalat) 13 May '22

13 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: cf9e5fe9 by wurstsalat at 2022-05-14T01:42:28+02:00 fix: Handle missing trust data when displaying messages Fixes #10856 - - - - - 1 changed file: - gajim/gtk/conversation/rows/message.py Changes: ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -394,8 +394,10 @@ def _get_encryption_details(additional_data: AdditionalDataDict fingerprint = additional_data.get_value('encrypted', 'fingerprint') trust_data = additional_data.get_value('encrypted', 'trust') - trust = Trust(trust_data) - return name, fingerprint, trust + + if trust_data is not None: + trust_data = Trust(trust_data) + return name, fingerprint, trust_data @property def has_receipt(self) -> bool: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cf9e5fe99287a726f491aa35fdf04db1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cf9e5fe99287a726f491aa35fdf04db1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: HistoryExport: Show error if creating path fails
by Daniel Brötzmann (＠wurstsalat) 13 May '22

13 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d5de3f24 by wurstsalat at 2022-05-14T01:04:30+02:00 fix: HistoryExport: Show error if creating path fails - - - - - 1 changed file: - gajim/gtk/history_export.py Changes: ===================================== gajim/gtk/history_export.py ===================================== @@ -117,7 +117,19 @@ def _on_export(self) -> None: continue file_path = make_path_from_jid(export_dir, jid) - file_path.mkdir(parents=True, exist_ok=True) + try: + file_path.mkdir(parents=True, exist_ok=True) + except OSError as err: + error_page = cast(ErrorPage, self.get_page('error')) + error_page.set_text( + _('An error occurred while trying to create a ' + 'file at %(path)s: %(error)s') % { + 'path': file_path, + 'error': str(err) + }) + self.show_page('error', Gtk.StackTransitionType.SLIDE_LEFT) + return + with open(file_path / 'history.txt', 'w', encoding='utf-8') as file: file.write(f'History for {jid}\n\n') for message in messages: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d5de3f244f8f5a2eea519c42c2966206… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d5de3f244f8f5a2eea519c42c2966206… 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