Commits February 2022

commits@gajim.org

1 participants
43 discussions

[Git][gajim/gajim][master] ContactInfo: Access model values correctly
by Philipp Hörist (＠lovetox) 04 Feb '22

04 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 023b5e83 by lovetox at 2022-02-04T18:12:53+01:00 ContactInfo: Access model values correctly get_value() does not return GObject.Value Fixes #10767 - - - - - 1 changed file: - gajim/gtk/contact_info.py Changes: ===================================== gajim/gtk/contact_info.py ===================================== @@ -385,7 +385,7 @@ def _on_group_name_edited(self, # Check if group already exists iter_ = model.get_iter_first() while iter_: - group_name = model.get_value(iter_, Column.GROUP_NAME).get_string() + group_name = model.get_value(iter_, Column.GROUP_NAME) if group_name == new_name: return iter_ = model.iter_next(iter_) @@ -425,8 +425,7 @@ def _on_group_toggled(self, iter_ = model.get_iter_first() while iter_: if model.get_value(iter_, Column.IN_GROUP): - group_name = model.get_value( - iter_, Column.GROUP_NAME).get_string() + group_name = model.get_value(iter_, Column.GROUP_NAME) groups.add(group_name) iter_ = model.iter_next(iter_) @@ -441,7 +440,7 @@ def _on_group_add_button_clicked(self, _widget: Gtk.Button) -> None: # Check if default_name group already exists iter_ = model.get_iter_first() while iter_: - group_name = model.get_value(iter_, Column.GROUP_NAME).get_string() + group_name = model.get_value(iter_, Column.GROUP_NAME) if group_name == default_name: default_name += '_' iter_ = model.iter_next(iter_) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/023b5e8371c8933215591eae4f1e6661… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/023b5e8371c8933215591eae4f1e6661… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CI: Don’t ignore installed packages
by Philipp Hörist (＠lovetox) 03 Feb '22

03 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ec4efc90 by lovetox at 2022-02-03T20:45:59+01:00 CI: Don’t ignore installed packages - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -8,8 +8,8 @@ include: pyright: stage: test script: - - pip3 install -I git+https://dev.gajim.org/gajim/python-nbxmpp.git@$NBXMPP_BRANCH - - pip3 install -I git+https://github.com/pygobject/pygobject-stubs.git + - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git@$NBXMPP_BRANCH + - pip3 install git+https://github.com/pygobject/pygobject-stubs.git - npm install pyright - python3 -V - python3 scripts/ci/link-gtk.py View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ec4efc902e8264ced04718624c78c430… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ec4efc902e8264ced04718624c78c430… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Docker: Update requirements.txt
by Philipp Hörist (＠lovetox) 03 Feb '22

03 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5211ad57 by lovetox at 2022-02-03T20:35:53+01:00 Docker: Update requirements.txt - - - - - 1 changed file: - docker/requirements.txt Changes: ===================================== docker/requirements.txt ===================================== @@ -2,6 +2,7 @@ PyGObject pycairo>=1.20 mypy pylint==2.12.2 +pillow codespell coverage css-parser View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5211ad579d46e7d50298de08939132f2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5211ad579d46e7d50298de08939132f2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused import
by Philipp Hörist (＠lovetox) 03 Feb '22

03 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ab9541eb by lovetox at 2022-02-03T20:30:27+01:00 Remove unused import - - - - - 1 changed file: - gajim/gtk/conversation/plain_widget.py Changes: ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -17,7 +17,6 @@ from typing import Any import logging -import os from gi.repository import Gtk from gi.repository import Pango View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ab9541eba01082544b0094c97f619f5e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ab9541eba01082544b0094c97f619f5e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add Setting to switch PlainWidget implementation
by Philipp Hörist (＠lovetox) 03 Feb '22

03 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ced3738c by lovetox at 2022-02-03T20:20:41+01:00 Add Setting to switch PlainWidget implementation - - - - - 3 changed files: - gajim/common/setting_values.py - gajim/common/settings.py - gajim/gtk/conversation/plain_widget.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -39,6 +39,7 @@ class _ACCOUNT_DEFAULT: 'confirm_paste_image', 'dev_force_bookmark_2', 'developer_modus', + 'dev_use_message_label', 'enable_negative_priority', 'escape_key_closes', 'gc_notify_on_all_messages_private_default', @@ -260,6 +261,7 @@ class _ACCOUNT_DEFAULT: 'groupchat_roster_width': 210, 'dev_force_bookmark_2': False, 'developer_modus': False, + 'dev_use_message_label': False, 'use_libappindicator': True, 'show_help_start_chat': True, 'gc_notify_on_all_messages_private_default': True, @@ -644,10 +646,11 @@ class WorkspaceSettings(TypedDict): 'muclumbus_api_pref': _('API Preferences. Possible values: \'http\', \'iq\''), 'command_system_execute': _('If enabled, Gajim will execute commands (/show, /sh, /execute, /exec).'), 'groupchat_roster_width': _('Width of group chat roster in pixel'), - 'dev_force_bookmark_2': _('Force Bookmark 2 usage'), 'gc_notify_on_all_messages_private_default': '', 'gc_notify_on_all_messages_public_default': '', 'developer_modus': '', + 'dev_force_bookmark_2': _('Force Bookmark 2 usage'), + 'dev_use_message_label': '', 'use_libappindicator': _('Enables libappindicator, an alternative tray icon provider'), 'log_contact_status_changes': '', }, ===================================== gajim/common/settings.py ===================================== @@ -212,6 +212,9 @@ def _setup_installation_defaults() -> None: if IS_PORTABLE: APP_SETTINGS['use_keyring'] = False + if sys.platform == 'win32': + APP_SETTINGS['dev_use_message_label'] = False + @staticmethod def _namedtuple_factory(cursor: sqlite3.Cursor, row: tuple[Any, ...]) -> NamedTuple: ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -55,10 +55,10 @@ def __init__(self, account: str, selectable: bool) -> None: # We use a Gtk.Textview on Windows, since there is no support for # rendering color fonts (Emojis) on Windows yet, see: # https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/244 - if os.name == 'nt': - self._text_widget = MessageTextview(self._account) - else: + if app.settings.get('dev_use_message_label'): self._text_widget = MessageLabel(self._account, selectable) + else: + self._text_widget = MessageTextview(self._account) self.add(self._text_widget) def add_content(self, block: PlainBlock) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ced3738c2729c01b1b031df255fb8770… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ced3738c2729c01b1b031df255fb8770… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] StartChat: Fix leak
by Daniel Brötzmann (＠wurstsalat) 03 Feb '22

03 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 13c44d70 by wurstsalat at 2022-02-03T15:22:01+01:00 StartChat: Fix leak - - - - - 1 changed file: - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -134,7 +134,7 @@ def __init__(self) -> None: self._ui.filter_bar_revealer.add(self._chat_filter) self.connect('key-press-event', self._on_key_press) - self.connect('destroy', self._destroy) + self.connect('destroy', self._on_destroy) self.select_first_row() self._ui.connect_signals(self) @@ -738,11 +738,14 @@ def _process_search_result(self, for item in result.items: self._global_search_listbox.add(ResultRow(item)) - def _destroy(self, *args: Any) -> None: + def _on_destroy(self, *args: Any) -> None: + self._ui.listbox.set_filter_func(None) + self._ui.listbox.destroy() if self._source_id is not None: GLib.source_remove(self._source_id) self._destroyed = True app.cancel_tasks(self) + app.check_finalize(self) class ContactRow(Gtk.ListBoxRow): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/13c44d703709de73b1908b7b25cf1699… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/13c44d703709de73b1908b7b25cf1699… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: AvatarSelector: Add finalize check
by Daniel Brötzmann (＠wurstsalat) 03 Feb '22

03 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 84863f51 by wurstsalat at 2022-02-03T15:03:17+01:00 AvatarSelector: Add finalize check - - - - - 82f5e21c by wurstsalat at 2022-02-03T15:03:38+01:00 GroupchatManage: Fix leak - - - - - 2 changed files: - gajim/gtk/avatar_selector.py - gajim/gtk/groupchat_manage.py Changes: ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -15,8 +15,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Any from typing import Optional -from typing import Tuple import os import logging @@ -29,6 +29,7 @@ from gi.repository import Gtk import cairo +from gajim.common import app from gajim.common.const import AvatarSize from gajim.common.i18n import _ from gajim.common.helpers import get_file_path_from_dnd_dropped_uri @@ -78,6 +79,7 @@ def __init__(self) -> None: Gdk.DragAction.COPY | Gdk.DragAction.MOVE) self.drag_dest_set_target_list(dst_targets) self.connect('drag-data-received', self._on_drag_data_received) + self.connect('destroy', self._on_destroy) self._crop_area = CropArea() self._crop_area.set_vexpand(True) @@ -102,6 +104,9 @@ def __init__(self) -> None: self.show_all() + def _on_destroy(self, *args: Any) -> None: + app.check_finalize(self) + def prepare_crop_area(self, path: str) -> None: pixbuf = self._get_pixbuf_from_path(path) if pixbuf is None: @@ -154,7 +159,7 @@ def get_prepared(self) -> bool: @staticmethod def _scale_for_publish(pixbuf: GdkPixbuf.Pixbuf - ) -> Tuple[GdkPixbuf.Pixbuf, int, int]: + ) -> tuple[GdkPixbuf.Pixbuf, int, int]: width = pixbuf.get_width() height = pixbuf.get_height() if width > AvatarSize.PUBLISH or height > AvatarSize.PUBLISH: @@ -165,7 +170,7 @@ def _scale_for_publish(pixbuf: GdkPixbuf.Pixbuf GdkPixbuf.InterpType.BILINEAR) return pixbuf, width, height - def get_avatar_surface(self) -> Optional[Tuple[cairo.Surface, int, int]]: + def get_avatar_surface(self) -> Optional[tuple[cairo.Surface, int, int]]: pixbuf = self._crop_area.get_pixbuf() if pixbuf is None: return None @@ -174,7 +179,7 @@ def get_avatar_surface(self) -> Optional[Tuple[cairo.Surface, int, int]]: return Gdk.cairo_surface_create_from_pixbuf( scaled, self.get_scale_factor()), width, height - def get_avatar_bytes(self) -> Tuple[bool, Optional[bytes], int, int]: + def get_avatar_bytes(self) -> tuple[bool, Optional[bytes], int, int]: pixbuf = self._crop_area.get_pixbuf() if pixbuf is None: return False, None, 0, 0 ===================================== gajim/gtk/groupchat_manage.py ===================================== @@ -11,6 +11,7 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Any from typing import Optional import logging @@ -63,9 +64,14 @@ def __init__(self, self._prepare_subject() self._prepare_manage() + self.connect('destroy', self._on_destroy) self.show_all() + def _on_destroy(self, *args: Any) -> None: + self._avatar_selector = None + app.check_finalize(self) + @property def disco_info(self): return app.storage.cache.get_last_disco_info(self._contact.jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b4dcb38c0d6c0f2746f361e13c49cf2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b4dcb38c0d6c0f2746f361e13c49cf2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Only set urgency hint if we want to notify
by Daniel Brötzmann (＠wurstsalat) 03 Feb '22

03 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b4dcb38c by wurstsalat at 2022-02-03T14:24:12+01:00 Only set urgency hint if we want to notify - - - - - 1 changed file: - gajim/gtk/controls/base.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -1250,7 +1250,7 @@ def add_message(self, if notify: self._notify(name, text, tim, additional_data) - if not chat_active: + if not chat_active and notify: if self.is_groupchat: needs_highlight = message_needs_highlight( text, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b4dcb38c0d6c0f2746f361e13c49cf2e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b4dcb38c0d6c0f2746f361e13c49cf2e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: GroupchatDetails: Fix finalizing
by Daniel Brötzmann (＠wurstsalat) 03 Feb '22

03 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 26b53576 by wurstsalat at 2022-02-03T14:02:52+01:00 GroupchatDetails: Fix finalizing - - - - - e9a56ab2 by wurstsalat at 2022-02-03T14:15:28+01:00 XMLConsole: Fix leak - - - - - 2 changed files: - gajim/gtk/groupchat_details.py - gajim/gtk/xml_console.py Changes: ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -174,4 +174,7 @@ def _on_key_press(self, self.destroy() def _on_destroy(self, _widget: GroupchatDetails) -> None: + app.ged.remove_event_handler('muc-disco-update', + ged.GUI1, + self._on_muc_disco_update) app.check_finalize(self) ===================================== gajim/gtk/xml_console.py ===================================== @@ -99,6 +99,7 @@ def __init__(self) -> None: self.show_all() self.connect('key_press_event', self._on_key_press) + self.connect('destroy', self._on_destroy) self._ui.connect_signals(self) self.register_events([ @@ -107,6 +108,10 @@ def __init__(self) -> None: ('style-changed', ged.GUI1, self._on_style_changed) ]) + def _on_destroy(self, *args: Any) -> None: + self._ui.popover.destroy() + app.check_finalize(self) + def _get_style_scheme(self) -> Optional[GtkSource.StyleScheme]: if app.css_config.prefer_dark: style_scheme = self._style_scheme_manager.get_scheme( @@ -227,7 +232,8 @@ def _on_send(self, *args: Any) -> None: # stream management node = nbxmpp.Protocol(node=stanza, attrs={'xmlns': 'jabber:client'}) - app.connections[self._selected_send_account].connection.send(node) + client = app.get_client(self._selected_send_account) + client.connection.send(node) self.last_stanza = stanza buffer_.set_text('') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/49b4a0673c4a9d5cf7f309d1786f9ff… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/49b4a0673c4a9d5cf7f309d1786f9ff… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused code
by Philipp Hörist (＠lovetox) 02 Feb '22

02 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 49b4a067 by lovetox at 2022-02-02T23:43:16+01:00 Remove unused code - - - - - 1 changed file: - gajim/common/client.py Changes: ===================================== gajim/common/client.py ===================================== @@ -473,11 +473,6 @@ def send_message(self, message: OutgoingMessage) -> None: stanza = self.get_module('Message').build_message_stanza(message) message.stanza = stanza - if message.contact is None: - # Only Single Message should have no contact - self._send_message(message) - return - method = message.contact.settings.get('encryption') if not method: self._send_message(message) @@ -513,17 +508,6 @@ def _send_message(self, message: OutgoingMessage) -> None: self.get_module('Message').log_message(message) - def send_messages(self, jids: list[JID], message: OutgoingMessage) -> None: - if not self._state.is_available: - log.warning('Trying to send message while offline') - return - - # for jid in jids: - # message = message.copy() - # stanza = self.get_module('Message').build_message_stanza(message) - # message.stanza = stanza - # self._send_message(message) - def _prepare_for_connect(self) -> None: custom_host = get_custom_host(self._account) if custom_host is not None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/49b4a0673c4a9d5cf7f309d1786f9ffe… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/49b4a0673c4a9d5cf7f309d1786f9ffe… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2022