Commits April 2022

commits@gajim.org

1 participants
43 discussions

[Git][gajim/gajim][master] 2 commits: feat: Improve finding proxy logic
by Philipp Hörist (＠lovetox) 29 Apr '22

29 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: b3ac4828 by lovetox at 2022-04-29T22:13:40+02:00 feat: Improve finding proxy logic - - - - - c00a248d by lovetox at 2022-04-29T22:13:53+02:00 refactor: Application: Use helper method for version check - - - - - 3 changed files: - gajim/common/application.py - gajim/common/helpers.py - gajim/gtk/exception.py Changes: ===================================== gajim/common/application.py ===================================== @@ -36,6 +36,7 @@ from gajim.common.events import AllowGajimUpdateCheck from gajim.common.events import GajimUpdateAvailable from gajim.common.client import Client +from gajim.common.helpers import make_http_request from gajim.common.task_manager import TaskManager from gajim.common.settings import Settings from gajim.common.settings import LegacyConfig @@ -169,11 +170,8 @@ def _check_for_updates(self) -> None: def check_for_gajim_updates(self) -> None: self._log.info('Checking for Gajim updates') - session = Soup.Session() - session.props.user_agent = f'Gajim {app.version}' - message = Soup.Message.new( - 'GET', 'https://gajim.org/current-version.json') - session.queue_message(message, self._on_update_response) + make_http_request('https://gajim.org/current-version.json', + self._on_update_response) def _on_update_response(self, _session: Soup.Session, ===================================== gajim/common/helpers.py ===================================== @@ -759,16 +759,24 @@ def get_proxy(proxy_name: str) -> Optional[ProxyData]: password=password) -def is_proxy_in_use() -> bool: - return get_global_proxy() is not None or is_account_proxy_in_use() +def determine_proxy() -> Optional[ProxyData]: + # Use this method to find a proxy for non-account related http requests + # When there is no global proxy and at least one active account does + # not use a proxy, we assume no proxy is necessary. + global_proxy = get_global_proxy() + if global_proxy is not None: + return global_proxy -def is_account_proxy_in_use() -> bool: + proxies: list[ProxyData] = [] for client in app.get_clients(): account_proxy = get_account_proxy(client.account, fallback=False) - if account_proxy is not None: - return True - return False + if account_proxy is None: + return None + + proxies.append(account_proxy) + + return proxies[0] def version_condition(current_version: str, required_version: str) -> bool: @@ -1508,11 +1516,8 @@ def make_path_from_jid(base_path: Path, jid: JID) -> Path: def make_http_request(uri: str, callback: Any) -> None: - proxy = get_global_proxy() + proxy = determine_proxy() if proxy is None: - if is_account_proxy_in_use(): - raise ValueError('No global proxy found, ' - 'but account proxies are in use') resolver = None else: ===================================== gajim/gtk/exception.py ===================================== @@ -44,7 +44,7 @@ from gajim.common.helpers import get_gobject_version from gajim.common.helpers import get_os_name from gajim.common.helpers import get_os_version -from gajim.common.helpers import is_proxy_in_use +from gajim.common.helpers import determine_proxy from gajim.common.helpers import make_http_request from gajim.common.i18n import _ @@ -132,7 +132,7 @@ def __init__(self, self._ui.user_feedback_entry.grab_focus() def _on_report_clicked(self, _button: Gtk.Button) -> None: - if self._sentry_available and not is_proxy_in_use(): + if self._sentry_available and determine_proxy() is not None: # sentry-sdk supports a http-proxy arg but for now only use # sentry when no proxy is set, because we never tested if this # works. It's not worth it to potentially leak users identity just View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f6bcc2ed9ea956ef16798a475f570ec… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f6bcc2ed9ea956ef16798a475f570ec… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Add more clean up rules for Windows build
by Daniel Brötzmann (＠wurstsalat) 27 Apr '22

27 Apr '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f6bcc2ed by Daniel Brötzmann at 2022-04-27T09:05:11+00:00 chore: Add more clean up rules for Windows build - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -198,9 +198,9 @@ function cleanup_install { -iregex ".*/(${KEEP})\.exe" -exec rm -f {} \; -print rm -Rf "${MINGW_ROOT}"/libexec - rm -Rf "${MINGW_ROOT}"/share/gtk-doc rm -Rf "${MINGW_ROOT}"/include rm -Rf "${MINGW_ROOT}"/var + rm -Rf "${MINGW_ROOT}"/share/gtk-doc rm -Rf "${MINGW_ROOT}"/share/zsh rm -Rf "${MINGW_ROOT}"/share/pixmaps rm -Rf "${MINGW_ROOT}"/share/gnome-shell @@ -230,6 +230,7 @@ function cleanup_install { rm -Rf "${MINGW_ROOT}"/share/gettext-* rm -Rf "${MINGW_ROOT}"/share/terminfo rm -Rf "${MINGW_ROOT}"/share/OGRE + rm -Rf "${MINGW_ROOT}"/share/opencv4 find "${MINGW_ROOT}"/share/glib-2.0 -type f ! \ -name "*.compiled" -exec rm -f {} \; @@ -247,6 +248,7 @@ function cleanup_install { rm -Rf "${MINGW_ROOT}"/lib/installed-tests rm -Rf "${MINGW_ROOT}"/lib/tabset rm -Rf "${MINGW_ROOT}"/lib/libthai + rm -Rf "${MINGW_ROOT}"/lib/OGRE rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstvpx.dll rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstdaala.dll @@ -258,10 +260,17 @@ function cleanup_install { rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstmxf.dll rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstfaac.dll rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstschro.dll + rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstcacasink.dll rm -f "${MINGW_ROOT}"/bin/libharfbuzz-icu-0.dll + rm -f "${MINGW_ROOT}"/bin/libopencv_wechat_qrcode455.dll + rm -f "${MINGW_ROOT}"/bin/OgreMain.dll + rm -f "${MINGW_ROOT}"/bin/OgreOverlay.dll + rm -f "${MINGW_ROOT}"/bin/OgreRTShaderSystem.dll + rm -f "${MINGW_ROOT}"/bin/OgreBites.dll + rm -f "${MINGW_ROOT}"/bin/xvidcore.dll + rm -f "${MINGW_ROOT}"/lib/"${PYTHON_ID}".*/lib-dynload/_tkinter* - rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstcacasink.dll rm -Rf "${MINGW_ROOT}"/lib/python2.* View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f6bcc2ed9ea956ef16798a475f570ec4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f6bcc2ed9ea956ef16798a475f570ec4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: MAM: Use full jid for MUC PMs
by Philipp Hörist (＠lovetox) 26 Apr '22

26 Apr '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4b5cb86b by lovetox at 2022-04-26T22:13:49+02:00 fix: MAM: Use full jid for MUC PMs - - - - - 1 changed file: - gajim/common/modules/mam.py Changes: ===================================== gajim/common/modules/mam.py ===================================== @@ -246,10 +246,9 @@ def _mam_message_received(self, _con, stanza, properties): self._log.debug(stanza.getProperties()) return - with_ = properties.jid.bare + jid = properties.jid.new_as_bare() if properties.is_muc_pm: - # we store the message with the full JID - with_ = str(with_) + jid = properties.jid if properties.is_self_message: # Self messages can only be deduped with origin-id @@ -260,7 +259,7 @@ def _mam_message_received(self, _con, stanza, properties): event_attr = { 'account': self._account, - 'jid': properties.jid.new_as_bare(), + 'jid': jid, 'msgtxt': properties.body, 'properties': properties, 'additional_data': additional_data, @@ -273,13 +272,13 @@ def _mam_message_received(self, _con, stanza, properties): correct_id = parse_correction(properties) if correct_id is not None: app.ged.raise_event(MessageUpdated(account=self._account, - jid=event_attr['jid'], + jid=jid, msgtxt=properties.body, properties=properties, correct_id=correct_id)) app.storage.archive.store_message_correction( self._account, - properties.jid.bare, + jid, correct_id, properties.body, properties.type.is_groupchat) @@ -287,7 +286,7 @@ def _mam_message_received(self, _con, stanza, properties): app.storage.archive.insert_into_logs( self._account, - with_, + jid, properties.mam.timestamp, kind, message=msgtxt, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4b5cb86bf21e19e630ff0b0ebb6beac9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4b5cb86bf21e19e630ff0b0ebb6beac9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: Preferences: Show AV settings on Windows, add specific revealer text
by Daniel Brötzmann (＠wurstsalat) 26 Apr '22

26 Apr '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 5ecf5a35 by wurstsalat at 2022-04-26T18:59:37+02:00 fix: Preferences: Show AV settings on Windows, add specific revealer text - - - - - feff2cfd by wurstsalat at 2022-04-26T19:00:06+02:00 fix: Disable starting AV calls on Windows Establishing calls on Windows is not possible at the moment due to issues with libnice - - - - - 4 changed files: - gajim/data/gui/preferences.ui - gajim/gtk/builder.pyi - gajim/gtk/controls/chat.py - gajim/gtk/preferences.py Changes: ===================================== gajim/data/gui/preferences.ui ===================================== @@ -719,7 +719,7 @@ <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkInfoBar" id="audio_video_info_bar"> + <object class="GtkInfoBar" id="av_info_bar"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="message-type">warning</property> @@ -764,7 +764,7 @@ <placeholder/> </child> <child> - <object class="GtkLabel"> + <object class="GtkLabel" id="av_info_bar_label"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">Missing dependencies for Audio/Video</property> ===================================== gajim/gtk/builder.pyi ===================================== @@ -697,8 +697,9 @@ class PreferencesBuilder(Builder): automatic_status: Gtk.Grid themes: Gtk.Grid emoji: Gtk.Grid - audio_video_info_bar: Gtk.InfoBar + av_info_bar: Gtk.InfoBar button1: Gtk.Button + av_info_bar_label: Gtk.Label server: Gtk.Grid audio: Gtk.Grid video: Gtk.Grid ===================================== gajim/gtk/controls/chat.py ===================================== @@ -31,6 +31,7 @@ import time import logging +import sys from gi.repository import Gtk from gi.repository import Gio @@ -212,7 +213,8 @@ def update_actions(self) -> None: audio_available = self._call_widget.get_jingle_available('audio') video_available = self._call_widget.get_jingle_available('video') self._get_action('start-call-').set_enabled( - online and (audio_available or video_available)) + online and (audio_available or video_available) + and sys.platform != 'win32') # Send message has_text = self.msg_textview.has_text() ===================================== gajim/gtk/preferences.py ===================================== @@ -104,7 +104,11 @@ def __init__(self) -> None: self._add_prefs(prefs) self._add_video_preview() - self._ui.audio_video_info_bar.set_revealed(not app.is_installed('AV')) + self._ui.av_info_bar.set_revealed( + not app.is_installed('AV') or sys.platform == 'win32') + if sys.platform == 'win32': + self._ui.av_info_bar_label.set_text( + _('Video calls are not available on Windows')) self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._on_destroy) @@ -120,16 +124,11 @@ def get_ui(self): def _add_prefs(self, prefs: list[tuple[str, Type[PreferenceBox]]]): for ui_name, klass in prefs: pref_box = getattr(self._ui, ui_name) - if ui_name == 'video' and sys.platform == 'win32': - continue - pref = klass(self) pref_box.add(pref) self._prefs[ui_name] = pref def _add_video_preview(self) -> None: - if sys.platform == 'win32': - return self._video_preview = VideoPreview() self._ui.video.add(self._video_preview.widget) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2322857bf374920f16639d4735787d3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2322857bf374920f16639d4735787d3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Improve mime type guessing and fix audio preview on Windows
by Daniel Brötzmann (＠wurstsalat) 26 Apr '22

26 Apr '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 2322857b by wurstsalat at 2022-04-26T17:54:45+02:00 fix: Improve mime type guessing and fix audio preview on Windows - - - - - 2 changed files: - gajim/common/preview_helpers.py - gajim/gtk/preview_audio.py Changes: ===================================== gajim/common/preview_helpers.py ===================================== @@ -375,7 +375,7 @@ def contains_audio_streams(file_path: Path) -> bool: has_audio = False discoverer = GstPbutils.Discoverer() try: - info = discoverer.discover_uri(f'file://{file_path}') + info = discoverer.discover_uri(file_path.as_uri()) has_audio = bool(info.get_audio_streams()) except GLib.Error as err: log.error('Error while reading %s: %s', str(file_path), err) @@ -404,7 +404,7 @@ def guess_mime_type(file_path: Union[Path, str], data: Optional[bytes] = None ) -> str: file_path = str(file_path) - mime_type, _ = mimetypes.MimeTypes().guess_type(file_path) + mime_type, _ = mimetypes.guess_type(file_path) if mime_type is None: # Try to guess MIME type by file name mime_type, _ = Gio.content_type_guess(file_path, data) ===================================== gajim/gtk/preview_audio.py ===================================== @@ -80,7 +80,7 @@ def _build_audio_widget(self) -> None: def _setup_audio_player(self, file_path: Path) -> None: assert self._playbin is not None - self._playbin.set_property('uri', f'file://{file_path}') + self._playbin.set_property('uri', file_path.as_uri()) state_return = self._playbin.set_state(Gst.State.PAUSED) if state_return == Gst.StateChangeReturn.FAILURE: log.debug('Could not setup GST playbin') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2322857bf374920f16639d4735787d3d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2322857bf374920f16639d4735787d3d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Improve Security Label selector and display
by Daniel Brötzmann (＠wurstsalat) 26 Apr '22

26 Apr '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 1d9119d4 by wurstsalat at 2022-04-26T14:08:23+02:00 fix: Improve Security Label selector and display - - - - - 2 changed files: - gajim/gtk/conversation/rows/message.py - gajim/gtk/security_label_selector.py Changes: ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -24,6 +24,7 @@ from gi.repository import GLib from gi.repository import Gtk from gi.repository import GObject +from gi.repository import Pango import cairo @@ -164,12 +165,15 @@ def __init__(self, account, 'enable_security_labels'): label_text = GLib.markup_escape_text(display_marking.name) if label_text: + display_marking_label = Gtk.Label() + display_marking_label.set_ellipsize(Pango.EllipsizeMode.END) + display_marking_label.set_max_width_chars(30) + display_marking_label.set_tooltip_text(label_text) bgcolor = display_marking.bgcolor fgcolor = display_marking.fgcolor label_text = ( f'<span size="small" bgcolor="{bgcolor}" ' - f'fgcolor="{fgcolor}"><tt>[{label_text}]</tt></span>') - display_marking_label = Gtk.Label() + f'fgcolor="{fgcolor}"><tt>{label_text}</tt></span>') display_marking_label.set_markup(label_text) self._meta_box.add(display_marking_label) ===================================== gajim/gtk/security_label_selector.py ===================================== @@ -47,6 +47,7 @@ def __init__(self, account: str, contact: ChatContactT) -> None: app.ged.register_event_handler( 'sec-catalog-received', ged.GUI1, self._sec_labels_received) + self.connect('changed', self._on_changed) self.connect('destroy', self._on_destroy) jid = self._contact.jid.bare if self._client.get_module('SecLabels').supported: @@ -57,6 +58,16 @@ def _on_destroy(self, _widget: SecurityLabelSelector) -> None: ged.GUI1, self._sec_labels_received) + def _on_changed(self, _combo: Gtk.ComboBox) -> None: + iter_ = self.get_active_iter() + if iter_ is None: + return + + model = self.get_model() + label_text = model.get_value(iter_, 0) + self.set_tooltip_text( + _('Selected security label: %s') % f'\n{label_text}') + def _sec_labels_received(self, event: SecCatalogReceived) -> None: if event.account != self._account: return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1d9119d45e5a8209bb2b0793eada22f5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1d9119d45e5a8209bb2b0793eada22f5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Improve security label selector
by Daniel Brötzmann (＠wurstsalat) 24 Apr '22

24 Apr '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ef90d5d8 by wurstsalat at 2022-04-24T21:13:12+02:00 refactor: Improve security label selector - - - - - 7 changed files: - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/gtk/builder.pyi - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - + gajim/gtk/security_label_selector.py Changes: ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -340,17 +340,6 @@ <child> <placeholder/> </child> - <child> - <object class="GtkComboBox" id="label_selector"> - <property name="visible">True</property> - <property name="can-focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> <child> <object class="GtkMenuButton" id="settings_menu"> <property name="visible">True</property> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -528,18 +528,6 @@ <property name="position">7</property> </packing> </child> - <child> - <object class="GtkComboBox" id="label_selector"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">8</property> - </packing> - </child> <child> <placeholder/> </child> ===================================== gajim/gtk/builder.pyi ===================================== @@ -214,7 +214,6 @@ class ChatControlBuilder(Builder): hbox: Gtk.Box emoticons_button: Gtk.MenuButton formattings_button: Gtk.MenuButton - label_selector: Gtk.ComboBox settings_menu: Gtk.MenuButton authentication_button: Gtk.Button lock_image: Gtk.Image @@ -424,7 +423,6 @@ class GroupchatControlBuilder(Builder): emoticons_button: Gtk.MenuButton send_message_button: Gtk.Button formattings_button: Gtk.MenuButton - label_selector: Gtk.ComboBox roster_revealer: Gtk.Revealer nickname_entry: Gtk.Entry nickname_change_button: Gtk.Button ===================================== gajim/gtk/controls/base.py ===================================== @@ -70,6 +70,7 @@ from gajim.gui.dialogs import ErrorDialog from gajim.gui.dialogs import PastePreviewDialog from gajim.gui.message_input import MessageInputTextView +from gajim.gui.security_label_selector import SecurityLabelSelector from gajim.gui.util import get_hardware_key_codes from gajim.gui.builder import get_builder from gajim.gui.util import set_urgency_hint @@ -206,6 +207,10 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: self._scrolled_view.connect('request-history', self.fetch_n_lines_history, 20) + self._security_label_selector = SecurityLabelSelector( + account, self.contact) + self.xml.hbox.pack_start(self._security_label_selector, False, True, 0) + self.msg_textview = MessageInputTextView() self.msg_textview.connect('paste-clipboard', self._on_message_textview_paste_event) @@ -279,7 +284,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), - ('sec-catalog-received', ged.GUI1, self._sec_labels_received), ('style-changed', ged.GUI1, self._style_changed), ]) @@ -474,48 +478,6 @@ def remove_session(self, session): def _nec_ping(self, obj): raise NotImplementedError - def setup_seclabel(self) -> None: - self.xml.label_selector.hide() - self.xml.label_selector.set_no_show_all(True) - lb = Gtk.ListStore(str) - self.xml.label_selector.set_model(lb) - cell = Gtk.CellRendererText() - cell.set_property('xpad', 5) # padding for status text - self.xml.label_selector.pack_start(cell, True) - # text to show is in in first column of liststore - self.xml.label_selector.add_attribute(cell, 'text', 0) - jid = self.contact.jid.bare - if self._client.get_module('SecLabels').supported: - self._client.get_module('SecLabels').request_catalog(jid) - - def _sec_labels_received(self, event: events.SecCatalogReceived) -> None: - if event.account != self.account: - return - - jid = self.contact.jid.bare - - if event.jid != jid: - return - - if not app.settings.get_account_setting( - event.account, 'enable_security_labels'): - return - - model = self.xml.label_selector.get_model() - model.clear() - - sel = 0 - labellist = event.catalog.get_label_names() - default = event.catalog.default - for index, label in enumerate(labellist): - model.append([label]) - if label == default: - sel = index - - self.xml.label_selector.set_active(sel) - self.xml.label_selector.set_no_show_all(False) - self.xml.label_selector.show_all() - def delegate_action(self, action: str) -> int: if action == 'clear-chat': self.reset_view() @@ -1060,16 +1022,7 @@ def drag_data_file_transfer(self, selection: Gtk.SelectionData) -> None: self._start_filetransfer(path) def get_seclabel(self) -> Optional[str]: - idx = self.xml.label_selector.get_active() - if idx == -1: - return None - - jid = self.contact.jid.bare - catalog = self._client.get_module('SecLabels').get_catalog(jid) - labels, label_list = catalog.labels, catalog.get_label_names() - lname = label_list[idx] - label = labels[lname] - return label + return self._security_label_selector.get_seclabel() def get_our_nick(self) -> str: return app.nicks[self.account] ===================================== gajim/gtk/controls/chat.py ===================================== @@ -135,7 +135,6 @@ def __init__(self, account: str, jid: JID) -> None: self.update_toolbar() self._update_avatar() - self.setup_seclabel() self.add_actions() self.update_ui() self.set_lock_image() ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -143,8 +143,6 @@ def __init__(self, account: str, jid: JID) -> None: self.__nick_completion: Optional[NickCompletionGenerator] = None self.last_key_tabs: bool = False - self.setup_seclabel() - # Send file self.xml.sendfile_button.set_action_name( f'win.send-file-{self.control_id}') ===================================== gajim/gtk/security_label_selector.py ===================================== @@ -0,0 +1,96 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# 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 cast +from typing import Optional + +from gi.repository import Gtk +from gi.repository import Pango + +from gajim.common import app +from gajim.common import ged +from gajim.common.events import SecCatalogReceived +from gajim.common.types import ChatContactT +from gajim.common.i18n import _ + + +class SecurityLabelSelector(Gtk.ComboBox): + def __init__(self, account: str, contact: ChatContactT) -> None: + Gtk.ComboBox.__init__(self, no_show_all=True) + self._account = account + self._client = app.get_client(account) + self._contact = contact + + self.set_valign(Gtk.Align.CENTER) + self.set_tooltip_text(_('Select a security label for your message…')) + + label_store = Gtk.ListStore(str) + self.set_model(label_store) + label_cell_renderer = Gtk.CellRendererText() + label_cell_renderer.set_property('ellipsize', Pango.EllipsizeMode.END) + label_cell_renderer.set_property('max-width-chars', 14) + self.pack_start(label_cell_renderer, True) + self.add_attribute(label_cell_renderer, 'text', 0) + + app.ged.register_event_handler( + 'sec-catalog-received', ged.GUI1, self._sec_labels_received) + + self.connect('destroy', self._on_destroy) + jid = self._contact.jid.bare + if self._client.get_module('SecLabels').supported: + self._client.get_module('SecLabels').request_catalog(jid) + + def _on_destroy(self, _widget: SecurityLabelSelector) -> None: + app.ged.remove_event_handler('sec-catalog-received', + ged.GUI1, + self._sec_labels_received) + + def _sec_labels_received(self, event: SecCatalogReceived) -> None: + if event.account != self._account: + return + + if event.jid != self._contact.jid.bare: + return + + if not app.settings.get_account_setting( + self._account, 'enable_security_labels'): + return + + model = cast(Gtk.ListStore, self.get_model()) + model.clear() + + selection = 0 + label_list = event.catalog.get_label_names() + default = event.catalog.default + for index, label in enumerate(label_list): + model.append([label]) + if label == default: + selection = index + + self.set_active(selection) + self.set_no_show_all(False) + self.show_all() + + def get_seclabel(self) -> Optional[str]: + index = self.get_active() + if index == -1: + return None + + jid = self._contact.jid.bare + catalog = self._client.get_module('SecLabels').get_catalog(jid) + labels, label_list = catalog.labels, catalog.get_label_names() + label_name = label_list[index] + label = labels[label_name] + return label View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ef90d5d8c331b3e1d4436913941e3c3d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ef90d5d8c331b3e1d4436913941e3c3d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Preview: Disable download and show URL if file size is unknown
by Daniel Brötzmann (＠wurstsalat) 24 Apr '22

24 Apr '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f97fb749 by wurstsalat at 2022-04-24T17:49:05+02:00 fix: Preview: Disable download and show URL if file size is unknown - - - - - 4 changed files: - gajim/common/preview.py - gajim/data/gui/preview.ui - gajim/gtk/builder.pyi - gajim/gtk/preview.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -416,10 +416,14 @@ def _on_content_sniffed(self, session.cancel_message(message, Soup.Status.CANCELLED) return - max_file_size = app.settings.get('preview_max_file_size') - if file_size == 0 or file_size > int(max_file_size): + if file_size == 0: + log.info('File size is unknown (zero) for URL: \'%s\'', uri) + session.cancel_message(message, Soup.Status.CANCELLED) + return + + if file_size > int(app.settings.get('preview_max_file_size')): log.info( - 'File size (%s) too big or unknown (zero) for URL: \'%s\'', + 'File size (%s) too big for URL: \'%s\'', file_size, uri) if not force: session.cancel_message(message, Soup.Status.CANCELLED) ===================================== gajim/data/gui/preview.ui ===================================== @@ -43,26 +43,52 @@ <property name="orientation">vertical</property> <property name="spacing">3</property> <child> - <object class="GtkEventBox" id="image_event_box"> + <object class="GtkBox" id="content_box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">center</property> - <signal name="realize" handler="_on_realize" swapped="no"/> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkButton" id="image_button"> + <object class="GtkEventBox"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="relief">none</property> - <signal name="button-press-event" handler="_on_button_press_event" swapped="no"/> - <signal name="clicked" handler="_on_content_button_clicked" swapped="no"/> + <property name="can-focus">False</property> + <property name="halign">center</property> + <signal name="realize" handler="_on_realize" swapped="no"/> <child> - <placeholder/> + <object class="GtkButton" id="image_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="relief">none</property> + <signal name="button-press-event" handler="_on_button_press_event" swapped="no"/> + <signal name="clicked" handler="_on_content_button_clicked" swapped="no"/> + <child> + <placeholder/> + </child> + <style> + <class name="preview-image-button"/> + </style> + </object> </child> - <style> - <class name="preview-image-button"/> - </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLinkButton" id="link_button"> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="relief">none</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> @@ -102,6 +128,10 @@ <property name="icon-name">process-stop-symbolic</property> </object> </child> + <style> + <class name="preview-button"/> + <class name="flat"/> + </style> </object> <packing> <property name="expand">False</property> ===================================== gajim/gtk/builder.pyi ===================================== @@ -716,8 +716,9 @@ class PreviewBuilder(Builder): icon_event_box: Gtk.EventBox icon_button: Gtk.Button right_box: Gtk.Box - image_event_box: Gtk.EventBox + content_box: Gtk.Box image_button: Gtk.Button + link_button: Gtk.LinkButton progress_box: Gtk.Box progressbar: Gtk.ProgressBar button_box: Gtk.Box ===================================== gajim/gtk/preview.py ===================================== @@ -12,6 +12,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 cast from typing import Any from typing import Optional @@ -24,6 +25,7 @@ from gi.repository import GdkPixbuf from gi.repository import GLib from gi.repository import Gtk +from gi.repository import Pango from gajim.common import app from gajim.common.helpers import open_file @@ -121,6 +123,13 @@ def update(self, preview: Preview, data: Optional[GdkPixbufType]) -> None: file_size_string = GLib.format_size_full( preview.file_size, self._units) + self._ui.link_button.set_uri(preview.uri) + self._ui.link_button.set_tooltip_text(preview.uri) + self._ui.link_button.set_label(preview.uri) + label = cast(Gtk.Label, self._ui.link_button.get_children()[0]) + label.set_ellipsize(Pango.EllipsizeMode.END) + label.set_max_width_chars(32) + if preview.orig_exists(): self._ui.download_button.hide() self._ui.open_folder_button.show() @@ -133,7 +142,11 @@ def update(self, preview: Preview, data: Optional[GdkPixbufType]) -> None: self._ui.right_box.pack_end(audio_widget, False, True, 0) self._ui.right_box.reorder_child(audio_widget, 1) else: - self._ui.download_button.show() + if preview.file_size == 0: + self._ui.download_button.hide() + self._ui.link_button.show() + else: + self._ui.download_button.show() self._ui.save_as_button.hide() self._ui.open_folder_button.hide() allow_in_public = app.settings.get('preview_anonymous_muc') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f97fb7491e7348148de15854c255080b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f97fb7491e7348148de15854c255080b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] other: Flatpak: Remove commit entry from stable yaml
by André (＠andre) 23 Apr '22

23 Apr '22

André pushed to branch master at gajim / gajim Commits: 63847076 by André Apitzsch at 2022-04-23T19:52:53+02:00 other: Flatpak: Remove commit entry from stable yaml This simplifies updating the flathub repo when a commit is tagged. - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -313,6 +313,5 @@ modules: - type: git url: https://dev.gajim.org/gajim/gajim.git tag: gajim-1.3.3 - commit: b5b2ad4aee92074184b181ec97fbf1f900d5f4fb post-install: - install -d /app/plugins View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6384707621ca603b9763ce635ffa2723… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6384707621ca603b9763ce635ffa2723… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] feat: Preview: Make download cancellable
by Daniel Brötzmann (＠wurstsalat) 23 Apr '22

23 Apr '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 57924ca8 by wurstsalat at 2022-04-23T18:16:27+02:00 feat: Preview: Make download cancellable - - - - - 4 changed files: - gajim/common/preview.py - gajim/data/gui/preview.ui - gajim/gtk/builder.pyi - gajim/gtk/preview.py Changes: ===================================== gajim/common/preview.py ===================================== @@ -80,6 +80,8 @@ def __init__(self, self.file_size: int = 0 self._received_size: int = 0 + self._soup_message: Optional[Soup.Message] = None + self.key: Optional[bytes] = None self.iv: Optional[bytes] = None if self.is_aes_encrypted and urlparts is not None: @@ -114,6 +116,10 @@ def context(self) -> Optional[str]: def filename(self) -> str: return self._filename + @property + def soup_message(self) -> Soup.Message: + return self._soup_message + @property def request_uri(self) -> Optional[str]: if self._urlparts is None: @@ -150,7 +156,8 @@ def create_thumbnail(self, data: bytes) -> bool: def update_widget(self, data: Optional[GdkPixbufType] = None) -> None: self._widget.update(self, data) - def update_progress(self, size: int) -> None: + def update_progress(self, size: int, message: Soup.Message) -> None: + self._soup_message = message self._received_size += size if self.file_size == 0 or self._received_size == 0: return @@ -420,11 +427,11 @@ def _on_content_sniffed(self, preview.update_widget() def _on_got_chunk(self, - _message: Soup.Message, + message: Soup.Message, chunk: Soup.Buffer, preview: Preview ) -> None: - preview.update_progress(len(chunk.get_data())) + preview.update_progress(len(chunk.get_data()), message) def _on_finished(self, _session: Soup.Session, @@ -507,3 +514,7 @@ def _on_thumb_write_finished(_result: bool, return preview.update_widget(data=pixbuf) + + def cancel_download(self, preview: Preview) -> None: + session = self._get_session(preview.account) + session.cancel_message(preview.soup_message, Soup.Status.CANCELLED) ===================================== gajim/data/gui/preview.ui ===================================== @@ -72,10 +72,43 @@ </packing> </child> <child> - <object class="GtkProgressBar" id="progressbar"> + <object class="GtkBox" id="progress_box"> <property name="can-focus">False</property> <property name="no-show-all">True</property> - <property name="show-text">True</property> + <property name="spacing">12</property> + <child> + <object class="GtkProgressBar" id="progressbar"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="show-text">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Cancel</property> + <signal name="clicked" handler="_on_cancel_download_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">process-stop-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/gtk/builder.pyi ===================================== @@ -718,6 +718,7 @@ class PreviewBuilder(Builder): right_box: Gtk.Box image_event_box: Gtk.EventBox image_button: Gtk.Button + progress_box: Gtk.Box progressbar: Gtk.ProgressBar button_box: Gtk.Box download_button: Gtk.Button ===================================== gajim/gtk/preview.py ===================================== @@ -67,12 +67,12 @@ def get_text(self) -> str: return self._preview.uri def update_progress(self, _preview: Preview, progress: float) -> None: - self._ui.progressbar.show() + self._ui.progress_box.show() self._ui.progressbar.set_fraction(progress) def update(self, preview: Preview, data: Optional[GdkPixbufType]) -> None: self._preview = preview - self._ui.progressbar.hide() + self._ui.progress_box.hide() if preview.is_geo_uri: data = load_icon_pixbuf('map', size=preview.size) @@ -274,6 +274,10 @@ def _on_button_press_event(self, menu = self._get_context_menu() menu.popup_at_pointer(event) + def _on_cancel_download_clicked(self, _button: Gtk.Button) -> None: + assert self._preview is not None + app.interface.preview_manager.cancel_download(self._preview) + @staticmethod def _on_realize(event_box: Gtk.EventBox) -> None: window = event_box.get_window() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/57924ca86061d60634bfa3ff0253b9d4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/57924ca86061d60634bfa3ff0253b9d4… 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 April 2022