Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: fix: Access jingle transport values fallback correctly
by Daniel Brötzmann (＠wurstsalat) 13 May '22

13 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 77c8d623 by wurstsalat at 2022-05-14T00:44:30+02:00 fix: Access jingle transport values fallback correctly - - - - - ae9cbc67 by wurstsalat at 2022-05-14T00:44:30+02:00 fix: Jingle: Use SendFileDialog for DND and paste events - - - - - 3 changed files: - gajim/common/jingle_transport.py - gajim/gtk/controls/base.py - gajim/gtk/file_transfer_send.py Changes: ===================================== gajim/common/jingle_transport.py ===================================== @@ -158,9 +158,9 @@ def parse_transport_stanza(self, transport): 'state': 0, 'target': self.ourjid, 'host': candidate['host'], - 'port': int(candidate.get('port', 1080)), + 'port': int(candidate['port'] or 1080), 'candidate_id': candidate['cid'], - 'type': candidate.get('type', 'direct'), + 'type': candidate['type'] or 'direct', 'priority': candidate['priority'] } candidates.append(cand) ===================================== gajim/gtk/controls/base.py ===================================== @@ -35,6 +35,7 @@ import time import uuid import tempfile +from functools import partial from gi.repository import Gtk from gi.repository import Gdk @@ -69,6 +70,7 @@ from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ErrorDialog from gajim.gui.dialogs import PastePreviewDialog +from gajim.gui.file_transfer_send import SendFileDialog from gajim.gui.message_input import MessageInputTextView from gajim.gui.security_label_selector import SecurityLabelSelector from gajim.gui.util import get_hardware_key_codes @@ -807,10 +809,12 @@ def _start_filetransfer(self, path: str) -> None: if method == 'httpupload': app.interface.send_httpupload(self, path) - else: - app.interface.instances['file_transfers'].send_file( - self.account, self.contact, path) + send_callback = partial( + app.interface.instances['file_transfers'].send_file, + self.account, + self.contact) + SendFileDialog(self.contact, send_callback, app.window, [path]) def _on_send_file(self, action: Gio.SimpleAction, ===================================== gajim/gtk/file_transfer_send.py ===================================== @@ -21,6 +21,7 @@ from typing import Callable from typing import cast +from typing import Optional from pathlib import Path @@ -44,7 +45,8 @@ class SendFileDialog(Gtk.ApplicationWindow): def __init__(self, contact: BareContact, send_callback: Callable[..., bool], - transient_for: Gtk.Window + transient_for: Gtk.Window, + files: Optional[list[str]] = None ) -> None: Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) @@ -75,6 +77,9 @@ def __init__(self, self._ui.resource_box.pack_start( self._resource_selector, True, False, 0) + if files is not None: + self.set_files(files) + self.connect('key-press-event', self._on_key_press) self._ui.connect_signals(self) self.show_all() @@ -110,7 +115,7 @@ def _send_files(self, resource_jid: JID) -> None: self.destroy() def _select_files(self, _button: Gtk.Button) -> None: - FileChooserDialog(self._set_files, + FileChooserDialog(self.set_files, select_multiple=True, transient_for=self, path=app.settings.get('last_send_dir')) @@ -120,7 +125,7 @@ def _remove_files(self, _button: Gtk.Button) -> None: for item in selected: self._ui.listbox.remove(item) - def _set_files(self, file_names: str) -> None: + def set_files(self, file_names: list[str]) -> None: last_dir = '' for file in file_names: row = FileRow(file) @@ -130,6 +135,7 @@ def _set_files(self, file_names: str) -> None: self._ui.listbox.add(row) self._ui.listbox.show_all() app.settings.set('last_send_dir', str(last_dir)) + self._ui.files_send.set_sensitive(True) def _get_description(self) -> str: buffer_ = self._ui.description.get_buffer() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/516119cf63119f142df125f80a81c58… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/516119cf63119f142df125f80a81c58… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Remove iconset leftovers
by Philipp Hörist (＠lovetox) 13 May '22

13 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 516119cf by lovetox at 2022-05-13T22:31:45+02:00 fix: Remove iconset leftovers Fixes #10851 - - - - - 2 changed files: - gajim/common/setting_values.py - gajim/gtk/util.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -146,7 +146,6 @@ class _ACCOUNT_DEFAULT: 'emoticons_theme', 'gc_refer_to_nick_char', 'global_proxy', - 'iconset', 'last_save_dir', 'last_send_dir', 'last_sounds_dir', @@ -189,7 +188,6 @@ class _ACCOUNT_DEFAULT: 'ask_offline_status': False, 'trayicon': 'always', 'allow_hide_roster': False, - 'iconset': 'dcraven', 'roster_theme': 'default', 'sort_by_show_in_roster': True, 'sort_by_show_in_muc': False, ===================================== gajim/gtk/util.py ===================================== @@ -223,21 +223,14 @@ def get_app_icon_list(scale_widget: Gtk.Widget) -> list[GdkPixbuf.Pixbuf]: def get_icon_name(name: str, - iconset: Optional[str] = None, transport: Optional[str] = None) -> str: if name == 'not in roster': name = 'notinroster' - if iconset is not None: - return f'{iconset}-{name}' - if transport is not None: return f'{transport}-{name}' - iconset = app.settings.get('iconset') - if not iconset: - iconset = 'dcraven' - return f'{iconset}-{name}' + return f'dcraven-{name}' def load_user_iconsets() -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/516119cf63119f142df125f80a81c582… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/516119cf63119f142df125f80a81c582… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Set encoding when calling open()
by Philipp Hörist (＠lovetox) 13 May '22

13 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7becee59 by lovetox at 2022-05-13T21:43:21+02:00 fix: Set encoding when calling open() Otherwise the platform default will be taken, for example on Windows this is not utf8. Fixes #10849 - - - - - 5 changed files: - gajim/common/helpers.py - gajim/plugins/pluginmanager.py - scripts/dev/generate_ui_types.py - scripts/update_translations.py - test/gtk/util.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -814,7 +814,7 @@ def load_json(path: Path, key: Optional[str] = None, default: Optional[Any] = None) -> Any: try: - with path.open('r') as file: + with path.open('r', encoding='utf8') as file: json_dict = json.loads(file.read()) except Exception: log.exception('Parsing error') ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -109,7 +109,7 @@ def from_path(cls, path: Path) -> PluginManifest: return cls.from_manifest_ini(manifest_path) if manifest_path.name == 'plugin-manifest.json': - with manifest_path.open() as f: + with manifest_path.open(encoding='utf8') as f: try: manifest = json.load(f) except Exception as error: @@ -124,7 +124,7 @@ def from_manifest_ini(cls, path: Path) -> PluginManifest: conf = configparser.ConfigParser() conf.remove_section('info') - with path.open() as conf_file: + with path.open(encoding='utf8') as conf_file: try: conf.read_file(conf_file) except configparser.Error as error: ===================================== scripts/dev/generate_ui_types.py ===================================== @@ -80,7 +80,7 @@ def parse(path, file): builder_names = [] -with out_path.open(mode='w') as file: +with out_path.open(mode='w', encoding='utf8') as file: file.write(IMPORTS) for path in paths: if path.name.endswith('~'): ===================================== scripts/update_translations.py ===================================== @@ -21,7 +21,7 @@ def template_is_equal(old_template_path: Path, new_template: str) -> bool: - with open(old_template_path, 'r') as f: + with open(old_template_path, 'r', encoding='utf8') as f: old_template = f.read() pattern = r'"POT-Creation-Date: .*\n"' @@ -64,7 +64,7 @@ def update_translation_template() -> bool: # No new strings were discovered return False - with open(TRANS_TEMPLATE, 'w') as f: + with open(TRANS_TEMPLATE, 'w', encoding='utf8') as f: f.write(template) return True ===================================== test/gtk/util.py ===================================== @@ -11,7 +11,7 @@ def get_gajim_dir(): def load_style(filename, priority): path = get_gajim_dir() / 'data' / 'style' / filename try: - with open(str(path), "r") as file: + with open(str(path), 'r', encoding='utf8') as file: css = file.read() except Exception as exc: print(exc) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7becee59338bddf3c31a15165e2e0286… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7becee59338bddf3c31a15165e2e0286… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: PluginManager: Make config_dialog required
by Philipp Hörist (＠lovetox) 13 May '22

13 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: a86e178a by lovetox at 2022-05-13T21:30:31+02:00 fix: PluginManager: Make config_dialog required Fixes #10850 - - - - - 1 changed file: - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -189,7 +189,7 @@ def from_manifest_json(cls, description=p_(manifest['description']), authors=manifest['authors'], homepage=manifest['homepage'], - config_dialog=manifest.get('config_dialog') or True, + config_dialog=manifest['config_dialog'], version=V(manifest['version']), requirements=[Requirement(r) for r in manifest['requirements']], platforms=manifest['platforms'], View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a86e178a3c72e00b99c2af302ce8cfa5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a86e178a3c72e00b99c2af302ce8cfa5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Windows: Disable 32bit build
by Philipp Hörist (＠lovetox) 13 May '22

13 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 04f56236 by lovetox at 2022-05-13T15:37:11+02:00 ci: Windows: Disable 32bit build It does not finish for unknown reasons - - - - - 1 changed file: - .ci/appveyor.yml Changes: ===================================== .ci/appveyor.yml ===================================== @@ -3,14 +3,14 @@ version: 1.1.{build} image: Visual Studio 2019 environment: - matrix: - - MSYSTEM: MINGW64 - MSYS_ARCH: "x86_64" - ARCH: "64bit" - - - MSYSTEM: MINGW32 - MSYS_ARCH: "i686" - ARCH: "32bit" + # matrix: + MSYSTEM: MINGW64 + MSYS_ARCH: "x86_64" + ARCH: "64bit" + + # - MSYSTEM: MINGW32 + # MSYS_ARCH: "i686" + # ARCH: "32bit" branches: only: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/04f5623621b8c03b22e578a7f8392c3a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/04f5623621b8c03b22e578a7f8392c3a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] fix: Roster: Don’t fail when no roster attribute is found
by Philipp Hörist (＠lovetox) 12 May '22

12 May '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 39cb5cc7 by lovetox at 2022-05-12T22:05:28+02:00 fix: Roster: Don’t fail when no roster attribute is found - - - - - 1 changed file: - nbxmpp/modules/roster.py Changes: ===================================== nbxmpp/modules/roster.py ===================================== @@ -120,7 +120,10 @@ class Roster(BaseModule): if ver_support: version = query.getAttr('ver') if version is None: - raise MalformedStanzaError('ver attribute missing', stanza) + # raise MalformedStanzaError('ver attribute missing', stanza) + # Prosody sometimes does not send ver attribute with some + # community modules + self._log.warning('no version attribute found') pushed_items = [] for item in query.getTags('item'): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/39cb5cc7bc95f04a63249ead… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/39cb5cc7bc95f04a63249ead… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Windows: Fix downloading plugin
by Philipp Hörist (＠lovetox) 12 May '22

12 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7499f7f2 by lovetox at 2022-05-12T21:16:43+02:00 ci: Windows: Fix downloading plugin - - - - - 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_2.8.14.zip + 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${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/7499f7f2bbc13497bb4fbb24bb04879b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7499f7f2bbc13497bb4fbb24bb04879b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.4.0
by Philipp Hörist (＠lovetox) 12 May '22

12 May '22

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

1 0

[Git][gajim/gajim] Deleted tag gajim-1.4.0
by Philipp Hörist (＠lovetox) 12 May '22

12 May '22

Philipp Hörist deleted tag gajim-1.4.0 at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.4.0
by Philipp Hörist (＠lovetox) 12 May '22

12 May '22

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