Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] fix: MessageWidget: Remove unused import
by Daniel Brötzmann (＠wurstsalat) 02 Jun '22

02 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 3db1e09c by wurstsalat at 2022-06-02T23:31:19+02:00 fix: MessageWidget: Remove unused import - - - - - 1 changed file: - gajim/gtk/conversation/message_widget.py Changes: ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -14,7 +14,6 @@ from __future__ import annotations -from typing import Any from typing import Optional from typing import Union from typing import cast View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3db1e09c59d82f982801f90f13ae4596… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3db1e09c59d82f982801f90f13ae4596… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Remove update_text_tags method
by Daniel Brötzmann (＠wurstsalat) 02 Jun '22

02 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 5784dfd4 by wurstsalat at 2022-06-02T23:24:34+02:00 fix: Remove update_text_tags method MessageTextview will be phased out soon, and there is only URL color tags left - - - - - 6 changed files: - gajim/gtk/controls/base.py - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/plain_widget.py - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -286,7 +286,6 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: ('ping-sent', ged.GUI1, self._nec_ping), ('ping-reply', ged.GUI1, self._nec_ping), ('ping-error', ged.GUI1, self._nec_ping), - ('style-changed', ged.GUI1, self._style_changed), ]) # This is basically a very nasty hack to surpass the inability @@ -1321,12 +1320,6 @@ def _on_formatting_menuitem_activate(self, formatting = menu_item.get_name() self.msg_textview.apply_formatting(formatting) - def _style_changed(self, _event: events.StyleChanged) -> None: - self.update_text_tags() - - def update_text_tags(self) -> None: - self.conversation_view.update_text_tags() - def set_control_active(self, state: bool) -> None: if not self._chat_loaded: self.fetch_n_lines_history(self._scrolled_view, True, 20) ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -93,8 +93,3 @@ def add_content(self, content: ContentT) -> None: def clear(self) -> None: self.foreach(self.remove) - - def update_text_tags(self, *args: Any) -> None: - for widget in cast(list[MessageWidget], self.get_children()): - if not isinstance(widget, CodeWidget): - widget.update_text_tags() ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -74,9 +74,6 @@ def add_action_phrase(self, text: str, nickname: str) -> None: text = GLib.markup_escape_text(text) self._text_widget.add_action_phrase(text) - def update_text_tags(self) -> None: - self._text_widget.update_text_tags() - class MessageLabel(Gtk.Label): def __init__(self, account: str, selectable: bool) -> None: @@ -125,9 +122,6 @@ def print_text_with_styling(self, block: PlainBlock) -> None: def add_action_phrase(self, text: str) -> None: self.set_markup(f'<i>{text}</i>') - def update_text_tags(self) -> None: - pass - def _on_activate_link(self, _label: Gtk.Label, uri: str) -> int: open_uri(uri, self._account) return Gdk.EVENT_STOP @@ -201,14 +195,6 @@ def _create_url_tags(self) -> None: underline=Pango.Underline.SINGLE) tag.connect('event', self._on_uri_clicked, tag) - def update_text_tags(self) -> None: - tag_table = self.get_buffer().get_tag_table() - url_color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) - for tag_name in URI_TAGS: - tag = tag_table.lookup(tag_name) - assert tag is not None - tag.set_property('foreground', url_color) - def clear(self) -> None: buffer_ = self.get_buffer() start, end = buffer_.get_bounds() ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -60,9 +60,6 @@ def __init__(self, account: str, widget: Optional[str] = None) -> None: def is_merged(self) -> bool: return self._merged - def update_text_tags(self) -> None: - pass - @staticmethod def create_timestamp_widget(timestamp: datetime) -> Gtk.Label: time_format = from_one_line(app.settings.get('chat_timestamp_format')) ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -229,10 +229,6 @@ def __init__(self, self.show_all() - def update_text_tags(self) -> None: - if isinstance(self._message_widget, MessageWidget): - self._message_widget.update_text_tags() - def _check_for_highlight(self, text: str) -> None: assert isinstance(self._contact, GroupchatContact) if self._contact.nickname is None: ===================================== gajim/gtk/conversation/view.py ===================================== @@ -485,11 +485,6 @@ def update_avatars(self) -> None: if isinstance(row, MessageRow): row.update_avatar() - def update_text_tags(self) -> None: - for row in cast(list[BaseRow], self.get_children()): - if isinstance(row, MessageRow): - row.update_text_tags() - def scroll_to_end(self, force: bool = False) -> None: if self.autoscroll or force: GLib.idle_add(self.emit, 'scroll-to-end') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5784dfd43b2e54cc9554a0f27a728059… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5784dfd43b2e54cc9554a0f27a728059… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: JingleAudio: Check if webrtcdsp is available
by Daniel Brötzmann (＠wurstsalat) 02 Jun '22

02 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: fc988fe5 by wurstsalat at 2022-06-02T22:41:53+02:00 fix: JingleAudio: Check if webrtcdsp is available Fixes #10938 - - - - - 1 changed file: - gajim/common/jingle_rtp.py Changes: ===================================== gajim/common/jingle_rtp.py ===================================== @@ -80,6 +80,11 @@ def __init__(self, self.p2psession: Optional[Farstream.Session] = None self.p2pstream: Optional[Farstream.Stream] = None + self.available_gst_plugins: list[str] = [] + gst_plugin_registry = Gst.Registry.get() + for plugin in gst_plugin_registry.get_plugin_list(): + self.available_gst_plugins.append(plugin.get_name()) + self.callbacks['session-initiate'] += [self.__on_remote_codecs] self.callbacks['content-add'] += [self.__on_remote_codecs] self.callbacks['description-info'] += [self.__on_remote_codecs] @@ -427,23 +432,35 @@ def setup_stream(self) -> None: # the local parts # TODO: Add queues? - self.src_bin = self.make_bin_from_config( - 'audio_input_device', - '''%s - ! webrtcdsp - echo-suppression-level=high - noise-suppression-level=very-high - voice-detection=true - ! audioconvert ''', - _('audio input')) + if 'webrtcdsp' in self.available_gst_plugins: + self.src_bin = self.make_bin_from_config( + 'audio_input_device', + '''%s + ! webrtcdsp + echo-suppression-level=high + noise-suppression-level=very-high + voice-detection=true + ! audioconvert ''', + _('audio input')) + else: + self.src_bin = self.make_bin_from_config( + 'audio_input_device', + '%s ! audioconvert ', + _('audio input')) # setting name=webrtcechoprobe0 is needed because lingering probes # cause a bug in subsequent calls - self.sink = self.make_bin_from_config( - 'audio_output_device', - 'audioconvert ! volume name=gajim_out_vol ! webrtcechoprobe name=webrtcechoprobe0 ! %s', - _('audio output')) - + if 'webrtcdsp' in self.available_gst_plugins: + self.sink = self.make_bin_from_config( + 'audio_output_device', + '''audioconvert ! volume name=gajim_out_vol ! + webrtcechoprobe name=webrtcechoprobe0 ! %s''', + _('audio output')) + else: + self.sink = self.make_bin_from_config( + 'audio_output_device', + 'audioconvert ! volume name=gajim_out_vol ! %s', + _('audio output')) self.mic_volume = self.src_bin.get_by_name('gajim_vol') self.out_volume = self.sink.get_by_name('gajim_out_vol') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fc988fe51761a9cd48ec7835c7e287e8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fc988fe51761a9cd48ec7835c7e287e8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: Assistant: Don’t overwrite default pages when adding pages
by Daniel Brötzmann (＠wurstsalat) 02 Jun '22

02 Jun '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: dc26bb39 by wurstsalat at 2022-06-02T20:24:52+02:00 fix: Assistant: Don’t overwrite default pages when adding pages - - - - - 4607a135 by wurstsalat at 2022-06-02T20:30:45+02:00 refactor: ServiceRegistration: Port to Gajim’s Assistant class Fixes #10764 - - - - - 5 changed files: - gajim/gtk/assistant.py - gajim/gtk/discovery.py - gajim/gtk/roster.py - gajim/gtk/service_registration.py - pyrightconfig.json Changes: ===================================== gajim/gtk/assistant.py ===================================== @@ -144,8 +144,8 @@ def add_button(self, self._ui.action_area.pack_end(button, False, False, 0) def add_pages(self, pages: dict[str, Page]): - self._pages = pages for name, widget in pages.items(): + self._pages[name] = widget widget.connect('update-page-complete', self._update_page_complete) self._ui.stack.add_named(widget, name) ===================================== gajim/gtk/discovery.py ===================================== @@ -47,6 +47,7 @@ import nbxmpp from nbxmpp.structs import DiscoIdentity from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import JID from nbxmpp.errors import StanzaError from gi.repository import GLib @@ -1342,7 +1343,7 @@ def _on_register_button_clicked(self, widget=None): self.window.services_treeview.get_selection().get_selected() if not iter_: return - jid = model[iter_][0] + jid = JID.from_string(model[iter_][0]) if jid: open_window( 'ServiceRegistration', account=self.account, address=jid) ===================================== gajim/gtk/roster.py ===================================== @@ -330,11 +330,10 @@ def _on_contact_info(self, def _on_modify_gateway(self, _action: Gio.SimpleAction, param: GLib.Variant) -> None: - open_window( 'ServiceRegistration', account=self._account, - address=param.get_string()) + address=JID.from_string(param.get_string())) def _on_execute_command(self, _action: Gio.SimpleAction, ===================================== gajim/gtk/service_registration.py ===================================== @@ -12,218 +12,192 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + +from typing import Any +from typing import Literal +from typing import Optional +from typing import overload + import logging -from enum import IntEnum from gi.repository import Gtk from nbxmpp.errors import StanzaError from nbxmpp.errors import MalformedStanzaError from nbxmpp.errors import RegisterStanzaError +from nbxmpp.protocol import JID +from nbxmpp.task import Task from gajim.common import app from gajim.common.i18n import _ +from .assistant import Assistant +from .assistant import ErrorPage +from .assistant import Page +from .assistant import ProgressPage +from .assistant import SuccessPage from .dataform import DataFormWidget -log = logging.getLogger('gajim.gui.registration') +log = logging.getLogger('gajim.gui.service_registration') -class Page(IntEnum): - REQUEST = 0 - FORM = 1 - SENDING = 2 - SUCCESS = 3 - ERROR = 4 +class ServiceRegistration(Assistant): + def __init__(self, account: str, address: JID) -> None: + Assistant.__init__(self, width= 600, height=400) + self.account = account + self._client = app.get_client(account) + self._service = address -class ServiceRegistration(Gtk.Assistant): - def __init__(self, account, address): - Gtk.Assistant.__init__(self) - self.account = account + self.add_button('register', _('Register'), 'suggested-action') + self.add_button('close', _('Close')) + self.add_button('back', _('Back')) - self._con = app.connections[account] - self._agent = address - self._data_form_widget = None + self.set_button_visible_func(self._visible_func) - self.set_application(app.app) - self.set_resizable(True) - self.set_position(Gtk.WindowPosition.CENTER) + self.add_pages({ + 'form': Form(), + }) - self.set_default_size(600, 400) - self.get_style_context().add_class('dialog-margin') + self.add_default_page('error') + self.add_default_page('progress') + self.add_default_page('success') - self._add_page(RequestPage()) - self._add_page(FormPage()) - self._add_page(SendingPage()) - self._add_page(SuccessfulPage()) - self._add_page(ErrorPage()) + self.get_page('error').set_title(_('Registration failed')) + self.get_page('error').set_heading(_('Registration failed')) - self.connect('prepare', self._on_page_change) - self.connect('cancel', self._on_cancel) - self.connect('close', self._on_cancel) + self.connect('button-clicked', self._on_button_clicked) - self._remove_sidebar() self.show_all() - def _add_page(self, page): - self.append_page(page) - self.set_page_type(page, page.type_) - self.set_page_title(page, page.title) - self.set_page_complete(page, page.complete) - - def _remove_sidebar(self): - main_box = self.get_children()[0] - sidebar = main_box.get_children()[0] - main_box.remove(sidebar) - - def _on_page_change(self, _assistant, _page): - if self.get_current_page() == Page.REQUEST: - self._con.get_module('Register').request_register_form( - self._agent, callback=self._on_register_form) - elif self.get_current_page() == Page.SENDING: + self._request_form() + + @overload + def get_page(self, name: Literal['form']) -> Form: ... + @overload + def get_page(self, name: Literal['success']) -> SuccessPage: ... + @overload + def get_page(self, name: Literal['error']) -> ErrorPage: ... + @overload + def get_page(self, name: Literal['progress']) -> ProgressPage: ... + + def get_page(self, name: str) -> Page: + return self._pages[name] + + @staticmethod + def _visible_func(_assistant: Assistant, page_name: str) -> list[str]: + if page_name == 'form': + return ['close', 'register'] + + if page_name == 'progress': + return [] + + if page_name == 'success': + return ['close'] + + if page_name == 'error': + return ['back', 'close'] + raise ValueError(f'page {page_name} unknown') + + def _on_button_clicked(self, _page: Gtk.Widget, button_name: str) -> None: + if button_name == 'register': self._register() - self.commit() - def _on_register_form(self, task): + if button_name == 'back': + self.show_page('form', Gtk.StackTransitionType.SLIDE_RIGHT) + + if button_name == 'close': + self.destroy() + + def _request_form(self) -> None: + self.get_page('progress').set_title(_('Requesting Register Form')) + self.get_page('progress').set_text( + _('Requesting register form from server…')) + self.show_page('progress') + + self._client.get_module('Register').request_register_form( + self._service, callback=self._on_register_form) + + def _on_register_form(self, task: Task) -> None: try: result = task.finish() except (StanzaError, MalformedStanzaError) as error: - self.get_nth_page(Page.ERROR).set_text(error.get_text()) - self.set_current_page(Page.ERROR) + self.get_page('error').set_text(error.get_text()) + self.show_page('error') return form = result.form if result.form is None: form = result.fields_form - self._data_form_widget = DataFormWidget(form) - self._data_form_widget.connect('is-valid', self._on_is_valid) - self._data_form_widget.validate() - self.get_nth_page(Page.FORM).set_form(self._data_form_widget) - self.set_current_page(Page.FORM) + self.get_page('form').add_form(form) + self.show_page('form') - def _on_is_valid(self, _widget, is_valid): - self.set_page_complete(self.get_nth_page(Page.FORM), is_valid) + def _register(self) -> None: + self.get_page('progress').set_title(_('Registering…')) + self.get_page('progress').set_text(_('Registering…')) + self.show_page('progress') - def _on_cancel(self, _widget): - self.destroy() - - def _register(self): - form = self._data_form_widget.get_submit_form() - self._con.get_module('Register').submit_register_form( + form = self.get_page('form').get_submit_form() + self._client.get_module('Register').submit_register_form( form, - self._agent, + self._service, callback=self._on_register_result) - def _on_register_result(self, task): + def _on_register_result(self, task: Task) -> None: try: task.finish() except (StanzaError, MalformedStanzaError, RegisterStanzaError) as error: - self.get_nth_page(Page.ERROR).set_text(error.get_text()) - self.set_current_page(Page.ERROR) + self.get_page('error').set_text(error.get_text()) + self.show_page('error') return - self.set_current_page(Page.SUCCESS) - - -class RequestPage(Gtk.Box): - - type_ = Gtk.AssistantPageType.INTRO - title = _('Register') - complete = False - - def __init__(self): - super().__init__(orientation=Gtk.Orientation.VERTICAL) - self.set_spacing(18) - spinner = Gtk.Spinner() - self.pack_start(spinner, True, True, 0) - spinner.start() + self.get_page('success').set_title(_('Registration successful')) + self.get_page('success').set_text(_('Registration successful')) + self.show_page('success') -class SendingPage(RequestPage): +class Form(Page): + def __init__(self) -> None: + Page.__init__(self) + self.title = _('Register') + self.complete = False - type_ = Gtk.AssistantPageType.PROGRESS - title = _('Register') - complete = False - - -class FormPage(Gtk.Box): - - type_ = Gtk.AssistantPageType.INTRO - title = _('Register') - complete = True - - def __init__(self): - super().__init__(orientation=Gtk.Orientation.VERTICAL) - self._form = None - self._label = Gtk.Label() - self._label.set_no_show_all(True) - self._label.get_style_context().add_class('error-color') - self.pack_end(self._label, False, False, 0) - - def set_form(self, form, error_text=None): - if self._form is not None: - self.remove(self._form) - self._form.destroy() - self._label.hide() - self._form = form - - if error_text is not None: - self._label.set_text(error_text) - self._label.show() - - self.pack_start(form, True, True, 0) - self._form.show_all() - - -class SuccessfulPage(Gtk.Box): - - type_ = Gtk.AssistantPageType.SUMMARY - title = _('Registration successful') - complete = True - - def __init__(self): - super().__init__(orientation=Gtk.Orientation.VERTICAL) - self.set_spacing(12) - self.set_homogeneous(True) - - icon = Gtk.Image.new_from_icon_name('object-select-symbolic', - Gtk.IconSize.DIALOG) - icon.get_style_context().add_class('success-color') - icon.set_valign(Gtk.Align.END) - label = Gtk.Label(label=_('Registration successful')) - label.get_style_context().add_class('bold16') - label.set_valign(Gtk.Align.START) - - self.add(icon) - self.add(label) - - -class ErrorPage(Gtk.Box): - - type_ = Gtk.AssistantPageType.SUMMARY - title = _('Registration failed') - complete = True - - def __init__(self): - super().__init__(orientation=Gtk.Orientation.VERTICAL) - self.set_spacing(12) - self.set_homogeneous(True) + self._dataform_widget: Optional[DataFormWidget] = None + self.show_all() - icon = Gtk.Image.new_from_icon_name('dialog-error-symbolic', - Gtk.IconSize.DIALOG) - icon.get_style_context().add_class('error-color') - icon.set_valign(Gtk.Align.END) - self._label = Gtk.Label() - self._label.set_valign(Gtk.Align.START) - self._label.set_max_width_chars(50) - self._label.set_line_wrap(True) + def add_form(self, form: Any) -> None: + self.remove_form() + + options = { + 'form-width': 350, + 'entry-activates-default': True + } + self._dataform_widget = DataFormWidget(form, options) + self._dataform_widget.set_propagate_natural_height(True) + self._dataform_widget.connect('is-valid', self._on_is_valid) + self._dataform_widget.validate() + self._dataform_widget.show_all() + self.add(self._dataform_widget) + + def _on_is_valid(self, _widget: DataFormWidget, is_valid: bool) -> None: + self.complete = is_valid + self.update_page_complete() + + def get_submit_form(self) -> Any: + assert self._dataform_widget is not None + return self._dataform_widget.get_submit_form() + + def remove_form(self) -> None: + if self._dataform_widget is None: + return - self.add(icon) - self.add(self._label) + self.remove(self._dataform_widget) + self._dataform_widget.destroy() + self._dataform_widget = None - def set_text(self, text): - self._label.set_text(text) + def get_default_button(self) -> str: + return 'register' ===================================== pyrightconfig.json ===================================== @@ -100,6 +100,7 @@ "gajim/gtk/resource_selector.py", "gajim/gtk/roster.py", "gajim/gtk/search_view.py", + "gajim/gtk/service_registration.py", "gajim/gtk/sidebar_switcher.py", "gajim/gtk/ssl_error_dialog.py", "gajim/gtk/status_icon.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c4bad7d5cac65a8236ec751fe263e19… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c4bad7d5cac65a8236ec751fe263e19… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update MANIFEST.in
by Philipp Hörist (＠lovetox) 02 Jun '22

02 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c4bad7d5 by lovetox at 2022-06-02T16:41:55+02:00 chore: Update MANIFEST.in Add back COPYING, only setuptools > 56 does auto include it - - - - - 1 changed file: - MANIFEST.in Changes: ===================================== MANIFEST.in ===================================== @@ -1,3 +1,4 @@ +include COPYING recursive-include po * recursive-include data *.1 *.in recursive-include test * View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c4bad7d5cac65a8236ec751fe263e19f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c4bad7d5cac65a8236ec751fe263e19f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update README.md
by Philipp Hörist (＠lovetox) 02 Jun '22

02 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 42f23d06 by lovetox at 2022-06-02T10:47:00+02:00 chore: Update README.md - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== @@ -20,7 +20,6 @@ ### Runtime Requirements ### Optional Runtime Requirements -- python3-pil (pillow) for support of webp avatars - python3-sentry-sdk for Sentry error reporting to dev.gajim.org (users decide whether to send reports or not) - gir1.2-gspell-1 and hunspell-LANG where lang is your locale eg. en, fr etc - gir1.2-secret-1 for GNOME Keyring or KDE support as password storage View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/42f23d06640dfb350ca10686419fe867… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/42f23d06640dfb350ca10686419fe867… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Debian: Remove duplicated dependency
by Philipp Hörist (＠lovetox) 02 Jun '22

02 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 58a12b6d by lovetox at 2022-06-02T10:40:47+02:00 ci: Debian: Remove duplicated dependency - - - - - 1 changed file: - debian/control Changes: ===================================== debian/control ===================================== @@ -59,7 +59,6 @@ Recommends: notification-daemon, pulseaudio-utils | alsa-utils | sox | oss4-base, python3-dbus (>=0.81), - python3-keyring, python3-sentry-sdk, Suggests: libxss1, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/58a12b6dbd6445a1e560689ee2b56e75… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/58a12b6dbd6445a1e560689ee2b56e75… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Add pillow as runtime dependency
by Philipp Hörist (＠lovetox) 02 Jun '22

02 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 46414dd5 by lovetox at 2022-06-02T10:36:04+02:00 chore: Add pillow as runtime dependency Fixes #10940 - - - - - 4 changed files: - README.md - debian/control - gajim/gtk/util.py - setup.cfg Changes: ===================================== README.md ===================================== @@ -11,6 +11,7 @@ ### Runtime Requirements - python3-keyring - python3-precis-i18n - python3-packaging +- python3-pil - python3-setuptools - Gtk3 (>=3.22) - GLib (>=2.60.0) ===================================== debian/control ===================================== @@ -36,6 +36,7 @@ Depends: python3-precis-i18n, python3-keyring, python3-packaging, + python3-pil, python3-setuptools, python3-css-parser, gir1.2-gtk-3.0 (>= 3.22.27~), @@ -59,7 +60,6 @@ Recommends: pulseaudio-utils | alsa-utils | sox | oss4-base, python3-dbus (>=0.81), python3-keyring, - python3-pil, python3-sentry-sdk, Suggests: libxss1, ===================================== gajim/gtk/util.py ===================================== @@ -31,11 +31,7 @@ from pathlib import Path from re import Match -try: - from PIL import Image -except Exception: - pass - +from PIL import Image from gi.repository import Gdk from gi.repository import Gio from gi.repository import Gtk ===================================== setup.cfg ===================================== @@ -24,6 +24,7 @@ install_requires = keyring nbxmpp>=3.0.0,<4.0.0 packaging + pillow precis-i18n>=1.0.0 pyOpenSSL>=16.2 pycairo>=1.16.0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/46414dd5f65404859dde1611ef4b5bfe… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/46414dd5f65404859dde1611ef4b5bfe… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Update gitlab-ci.yml
by Philipp Hörist (＠lovetox) 01 Jun '22

01 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: d261cbf7 by lovetox at 2022-06-01T22:44:20+02:00 ci: Update gitlab-ci.yml Make sure ssh-agent is running and chmod .ssh - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -118,8 +118,10 @@ deploy-flatpak: rules: - if: '$CI_COMMIT_TAG' before_script: + - eval $(ssh-agent -s) # - echo "${FLATHUB_DEPLOY_KEY}" | tr -d '\r' | ssh-add - > /dev/null - mkdir -p ~/.ssh + - chmod 700 ~/.ssh - ssh-keyscan github.com >> ~/.ssh/known_hosts script: - git config user.email "$CI_GIT_USER_EMAIL" @@ -139,8 +141,10 @@ publish-release: rules: - if: '$CI_COMMIT_TAG' before_script: + - eval $(ssh-agent -s) - echo "${WEBSITE_DEPLOY_KEY}" | tr -d '\r' | ssh-add - > /dev/null - mkdir -p ~/.ssh + - chmod 700 ~/.ssh - ssh-keyscan dev.gajim.org >> ~/.ssh/known_hosts script: - git config --global user.email "$CI_GIT_USER_EMAIL" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d261cbf709f6a1cbc6c8732e08ad5a59… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d261cbf709f6a1cbc6c8732e08ad5a59… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Update gitlab-ci.yml
by Philipp Hörist (＠lovetox) 01 Jun '22

01 Jun '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: e45ea411 by lovetox at 2022-06-01T17:12:07+02:00 ci: Update gitlab-ci.yml ssh-keyscan does need a host not an https address - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -120,7 +120,7 @@ deploy-flatpak: before_script: # - echo "${FLATHUB_DEPLOY_KEY}" | tr -d '\r' | ssh-add - > /dev/null - mkdir -p ~/.ssh - - ssh-keyscan https://github.com >> ~/.ssh/known_hosts + - ssh-keyscan github.com >> ~/.ssh/known_hosts script: - git config user.email "$CI_GIT_USER_EMAIL" - git config user.name "$CI_GIT_USER_USERNAME" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e45ea4115c995362b4f4e66c4b83ad52… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e45ea4115c995362b4f4e66c4b83ad52… 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