Commits January 2023

commits@gajim.org

1 participants
135 discussions

[Git][gajim/gajim][master] fix: AvatarChooser: Fix file filter for Windows
by Daniel Brötzmann (＠wurstsalat) 13 Jan '23

13 Jan '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e39dba6b by wurstsalat at 2023-01-13T13:48:30+01:00 fix: AvatarChooser: Fix file filter for Windows This was introduced in 16cd4ebdb69903024d54a46ee9e648e835875fdc but doesn't work on Windows - - - - - 1 changed file: - gajim/gtk/filechoosers.py Changes: ===================================== gajim/gtk/filechoosers.py ===================================== @@ -112,7 +112,13 @@ class BaseAvatarChooserDialog: _title = _('Choose Avatar…') _preview_size = (100, 100) - _filters = [Filter(_('Images'), ['image/*'], True)] + + if _require_native(): + _filters = [Filter(_('PNG files'), '*.png', True), + Filter(_('JPEG files'), '*.jp*g', False), + Filter(_('SVG files'), '*.svg', False)] + else: + _filters = [Filter(_('Images'), ['image/*'], True)] class NativeFileChooserDialog(Gtk.FileChooserNative, BaseFileChooser): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e39dba6ba7bc73c391b1d1ddf5e803fb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e39dba6ba7bc73c391b1d1ddf5e803fb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Audio Preview: Sync clock to make short files play properly on Win
by Daniel Brötzmann (＠wurstsalat) 13 Jan '23

13 Jan '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: cf79eb93 by mesonium at 2023-01-13T08:46:55+00:00 fix: Audio Preview: Sync clock to make short files play properly on Win - - - - - 1 changed file: - gajim/gtk/preview_audio.py Changes: ===================================== gajim/gtk/preview_audio.py ===================================== @@ -17,6 +17,7 @@ from typing import Any import logging +import sys from pathlib import Path from gi.repository import Gdk @@ -207,7 +208,15 @@ def _setup_audio_player(self, file_path: Path) -> None: assert audioconvert is not None assert scaletempo is not None assert audioresample is not None - autoaudiosink.set_property('sync', False) + + # On Windows the first fraction of an audio + # would not play if not synced. + # On Linux there can be a delay before playback starts with sync, + # which is however not the case on Windows. + if sys.platform == 'win32': + autoaudiosink.set_property('sync', True) + else: + autoaudiosink.set_property('sync', False) audio_sink.add(audioconvert) audio_sink.add(scaletempo) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cf79eb939a981e09b494797c6a0cc5ee… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cf79eb939a981e09b494797c6a0cc5ee… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: UX: Make more text labels selectable/enable can-focus for copying
by Daniel Brötzmann (＠wurstsalat) 12 Jan '23

12 Jan '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 574e312e by wurstsalat at 2023-01-12T20:06:12+01:00 imprv: UX: Make more text labels selectable/enable can-focus for copying Fixes #11336 - - - - - 10 changed files: - gajim/data/gui/account_page.ui - gajim/data/gui/chat_banner.ui - gajim/data/gui/contact_info.ui - gajim/data/gui/file_transfer_jingle.ui - gajim/data/gui/groupchat_info_scrolled.ui - gajim/data/gui/preview.ui - gajim/data/gui/server_info.ui - gajim/gtk/conversation/rows/muc_subject.py - gajim/gtk/conversation/rows/widgets.py - gajim/gtk/preview.py Changes: ===================================== gajim/data/gui/account_page.ui ===================================== @@ -158,7 +158,8 @@ <child type="center"> <object class="GtkLabel" id="account_label"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> + <property name="selectable">True</property> <property name="label"><name></property> <style> <class name="large-header"/> ===================================== gajim/data/gui/chat_banner.ui ===================================== @@ -32,7 +32,8 @@ <child> <object class="GtkLabel" id="name_label"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> + <property name="selectable">True</property> <property name="halign">start</property> <property name="hexpand">True</property> <property name="ellipsize">end</property> ===================================== gajim/data/gui/contact_info.ui ===================================== @@ -302,7 +302,8 @@ <child> <object class="GtkLabel" id="contact_name_label"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> + <property name="selectable">True</property> <property name="halign">center</property> <property name="ellipsize">end</property> <property name="single-line-mode">True</property> @@ -320,7 +321,7 @@ <child> <object class="GtkLabel" id="contact_jid_label"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> <property name="margin-bottom">6</property> <property name="selectable">True</property> <property name="ellipsize">end</property> ===================================== gajim/data/gui/file_transfer_jingle.ui ===================================== @@ -60,7 +60,8 @@ <child> <object class="GtkLabel" id="file_name"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> + <property name="selectable">True</property> <property name="halign">start</property> <property name="label"><file name></property> <property name="ellipsize">middle</property> @@ -78,7 +79,8 @@ <child> <object class="GtkLabel" id="file_description"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> + <property name="selectable">True</property> <property name="halign">start</property> <property name="label"><file description></property> <property name="ellipsize">end</property> ===================================== gajim/data/gui/groupchat_info_scrolled.ui ===================================== @@ -92,7 +92,8 @@ </child> <child> <object class="GtkLabel" id="author"> - <property name="can-focus">False</property> + <property name="can-focus">True</property> + <property name="selectable">True</property> <property name="no-show-all">True</property> <property name="halign">start</property> <property name="valign">start</property> @@ -255,7 +256,7 @@ </child> <child> <object class="GtkLabel" id="name"> - <property name="can-focus">False</property> + <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="halign">center</property> <property name="valign">start</property> ===================================== gajim/data/gui/preview.ui ===================================== @@ -293,7 +293,7 @@ <child> <object class="GtkLabel" id="file_name"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> <property name="selectable">True</property> <property name="ellipsize">end</property> <property name="single-line-mode">True</property> @@ -313,7 +313,8 @@ <child> <object class="GtkLabel" id="file_size"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> + <property name="selectable">True</property> <property name="single-line-mode">True</property> <property name="max-width-chars">30</property> <property name="xalign">0</property> @@ -331,7 +332,8 @@ <child> <object class="GtkLabel" id="info_message"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> + <property name="selectable">True</property> <property name="ellipsize">end</property> <property name="single-line-mode">True</property> <property name="max-width-chars">30</property> ===================================== gajim/data/gui/server_info.ui ===================================== @@ -161,8 +161,9 @@ <child> <object class="GtkLabel" id="connection_type"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> <property name="halign">start</property> + <property name="selectable">True</property> <property name="single-line-mode">True</property> <property name="xalign">0</property> </object> @@ -189,9 +190,10 @@ <child> <object class="GtkLabel" id="proxy_type"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> <property name="halign">start</property> <property name="label" translatable="yes">No proxy used</property> + <property name="selectable">True</property> <property name="xalign">0</property> </object> <packing> @@ -217,9 +219,10 @@ <child> <object class="GtkLabel" id="proxy_host"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> <property name="halign">start</property> <property name="label">-</property> + <property name="selectable">True</property> <property name="xalign">0</property> </object> <packing> @@ -305,8 +308,9 @@ <child> <object class="GtkLabel" id="domain"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> <property name="halign">start</property> + <property name="selectable">True</property> <property name="xalign">0</property> </object> <packing> @@ -316,9 +320,10 @@ </child> <child> <object class="GtkLabel" id="dns"> - <property name="can-focus">False</property> + <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="halign">start</property> + <property name="selectable">True</property> <property name="xalign">0</property> </object> <packing> @@ -328,7 +333,7 @@ </child> <child> <object class="GtkLabel" id="ip_port"> - <property name="can-focus">False</property> + <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="halign">start</property> <property name="selectable">True</property> @@ -341,9 +346,10 @@ </child> <child> <object class="GtkLabel" id="websocket"> - <property name="can-focus">False</property> + <property name="can-focus">True</property> <property name="no-show-all">True</property> <property name="halign">start</property> + <property name="selectable">True</property> <property name="xalign">0</property> </object> <packing> @@ -384,8 +390,9 @@ <child> <object class="GtkLabel" id="tls_version"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> <property name="halign">start</property> + <property name="selectable">True</property> </object> <packing> <property name="left-attach">1</property> @@ -395,8 +402,9 @@ <child> <object class="GtkLabel" id="cipher_suite"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</property> <property name="halign">start</property> + <property name="selectable">True</property> </object> <packing> <property name="left-attach">1</property> ===================================== gajim/gtk/conversation/rows/muc_subject.py ===================================== @@ -72,6 +72,7 @@ def __init__(self, meta_str = f'{author}{date}' meta = Gtk.Label(label=meta_str) meta.set_halign(Gtk.Align.START) + meta.set_selectable(True) meta.get_style_context().add_class('small-label') subject_box.add(meta) ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -74,6 +74,7 @@ def __init__(self, timestamp: datetime) -> None: format_string = app.settings.get('date_time_format') self.set_text(timestamp.strftime(format_string)) + self.set_selectable(True) self.set_halign(Gtk.Align.START) self.set_valign(Gtk.Align.END) self.set_margin_start(6) ===================================== gajim/gtk/preview.py ===================================== @@ -128,6 +128,7 @@ def update(self, preview: Preview, data: Optional[GdkPixbufType]) -> None: if preview.is_geo_uri: self._ui.icon_event_box.hide() self._ui.file_name.set_text(_('Click to view location')) + self._ui.file_name.set_selectable(False) self._ui.save_as_button.hide() self._ui.open_folder_button.hide() self._ui.download_button.hide() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/574e312e11db029ec920098ece63129d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/574e312e11db029ec920098ece63129d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: ChatStack DnD: Add workaround for mis-fired drag-motion signal
by Daniel Brötzmann (＠wurstsalat) 12 Jan '23

12 Jan '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e57c3b87 by wurstsalat at 2023-01-12T19:03:19+01:00 fix: ChatStack DnD: Add workaround for mis-fired drag-motion signal Fixes #11226 - - - - - 1 changed file: - gajim/gtk/chat_stack.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -673,8 +673,13 @@ def _on_drag_motion(self, _context: Gdk.DragContext, _x_coord: int, _y_coord: int, - _time: int + time: int ) -> bool: + + if time == 0: + # Workaround for https://gitlab.gnome.org/GNOME/gtk/-/issues/5518 + return False + self._drop_area.set_no_show_all(False) self._drop_area.show_all() return True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e57c3b875d355cf407fc73bb94527f0a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e57c3b875d355cf407fc73bb94527f0a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: AudioPreview: Make visualization fully RTL compatible again and ensure graph is always drawn
by Daniel Brötzmann (＠wurstsalat) 12 Jan '23

12 Jan '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8f901abc by mesonium at 2023-01-12T17:22:38+00:00 fix: AudioPreview: Make visualization fully RTL compatible again and ensure graph is always drawn - - - - - 1 changed file: - gajim/gtk/preview_audio_visualizer.py Changes: ===================================== gajim/gtk/preview_audio_visualizer.py ===================================== @@ -14,8 +14,6 @@ from __future__ import annotations -from typing import Optional - import logging import math from statistics import mean @@ -57,8 +55,13 @@ def __init__(self, self._style_context.add_class('audiovisualizer') self.set_size_request(self._width, self._height) - self._surface: Optional[cairo.ImageSurface] = None - self._setup_surface() + self._surface = cairo.ImageSurface( + cairo.FORMAT_ARGB32, + self._width, + self._height) + self._ctx: cairo.Context[cairo.ImageSurface] = cairo.Context( + self._surface) + self._cairo_path = self._ctx.copy_path() def update_params(self, samples: AudioSampleT, @@ -69,6 +72,7 @@ def update_params(self, self._position = position self._process_samples() self._num_samples = len(self._samples) + self._render_waveform() def draw_graph(self, position: float, seek_position: float = -1.0) -> None: if self._num_samples == 0: @@ -76,7 +80,7 @@ def draw_graph(self, position: float, seek_position: float = -1.0) -> None: self._position = position self._seek_position = seek_position - + self.queue_draw() def _on_drawingarea_draw(self, @@ -93,7 +97,7 @@ def _on_drawingarea_changed(self, ) -> None: self._is_LTR = bool(self.get_direction() == Gtk.TextDirection.LTR) - self._setup_surface() + self._render_waveform() self.queue_draw() def _on_style_updated(self, @@ -101,21 +105,6 @@ def _on_style_updated(self, ) -> None: self.queue_draw() - def _setup_surface(self) -> None: - if self._surface: - self._surface.finish() - - self._surface = cairo.ImageSurface( - cairo.FORMAT_ARGB32, - self._width, - self._height) - ctx: cairo.Context[cairo.ImageSurface] = cairo.Context(self._surface) - self._cairo_path = ctx.copy_path() - - if self._num_samples != 0: - self._draw_rms_amplitudes(ctx) - self._draw_surface(ctx) - def _process_samples(self) -> None: # Create a subset by taking the average of three samples # around every nth sample @@ -151,7 +140,20 @@ def _process_samples(self) -> None: def _pixel_pos(self, pos: float) -> float: return pos * self._width + self._x_offset + def _render_waveform(self) -> None: + if self._num_samples != 0: + self._draw_rms_amplitudes(self._ctx) + self._draw_surface(self._ctx) + def _draw_surface(self, ctx: cairo.Context[cairo.ImageSurface]) -> None: + if not self._is_LTR: + # rotate 180° around the center + ctx.translate( + (self._width + self._x_offset * 2) / 2, self._height / 2) + ctx.rotate(math.pi) + ctx.translate( + -(self._width + self._x_offset * 2) / 2, -self._height / 2) + ctx.append_path(self._cairo_path) ctx.clip() @@ -184,27 +186,20 @@ def _draw_surface(self, ctx: cairo.Context[cairo.ImageSurface]) -> None: def _draw_rms_amplitudes(self, ctx: cairo.Context[cairo.ImageSurface] ) -> None: + ctx.new_path() + peak_width = self._peak_width radius = 1 # radius of the arcs on top and bottom of the amplitudes gap = 0.25 # between upper and lower peak in pixels scaling = self._height / 2 - radius - gap / 2 # peak scaling factor - ctx.set_line_width(1.0) - if self._is_LTR: - # determines the spacing between the amplitudes - x_shift = (self._width - 2 * peak_width) / self._num_samples - x = self._x_offset + x_shift - else: - x_shift = -(self._width - 2 * peak_width) / self._num_samples - x = -x_shift * (self._num_samples) + self._x_offset + # determines the spacing between the amplitudes + x_shift = (self._width - 2 * peak_width) / self._num_samples + x = self._x_offset + x_shift for i in range(0, self._num_samples): - if self._is_LTR: - sample1 = self._samples[i][0] - sample2 = self._samples[i][1] - else: - sample1 = self._samples[i][1] - sample2 = self._samples[i][0] + sample1 = self._samples[i][0] + sample2 = self._samples[i][1] self._draw_rounded_rec( ctx, @@ -242,10 +237,6 @@ def _draw_rounded_rec(self, # Draws a rectangle of width w and total height of h1+h2 # The top and bottom edges are curved to the outside m = width / 2 - if not self._is_LTR: - m = -m - width = -width - # A --- B --- C # | | # F --- E --- D View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8f901abc0ec45c21c71c13a1c04c8f52… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8f901abc0ec45c21c71c13a1c04c8f52… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Preview: Handle exceptions while decrypting
by Philipp Hörist (＠lovetox) 12 Jan '23

12 Jan '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: a2476a3c by Philipp Hörist at 2023-01-12T18:14:07+01:00 fix: Preview: Handle exceptions while decrypting - - - - - 1 changed file: - gajim/common/preview.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -535,7 +535,13 @@ def _on_finished(self, request: HTTPRequest) -> None: if preview.is_aes_encrypted: if preview.key is not None and preview.iv is not None: - data = aes_decrypt(preview.key, preview.iv, data) + try: + data = aes_decrypt(preview.key, preview.iv, data) + except Exception as error: + log.exception('Decryption failed') + preview.info_message = _('Decryption failed') + preview.update_widget() + return if preview.mime_type == 'application/octet-stream': if preview.orig_path is not None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a2476a3c82ced7ac7e8f96bf637a3d25… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a2476a3c82ced7ac7e8f96bf637a3d25… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: AccountPage: Add menu item to deny all subscription requests
by Daniel Brötzmann (＠wurstsalat) 11 Jan '23

11 Jan '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 65f27b1b by wurstsalat at 2023-01-11T17:55:07+01:00 imprv: AccountPage: Add menu item to deny all subscription requests Fixes #11367 - - - - - 5 changed files: - gajim/data/gui/account_page.ui - gajim/gtk/account_page.py - gajim/gtk/builder.pyi - gajim/gtk/menus.py - gajim/gtk/notification_manager.py Changes: ===================================== gajim/data/gui/account_page.ui ===================================== @@ -262,14 +262,50 @@ </packing> </child> <child> - <object class="GtkLabel"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="margin-top">6</property> - <property name="label" translatable="yes">Notifications</property> - <style> - <class name="bold16"/> - </style> + <property name="spacing">18</property> + <child type="center"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-top">6</property> + <property name="label" translatable="yes">Notifications</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="notifications_menu_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">view-more-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/gtk/account_page.py ===================================== @@ -29,6 +29,7 @@ from gajim.gtk.builder import get_builder from gajim.gtk.menus import get_account_menu +from gajim.gtk.menus import get_account_notifications_menu from gajim.gtk.menus import get_roster_view_menu from gajim.gtk.notification_manager import NotificationManager from gajim.gtk.roster import Roster @@ -63,6 +64,9 @@ def __init__(self, account: str) -> None: self._notification_manager = NotificationManager(account) self._ui.account_box.add(self._notification_manager) + self._ui.notifications_menu_button.set_menu_model( + get_account_notifications_menu(account)) + self._roster = Roster(account) self._ui.roster_box.add(self._roster) ===================================== gajim/gtk/builder.pyi ===================================== @@ -20,6 +20,7 @@ class AccountPageBuilder(Builder): account_label: Gtk.Label account_page_menu_button: Gtk.MenuButton status_box: Gtk.Box + notifications_menu_button: Gtk.MenuButton class AccountWizardBuilder(Builder): ===================================== gajim/gtk/menus.py ===================================== @@ -444,6 +444,15 @@ def get_roster_view_menu() -> GajimMenu: return GajimMenu.from_list(menuitems) +def get_account_notifications_menu(account: str) -> GajimMenu: + menuitems: MenuItemListT = [ + (_('Deny all subscription requests'), + f'win.subscription-deny-all-{account}', + None), + ] + return GajimMenu.from_list(menuitems) + + def get_subscription_menu(account: str, jid: JID) -> GajimMenu: params = AddChatActionParams(account=account, jid=jid, ===================================== gajim/gtk/notification_manager.py ===================================== @@ -15,6 +15,7 @@ from __future__ import annotations from typing import Any +from typing import Callable from typing import cast from typing import Optional from typing import Union @@ -38,6 +39,11 @@ from gajim.gtk.menus import get_subscription_menu from gajim.gtk.util import open_window +NotificationActionListT = list[ + tuple[str, + Callable[[Gio.SimpleAction, GLib.Variant], Any], + Optional[str]]] + class NotificationManager(Gtk.ListBox): def __init__(self, account: str) -> None: @@ -64,16 +70,19 @@ def _on_destroy(self, *args: Any) -> None: self._remove_actions() def _add_actions(self) -> None: - actions = [ + actions: NotificationActionListT = [ ('subscription-accept', self._on_subscription_accept, 'as'), ('subscription-deny', self._on_subscription_deny, 's'), + ('subscription-deny-all', self._on_subscription_deny_all, None), ('subscription-block', self._on_subscription_block, 's'), ('subscription-report', self._on_subscription_report, 's'), ] for action in actions: action_name, func, typ = action + if typ is not None: + typ = GLib.VariantType.new(typ) act = Gio.SimpleAction.new( - f'{action_name}-{self._account}', GLib.VariantType.new(typ)) + f'{action_name}-{self._account}', typ) act.connect('activate', func) app.window.add_action(act) @@ -91,6 +100,11 @@ def update_actions(self) -> None: assert sub_deny is not None sub_deny.set_enabled(online) + sub_deny_all = app.window.lookup_action( + f'subscription-deny-all-{self._account}') + assert sub_deny_all is not None + sub_deny_all.set_enabled(online) + sub_block = app.window.lookup_action( f'subscription-block-{self._account}') assert sub_block is not None @@ -105,6 +119,7 @@ def _remove_actions(self) -> None: actions = [ 'subscription-accept', 'subscription-deny', + 'subscription-deny-all', 'subscription-block', 'subscription-report', ] @@ -165,6 +180,17 @@ def _on_subscription_deny(self, if row is not None: row.destroy() + def _on_subscription_deny_all(self, + _action: Gio.SimpleAction, + _param: GLib.Variant + ) -> None: + + for row in cast(list[NotificationRow], self.get_children()): + if row.type != 'subscribe': + continue + self._deny_request(row.jid) + row.destroy() + def _deny_request(self, jid: str) -> None: self._client.get_module('Presence').unsubscribed(jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/65f27b1baa32142c402c4dc95ee0d5d1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/65f27b1baa32142c402c4dc95ee0d5d1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] fix: HTTP: Parse uri with correct flags
by Philipp Hörist (＠lovetox) 10 Jan '23

10 Jan '23

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 7ae72c8d by Philipp Hörist at 2023-01-10T18:45:27+01:00 fix: HTTP: Parse uri with correct flags - - - - - 1 changed file: - nbxmpp/http.py Changes: ===================================== nbxmpp/http.py ===================================== @@ -252,7 +252,7 @@ class HTTPRequest(GObject.GObject): Gio.FileCreateFlags.REPLACE_DESTINATION, self._cancellable) - uri = GLib.Uri.parse(uri_string, GLib.UriFlags.HAS_PASSWORD) + uri = GLib.Uri.parse(uri_string, GLib.UriFlags(Soup.HTTP_URI_FLAGS)) self._message.set_uri(uri) if self._request_body_data is not None: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/7ae72c8deb14f03de6d05076… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/7ae72c8deb14f03de6d05076… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][pyproject] change: Port package to pyproject.toml
by Philipp Hörist (＠lovetox) 09 Jan '23

09 Jan '23

Philipp Hörist pushed to branch pyproject at gajim / python-nbxmpp Commits: 1b054cc5 by Philipp Hörist at 2023-01-10T00:50:09+01:00 change: Port package to pyproject.toml - - - - - 6 changed files: - .gitlab-ci.yml - debian/control - pyproject.toml - scripts/bump_version.py - − setup.cfg - − setup.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -24,7 +24,8 @@ build-linux: stage: build dependencies: [] script: - - python3 setup.py sdist bdist_wheel + - pip install build + - python3 -m build - python3 .ci/debian_build.py "$(find dist/nbxmpp-*.tar.gz)" 1 --pkgprefix=python3- artifacts: ===================================== debian/control ===================================== @@ -1,18 +1,17 @@ Source: python3-nbxmpp-nightly -Section: net +Section: python Priority: optional Maintainer: Gajim Maintainers <ci(a)gajim.org> Build-Depends: debhelper-compat (= 13), dh-python, - libglib2.0-0 (>= 2.60), gir1.2-soup-3.0, python3-all, python3-gi, python3-idna, python3-packaging, python3-precis-i18n, - python3-setuptools, + python3-setuptools (>= 65.0.0), Standards-Version: 4.1.4 Rules-Requires-Root: no Homepage: https://dev.gajim.org/gajim/python-nbxmpp @@ -23,14 +22,10 @@ Package: python3-nbxmpp-nightly Architecture: all Depends: ${misc:Depends}, ${python3:Depends}, - libglib2.0-0 (>= 2.60), gir1.2-soup-3.0, python3-gi, - python3-idna, - python3-packaging, - python3-precis-i18n, Recommends: python3-gssapi, -Breaks: gajim (<< 1.4~) +Breaks: gajim (<< 1.6~) Description: Non blocking XMPP Python library python-nbxmpp is a Python library that provides a way for Python applications - to use the XMPP network. This library was initially a fork of xmpppy. \ No newline at end of file + to use the XMPP network. This library was initially a fork of xmpppy. ===================================== pyproject.toml ===================================== @@ -1,9 +1,44 @@ [build-system] -requires = [ - "setuptools >= 43.0.0", -] +requires = ["setuptools >= 65.0.0"] build-backend = "setuptools.build_meta" +[project] +name = "nbxmpp" +description = "XMPP Library" +keywords = ["chat", "messaging", "im", "xmpp"] +readme = "README.md" +requires-python = ">=3.10" +license = {text = "GPL-3.0-or-later"} +authors = [ + {name = "Philipp Hörist", email = "philipp(a)hoerist.com"}, + {name = "Yann Leboulanger", email = "yann(a)leboulanger.org"}, +] +classifiers = [ + "Programming Language :: Python :: 3.10", +] +dependencies = [ + "precis-i18n>=1.0.0", + "packaging", + "idna", + "PyGObject", +] + +dynamic = ["version"] + +[project.optional-dependencies] +gssapi = ["gssapi"] + +[project.urls] +repository = "https://dev.gajim.org/gajim/python-nbxmpp" + +[tool.setuptools.packages.find] +include = ["nbxmpp*"] + +[tool.setuptools.package-data] +"nbxmpp" = ["py.typed"] + +[tool.setuptools.dynamic] +version = {attr = "nbxmpp.__version__"} [tool.pyright] pythonVersion = "3.10" ===================================== scripts/bump_version.py ===================================== @@ -9,7 +9,6 @@ REPO_DIR = Path(__file__).resolve().parent.parent INIT = REPO_DIR / 'nbxmpp' / '__init__.py' -CFG = REPO_DIR / 'setup.cfg' CHANGELOG = REPO_DIR / 'ChangeLog' VERSION_RX = r'\d+\.\d+\.\d+' @@ -28,10 +27,6 @@ def bump_version(current_version: str, new_version: str) -> None: content = content.replace(current_version, new_version, 1) INIT.write_text(content, encoding='utf8') - content = CFG.read_text(encoding='utf8') - content = content.replace(current_version, new_version, 1) - CFG.write_text(content, encoding='utf8') - def make_changelog(new_version: str) -> None: ===================================== setup.cfg deleted ===================================== @@ -1,32 +0,0 @@ -[metadata] -name = nbxmpp -version = 4.0.0 -description = XMPP Library -author = Yann Leboulanger, Philipp Hoerist -author_email = gajim-devel(a)gajim.org -long_description = file: README.md -long_description_content_type = text/markdown -keywords = xmpp chat -url = https://dev.gajim.org/gajim/python-nbxmpp -license_file = COPYING -license = GPL v3 -classifiers = - Programming Language :: Python :: 3.10 - -[options] -python_requires = >=3.10 -packages = find: -install_requires = - precis-i18n>=1.0.0 - packaging - idna - -[options.extras_require] -gssapi = gssapi - -[options.packages.find] -exclude = - test* - -[options.package_data] -nbxmpp = py.typed ===================================== setup.py deleted ===================================== @@ -1,5 +0,0 @@ -#!/usr/bin/env python3 - -from setuptools import setup - -setup() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/1b054cc5a9b4753bb43cc459… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/1b054cc5a9b4753bb43cc459… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new branch pyproject
by Philipp Hörist (＠lovetox) 09 Jan '23

09 Jan '23

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

1 0

← Newer
1
...
6
7
8
9
10
11
12
13
14
Older →

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 January 2023