Commits July 2021

commits@gajim.org

1 participants
34 discussions

[Git][gajim/gajim][master] AccountWizard: Don’t try to validate websocket uris
by Philipp Hörist (＠lovetox) 27 Jul '21

27 Jul '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 107bd123 by lovetox at 2021-07-27T20:51:28+02:00 AccountWizard: Don’t try to validate websocket uris - - - - - 1 changed file: - gajim/gtk/account_wizard.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -748,6 +748,11 @@ def _show_port_icon(self, show): def _validate_host(self): host = self._ui.custom_host_entry.get_text() + if host.startswith('ws://') or host.startswith('wss://'): + # We have no method for validating websocket URIs + self._show_host_icon(False) + return True + try: validate_domainpart(host) except Exception: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/107bd123c076fc8fea3faf8d76147fa0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/107bd123c076fc8fea3faf8d76147fa0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 4 commits: NotificationManager: Improvements
by Daniel Brötzmann (＠wurstsalat) 26 Jul '21

26 Jul '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: da303a80 by wurstsalat at 2021-07-26T20:32:40+02:00 NotificationManager: Improvements - - - - - 9bcc42ed by wurstsalat at 2021-07-26T21:17:22+02:00 Improve MUC highlight colors - - - - - 5fd4e96b by wurstsalat at 2021-07-26T21:17:47+02:00 SearchView: Disable text selection for result rows - - - - - 4a3dbf13 by wurstsalat at 2021-07-26T21:28:57+02:00 Temporarily disable update_text_tags - - - - - 9 changed files: - gajim/data/gui/account_page.ui - gajim/data/style/gajim-dark.css - gajim/data/style/gajim.css - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/plain_widget.py - gajim/gtk/conversation/rows/base.py - gajim/gtk/notification_manager.py - gajim/gtk/search_view.py - gajim/gui_interface.py Changes: ===================================== gajim/data/gui/account_page.ui ===================================== @@ -117,156 +117,168 @@ </packing> </child> <child> - <object class="GtkBox" id="account_box"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="orientation">vertical</property> - <property name="spacing">18</property> + <property name="can-focus">True</property> <child> - <object class="GtkBox"> + <object class="GtkViewport"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> <child> - <object class="GtkOverlay"> + <object class="GtkBox" id="account_box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">center</property> + <property name="hexpand">True</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> <child> - <object class="GtkImage" id="avatar_image"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="icon-name">missging-image</property> - <property name="icon_size">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkOverlay"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <child> + <object class="GtkImage" id="avatar_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">missging-image</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="index">-1</property> + </packing> + </child> + <child type="overlay"> + <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">Edit Profile…</property> + <property name="halign">end</property> + <property name="valign">start</property> + <signal name="clicked" handler="_on_edit_profile" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">document-edit-symbolic</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="account_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label"><name></property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> - <property name="index">-1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> - <child type="overlay"> - <object class="GtkButton"> + <child> + <object class="GtkBox" id="account_action_box"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Edit Profile…</property> - <property name="halign">end</property> - <property name="valign">start</property> - <signal name="clicked" handler="_on_edit_profile" swapped="no"/> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="spacing">12</property> <child> - <object class="GtkImage"> + <object class="GtkButton" id="account_settings"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">document-edit-symbolic</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Account Settings…</property> + <property name="halign">end</property> + <signal name="clicked" handler="_on_account_settings" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">preferences-other-symbolic</property> + </object> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> </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> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="account_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label"><name></property> - <style> - <class name="large-header"/> - </style> - </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> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="account_action_box"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">center</property> - <property name="spacing">12</property> - <child> - <object class="GtkButton" id="account_settings"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Account Settings…</property> - <property name="halign">end</property> - <signal name="clicked" handler="_on_account_settings" swapped="no"/> <child> - <object class="GtkImage"> + <object class="GtkBox" id="status_message_box"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="icon-name">preferences-other-symbolic</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> + <child> + <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">3</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <style> + <class name="account-page-box"/> + </style> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <placeholder/> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="status_message_box"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> </child> - <child> - <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">3</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <style> - <class name="account-page-box"/> - </style> </object> <packing> <property name="resize">True</property> ===================================== gajim/data/style/gajim-dark.css ===================================== @@ -20,11 +20,11 @@ infobar.error > revealer > box { /* ConversationView */ .conversation-mention-highlight { - background-color: rgb(251, 151, 97); -} -.conversation-mention-highlight:hover { - background-color: rgb(251, 151, 97); + background-color: rgb(100, 50, 10); } .conversation-mention-highlight grid textview text { - background-color: rgb(251, 151, 97); + background-color: rgb(100, 50, 10); +} +.conversation-mention-highlight:hover { + background-color: rgb(110, 50, 10); } ===================================== gajim/data/style/gajim.css ===================================== @@ -59,6 +59,13 @@ .conversation-row grid textview:not(.sourceview) text { .conversation-mention-highlight { background-color: rgb(255, 215, 194); } +.conversation-mention-highlight grid textview text { + background-color: rgb(255, 215, 194); +} +.conversation-mention-highlight:hover { + background-color: rgb(255, 205, 184); +} + @keyframes highlight { from { background: rgb(194, 215, 255) } to { background: transparent } @@ -291,6 +298,10 @@ .notification-listbox { .notification-listbox row { padding: 12px; border: 1px solid @borders; + border-bottom: 0px; +} +.notification-listbox row:nth-last-child(2) { + border-bottom: 1px solid @borders; } /*Middle Grid*/ ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -20,9 +20,10 @@ class MessageWidget(Gtk.Box): - def __init__(self, account): + def __init__(self, account, selectable=True): Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) self._account = account + self._selectable = selectable self._content = None @@ -37,7 +38,7 @@ def add_content(self, content): self._content = content for block in content.blocks: if block.name == 'plain': - widget = PlainWidget(self._account) + widget = PlainWidget(self._account, self._selectable) widget.add_content(block) self.add(widget) continue @@ -49,7 +50,7 @@ def add_content(self, content): continue if block.name == 'quote': - message_widget = MessageWidget(self._account) + message_widget = MessageWidget(self._account, self._selectable) message_widget.add_content(block) widget = QuoteWidget(self._account) widget.attach_message_widget(message_widget) ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -37,14 +37,14 @@ class PlainWidget(Gtk.Box): - def __init__(self, account): + def __init__(self, account, selectable): Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) self.set_vexpand(True) self._account = account # self._text_widget = MessageTextview(self._account) - self._text_widget = MessageLabel(self._account) + self._text_widget = MessageLabel(self._account, selectable) self.add(self._text_widget) def add_content(self, block): @@ -52,10 +52,10 @@ def add_content(self, block): class MessageLabel(Gtk.Label): - def __init__(self, account): + def __init__(self, account, selectable): Gtk.Label.__init__(self) self.set_hexpand(True) - self.set_selectable(True) + self.set_selectable(selectable) self.set_line_wrap(True) self.set_xalign(0) self.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -59,6 +59,8 @@ def is_merged(self): return self._merged def update_text_tags(self): + return + # TODO if self.textview is not None: self.textview.update_text_tags() ===================================== gajim/gtk/notification_manager.py ===================================== @@ -21,27 +21,29 @@ from gajim.common.const import AvatarSize from gajim.common.i18n import _ from gajim.common.helpers import get_groupchat_name +from gajim.common.helpers import get_muc_context from gajim.gui_menu_builder import get_subscription_menu from .util import open_window -class NotificationManager(Gtk.ScrolledWindow): +class NotificationManager(Gtk.ListBox): def __init__(self, account): - Gtk.ScrolledWindow.__init__(self) + Gtk.ListBox.__init__(self) self._account = account self._client = app.get_client(account) - self.set_vexpand(True) + self.set_selection_mode(Gtk.SelectionMode.NONE) + self.set_halign(Gtk.Align.CENTER) + self.get_style_context().add_class('notification-listbox') - self._listbox = Gtk.ListBox() - self._listbox.set_selection_mode(Gtk.SelectionMode.NONE) - self._listbox.set_halign(Gtk.Align.CENTER) - self._listbox.get_style_context().add_class('notification-listbox') - self._set_placeholder() + label = Gtk.Label(label=_('No Notifications')) + label.set_valign(Gtk.Align.START) + label.get_style_context().add_class('dim-label') + label.show() + self.set_placeholder(label) - self.add(self._listbox) self.show_all() self._add_actions() @@ -89,13 +91,6 @@ def _remove_actions(self): for action in actions: app.window.remove_action(f'{action}-{self._account}') - def _set_placeholder(self): - label = Gtk.Label(label=_('No Notifications')) - label.set_valign(Gtk.Align.START) - label.get_style_context().add_class('dim-label') - label.show() - self._listbox.set_placeholder(label) - def _on_subscription_accept(self, _action, param): jid = param.get_string() row = self._get_notification_row(jid) @@ -104,7 +99,7 @@ def _on_subscription_accept(self, _action, param): if not contact.is_in_roster: open_window('AddContact', account=self._account, jid=jid, nick=contact.name) - self._listbox.remove(row) + self.remove(row) def _on_subscription_block(self, _action, param): jid = param.get_string() @@ -112,7 +107,7 @@ def _on_subscription_block(self, _action, param): self._deny_request(jid) self._client.get_module('Blocking').block([jid]) row = self._get_notification_row(jid) - self._listbox.remove(row) + self.remove(row) def _on_subscription_report(self, _action, param): jid = param.get_string() @@ -120,19 +115,19 @@ def _on_subscription_report(self, _action, param): self._deny_request(jid) self._client.get_module('Blocking').block([jid], report='spam') row = self._get_notification_row(jid) - self._listbox.remove(row) + self.remove(row) def _on_subscription_deny(self, _action, param): jid = param.get_string() self._deny_request(jid) row = self._get_notification_row(jid) - self._listbox.remove(row) + self.remove(row) def _deny_request(self, jid): self._client.get_module('Presence').unsubscribed(jid) def _get_notification_row(self, jid): - for child in self._listbox.get_children(): + for child in self.get_children(): if child.jid == jid: return child return None @@ -140,27 +135,27 @@ def _get_notification_row(self, jid): def add_subscription_request(self, event): row = self._get_notification_row(event.jid) if row is None: - self._listbox.add(SubscriptionRequestRow( + self.add(SubscriptionRequestRow( self._account, event.jid, event.status, event.user_nick)) elif row.type == 'unsubscribed': - self._listbox.remove(row) + self.remove(row) def add_unsubscribed(self, event): row = self._get_notification_row(event.jid) if row is None: - self._listbox.add(UnsubscribedRow(self._account, event.jid)) + self.add(UnsubscribedRow(self._account, event.jid)) elif row.type == 'subscribe': - self._listbox.remove(row) + self.remove(row) def add_invitation_received(self, event): row = self._get_notification_row(event.muc) if row is None: - self._listbox.add(InvitationReceivedRow(self._account, event)) + self.add(InvitationReceivedRow(self._account, event)) def add_invitation_declined(self, event): row = self._get_notification_row(event.muc) if row is None: - self._listbox.add(InvitationDeclinedRow(self._account, event)) + self.add(InvitationDeclinedRow(self._account, event)) class NotificationRow(Gtk.ListBoxRow): @@ -177,6 +172,7 @@ def __init__(self, account, jid): def _generate_label(): label = Gtk.Label() label.set_halign(Gtk.Align.START) + label.set_hexpand(True) label.set_xalign(0) label.set_ellipsize(Pango.EllipsizeMode.END) label.set_max_width_chars(30) @@ -276,7 +272,7 @@ def __init__(self, account, jid): self.show_all() def _on_dismiss(self, _button): - self.get_parent().remove(self) + self.destroy() class InvitationReceivedRow(NotificationRow): @@ -286,7 +282,11 @@ def __init__(self, account, event): self._event = event - image = self._generate_avatar_image(event.from_.bare) + if get_muc_context(event.muc) == 'public': + jid = event.from_ + else: + jid = event.from_.bare + image = self._generate_avatar_image(jid) self.grid.attach(image, 1, 1, 1, 2) title_label = self._generate_label() @@ -294,8 +294,7 @@ def __init__(self, account, event): title_label.get_style_context().add_class('bold') self.grid.attach(title_label, 2, 1, 1, 1) - contact = self._client.get_module('Contacts').get_contact( - event.from_.bare) + contact = self._client.get_module('Contacts').get_contact(jid) invitation_text = _('%(contact)s invited you to %(chat)s') % { 'contact': contact.name, 'chat': event.info.muc_name} @@ -307,6 +306,7 @@ def __init__(self, account, event): show_button = Gtk.Button.new_with_label(label=_('Show')) show_button.set_valign(Gtk.Align.CENTER) + show_button.set_halign(Gtk.Align.END) show_button.set_tooltip_text('Show Invitation') show_button.connect('clicked', self._on_show_invitation) self.grid.attach(show_button, 3, 1, 1, 2) @@ -323,12 +323,12 @@ def _on_show_invitation(self, _button): open_window('GroupChatInvitation', account=self._account, event=self._event) - self.get_parent().remove(self) + self.destroy() def _on_decline_invitation(self, _button): self._client.get_module('MUC').decline( - self.jid, self._event.from_.bare) - self.get_parent().remove(self) + self.jid, self._event.from_) + self.destroy() class InvitationDeclinedRow(NotificationRow): @@ -336,7 +336,9 @@ def __init__(self, account, event): NotificationRow.__init__(self, account, event.muc) self.type = 'invitation-declined' - image = self._generate_avatar_image(event.from_.bare) + jid = event.from_.bare + + image = self._generate_avatar_image(jid) self.grid.attach(image, 1, 1, 1, 2) title_label = self._generate_label() @@ -344,9 +346,8 @@ def __init__(self, account, event): title_label.get_style_context().add_class('bold') self.grid.attach(title_label, 2, 1, 1, 1) - contact = self._client.get_module('Contacts').get_contact( - event.from_.bare) - muc_name = get_groupchat_name(self._client, event.from_.bare) + contact = self._client.get_module('Contacts').get_contact(jid) + muc_name = get_groupchat_name(self._client, event.muc) invitation_text = _('%(contact)s declined your invitation ' 'to %(chat)s') % { 'contact': contact.name, @@ -360,6 +361,7 @@ def __init__(self, account, event): dismiss_button = Gtk.Button.new_from_icon_name( 'window-close-symbolic', Gtk.IconSize.BUTTON) dismiss_button.set_valign(Gtk.Align.CENTER) + dismiss_button.set_halign(Gtk.Align.END) dismiss_button.set_tooltip_text(_('Remove Notification')) dismiss_button.connect('clicked', self._on_dismiss) self.grid.attach(dismiss_button, 3, 1, 1, 2) @@ -367,4 +369,4 @@ def __init__(self, account, event): self.show_all() def _on_dismiss(self, _button): - self.get_parent().remove(self) + self.destroy() ===================================== gajim/gtk/search_view.py ===================================== @@ -261,7 +261,7 @@ def __init__(self, msg, account, jid): date = time.strftime('%H:%M', local_time) self._ui.row_time_label.set_label(date) - message_widget = MessageWidget(account) + message_widget = MessageWidget(account, selectable=False) self._ui.result_row_grid.attach(message_widget, 1, 1, 2, 1) result = process(msg.message) message_widget.add_content(result) ===================================== gajim/gui_interface.py ===================================== @@ -68,6 +68,7 @@ from gajim.common import helpers from gajim.common import passwords from gajim.common.helpers import ask_for_status_message +from gajim.common.helpers import get_muc_context from gajim.common.helpers import get_group_chat_nick from gajim.common.structs import MUCData from gajim.common.structs import OutgoingMessage @@ -372,29 +373,26 @@ def handle_event_msgnotsent(obj): obj.session.roster_message(obj.jid, msg, obj.time_, obj.conn.name, msg_type='error') - def handle_event_gc_invitation(self, event): + @staticmethod + def handle_event_gc_invitation(event): event = events.GcInvitationtEvent(event) # TODO: show account page - # if (helpers.allow_popup_window(event.account) or - # not self.systray_enabled): - # open_window('GroupChatInvitation', - # account=event.account, - # event=event) - # return - - #self.add_event(event.account, str(event.from_), event) + # self.add_event(event.account, str(event.from_), event) if helpers.allow_showing_notification(event.account): client = app.get_client(event.account) - contact = client.get_module('Contacts').get_contact( - event.from_.bare) + if get_muc_context(event.muc) == 'public': + jid = event.from_ + else: + jid = event.from_.bare + contact = client.get_module('Contacts').get_contact(jid) event_type = _('Group Chat Invitation') text = _('%(contact)s invited you to %(chat)s') % { 'contact': contact.name, 'chat': event.info.muc_name} app.notification.popup(event_type, - str(event.from_), + str(jid), event.account, 'gc-invitation', 'gajim-gc_invitation', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6dfb44d3ae10d9f12c52b22a868556f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6dfb44d3ae10d9f12c52b22a868556f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] Flatpak: Update dependencies
by André (＠andre) 25 Jul '21

25 Jul '21

André pushed to branch gajim_1.3 at gajim / gajim Commits: 14985280 by André Apitzsch at 2021-07-25T22:21:39+02:00 Flatpak: Update dependencies - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -58,11 +58,11 @@ modules: - name: python3-packaging buildsystem: simple build-commands: - - pip3 install --prefix=/app packaging-20.9-py2.py3-none-any.whl + - pip3 install --prefix=/app packaging-21.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/3e/89/7ea760b4daa42653ece2380531c90… - sha256: 67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a + url: https://files.pythonhosted.org/packages/3c/77/e2362b676dc5008d81be423070dd9… + sha256: c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14 - name: python3-pycparser buildsystem: simple @@ -79,8 +79,8 @@ modules: - pip3 install --prefix=/app . sources: - type: archive - url: https://files.pythonhosted.org/packages/a8/20/025f59f929bbcaa579704f443a438… - sha256: fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c + url: https://files.pythonhosted.org/packages/2e/92/87bb61538d7e60da8a7ec247dc048… + sha256: c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd - name: python3-asn1crypto buildsystem: simple @@ -94,11 +94,11 @@ modules: - name: python3-idna buildsystem: simple build-commands: - - pip3 install --prefix=/app idna-3.1-py3-none-any.whl + - pip3 install --prefix=/app idna-3.2-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/29/88/c52aae187d3b128a0f13f36a6c987… - sha256: 5205d03e7bcbb919cc9c19885f9920d622ca52448306f2377daede5cf3faac16 + url: https://files.pythonhosted.org/packages/d7/77/ff688d1504cdc4db2a938e2b7b9ad… + sha256: 14475042e284991034cb48e06f6851428fb14c4dc953acd9be9a5e95c7b6dd7a - name: python3-cryptography buildsystem: simple @@ -130,11 +130,11 @@ modules: - name: python3-jeepney buildsystem: simple build-commands: - - pip3 install --prefix=/app jeepney-0.6.0-py3-none-any.whl + - pip3 install --prefix=/app jeepney-0.7.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/51/b0/a6ea72741aaac3f37fb96d195e4ee… - sha256: aec56c0eb1691a841795111e184e13cad504f7703b9a64f63020816afa79a8ae + url: https://files.pythonhosted.org/packages/7c/76/5bf3097c2494f8ef38e4149212b20… + sha256: 71335e7a4e93817982f473f3507bffc2eff7a544119ab9b73e089c8ba1409ba3 - name: python3-secretstorage buildsystem: simple @@ -148,23 +148,23 @@ modules: - name: python3-zipp buildsystem: simple build-commands: - - pip3 install --prefix=/app zipp-3.4.1-py3-none-any.whl + - pip3 install --prefix=/app zipp-3.5.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/0f/8c/715c54e9e34c0c4820f616a913a7d… - sha256: 51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098 + url: https://files.pythonhosted.org/packages/92/d9/89f433969fb8dc5b9cbdd4b4deb58… + sha256: 957cfda87797e389580cb8b9e3870841ca991e2125350677b2ca83a0e99390a3 # keyring dependency - name: python3-importlib-metadata buildsystem: simple build-commands: - - pip3 install --prefix=/app importlib_metadata-3.9.0-py3-none-any.whl + - pip3 install --prefix=/app importlib_metadata-4.6.1-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/d9/10/191b97506cd4cceb4b860fb5c75b2… - sha256: 6fd684b4c6c7bb36d57e93d57fc244b5ffc08faa1c298bcda3dfbbbf19d7550a + url: https://files.pythonhosted.org/packages/3f/e1/e5bba549a033adf77448699a34eca… + sha256: 9f55f560e116f8643ecf2922d9cd3e1c7e8d52e683178fecd9d08f6aa357e11e - name: python3-keyring buildsystem: simple @@ -232,11 +232,11 @@ modules: - name: python3-nbxmpp buildsystem: simple build-commands: - - pip3 install --prefix=/app nbxmpp-2.0.1-py3-none-any.whl + - pip3 install --prefix=/app nbxmpp-2.0.3-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/9c/4e/dcf37c33a67eb2df00a3676deedb7… - sha256: 84edf0e0fe9b751e8796af46b388881f243b80afbf0664f82464cccc0afc417c + url: https://files.pythonhosted.org/packages/fd/9d/eeb467154d42632fc6bf136c45c79… + sha256: 3ab458224e8531e374757b82302b6db746aa306a67090b754910c53abcbb417c - name: gajim buildsystem: simple View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1498528079b36a0820329c14e8420cc3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1498528079b36a0820329c14e8420cc3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] Raise nbxmpp version
by Philipp Hörist (＠lovetox) 24 Jul '21

24 Jul '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 7b031a9e by lovetox at 2021-07-24T22:15:09+02:00 Raise nbxmpp version - - - - - 3 changed files: - README.md - gajim/gajim.py - setup.cfg Changes: ===================================== README.md ===================================== @@ -7,7 +7,7 @@ ### Runtime Requirements - python3-gi - python3-gi-cairo - gir1.2-gtk-3.0 (>=3.22) -- python3-nbxmpp (>=2.0.1) +- python3-nbxmpp (>=2.0.3) - python3-openssl (>=16.2) - python3-css-parser - python3-keyring ===================================== gajim/gajim.py ===================================== @@ -28,7 +28,7 @@ from gajim.common import i18n -_MIN_NBXMPP_VER = '2.0.1' +_MIN_NBXMPP_VER = '2.0.3' _MIN_GTK_VER = '3.22.27' _MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.32.0' ===================================== setup.cfg ===================================== @@ -22,7 +22,7 @@ test_suite = test install_requires = css-parser keyring - nbxmpp>=2.0.1 + nbxmpp>=2.0.3 packaging setuptools; python_version < '3.9' precis-i18n>=1.0.0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7b031a9e43678d2b1cbb807ed41c6cd0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7b031a9e43678d2b1cbb807ed41c6cd0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp] Pushed new tag nbxmpp-2.0.3
by Philipp Hörist (＠lovetox) 24 Jul '21

24 Jul '21

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

1 0

[Git][gajim/python-nbxmpp][nbxmpp_2.0] 2.0.3
by Philipp Hörist (＠lovetox) 24 Jul '21

24 Jul '21

Philipp Hörist pushed to branch nbxmpp_2.0 at gajim / python-nbxmpp Commits: 0ff3090e by lovetox at 2021-07-24T22:10:29+02:00 2.0.3 - - - - - 3 changed files: - ChangeLog - nbxmpp/__init__.py - setup.cfg Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,11 @@ +python-nbxmpp 2.0.3 (24 July 2021) + + Bugfixes + + * Correctly handle RSM count request + * Improve XEP-0050 Compliance + * GSSAPI: Catch OSError + python-nbxmpp 2.0.2 (18 February 2021) Bugfixes ===================================== nbxmpp/__init__.py ===================================== @@ -4,4 +4,4 @@ from .protocol import * gi.require_version('Soup', '2.4') -__version__ = "2.0.2" +__version__ = "2.0.3" ===================================== setup.cfg ===================================== @@ -1,6 +1,6 @@ [metadata] name = nbxmpp -version = 2.0.2 +version = 2.0.3 description = XMPP Library author = Yann Leboulanger, Philipp Hoerist author_email = gajim-devel(a)gajim.org View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/0ff3090e09e5e63a88ddecf9… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/0ff3090e09e5e63a88ddecf9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][nbxmpp_2.0] 6 commits: AdHoc: Improve XEP-0050 Compliance
by Philipp Hörist (＠lovetox) 24 Jul '21

24 Jul '21

Philipp Hörist pushed to branch nbxmpp_2.0 at gajim / python-nbxmpp Commits: 3b9e6ea3 by lovetox at 2021-07-24T21:45:22+02:00 AdHoc: Improve XEP-0050 Compliance - - - - - a808009a by lovetox at 2021-07-24T21:45:22+02:00 AdHoc: Cancel action is always possible - - - - - d3735912 by lovetox at 2021-07-24T21:45:22+02:00 GSSAPI: Catch OSError Error is thrown when Kerberos for Windows is not installed - - - - - 4efc81e4 by lovetox at 2021-07-24T21:45:22+02:00 Update README.md - - - - - 61bff9bd by lovetox at 2021-07-24T21:45:22+02:00 AdHoc: Don’t expect session id for one stage commands - - - - - afaf927d by lovetox at 2021-07-24T21:45:22+02:00 Correctly handle RSM count request Fixes #120 - - - - - 4 changed files: - README.md - nbxmpp/auth.py - nbxmpp/modules/adhoc.py - nbxmpp/modules/mam.py Changes: ===================================== README.md ===================================== @@ -13,7 +13,7 @@ ## Optional Runtime Requirements -- python-gssapi (for GSSAPI authentication) +- python-gssapi (for GSSAPI authentication https://pypi.org/project/gssapi/) ## Features ===================================== nbxmpp/auth.py ===================================== @@ -37,7 +37,8 @@ log = logging.getLogger('nbxmpp.auth') try: gssapi = __import__('gssapi') GSSAPI_AVAILABLE = True -except ImportError: +except (ImportError, OSError) as error: + log.warning('GSSAPI not available: %s', error) GSSAPI_AVAILABLE = False ===================================== nbxmpp/modules/adhoc.py ===================================== @@ -66,18 +66,18 @@ class AdHoc(BaseModule): yield command_list @iq_request_task - def execute_command(self, command, action=None, dataform=None): + def execute_command(self, cmd, action=None, dataform=None): _task = yield if action is None: action = AdHocAction.EXECUTE - attrs = {'node': command.node, + attrs = {'node': cmd.node, 'xmlns': Namespace.COMMANDS, 'action': action.value} - if command.sessionid is not None: - attrs['sessionid'] = command.sessionid + if cmd.sessionid is not None: + attrs['sessionid'] = cmd.sessionid - response = yield _make_command(command, attrs, dataform) + response = yield _make_command(cmd, attrs, dataform) if response.isError(): raise StanzaError(response) @@ -85,41 +85,44 @@ class AdHoc(BaseModule): if command is None: raise MalformedStanzaError('command node missing', response) - attrs = command.getAttrs() - notes = [] - actions = [] + node = command.getAttr('node') + if node is None: + raise MalformedStanzaError('node attribute missing', response) + + status = command.getAttr('status') + if status is None: + raise MalformedStanzaError('status attribute missing', response) + + if status not in ('executing', 'completed', 'canceled'): + raise MalformedStanzaError('invalid status attribute %s' % status, + response) + + status = AdHocStatus(status) + + sessionid = command.getAttr('sessionid') + if sessionid is None and _expect_sessionid(status, cmd.sessionid): + raise MalformedStanzaError('sessionid attribute missing', response) + + try: + notes = _parse_notes(command) + except ValueError as error: + raise MalformedStanzaError(error, response) + try: - for note in command.getTags('note'): - type_ = note.getAttr('type') - if type_ is not None: - type_ = AdHocNoteType(note.getAttr('type')) - notes.append(AdHocCommandNote(text=note.getData(), - type=type_)) - - default = None - actions_ = command.getTag('actions') - if actions_ is not None: - for action_ in actions_.getChildren(): - actions.append(AdHocAction(action_.getName())) - - default = actions_.getAttr('execute') - if default is not None: - default = AdHocAction(default) - if default not in actions: - default = None - - yield AdHocCommand( - jid=str(response.getFrom()), - name=None, - node=attrs['node'], - sessionid=attrs.get('sessionid'), - status=AdHocStatus(attrs['status']), - data=command.getTag('x', namespace=Namespace.DATA), - actions=actions, - default=default, - notes=notes) - except Exception as error: - raise MalformedStanzaError(str(error), response) + actions, default = _parse_actions(command) + except ValueError as error: + raise MalformedStanzaError(error, response) + + yield AdHocCommand( + jid=response.getFrom(), + name=None, + node=node, + sessionid=sessionid, + status=status, + data=command.getTag('x', namespace=Namespace.DATA), + actions=actions, + default=default, + notes=notes) def _make_command(command, attrs, dataform): @@ -129,3 +132,69 @@ def _make_command(command, attrs, dataform): iq = Iq('set', to=command.jid) iq.addChild(node=command_node) return iq + + +def _parse_notes(command): + notes = [] + for note in command.getTags('note'): + type_ = note.getAttr('type') + if type_ is None: + type_ = 'info' + + if type_ not in ('info', 'warn', 'error'): + raise ValueError('invalid note type %s' % type_) + + notes.append(AdHocCommandNote(text=note.getData(), + type=AdHocNoteType(type_))) + return notes + + +def _parse_actions(command): + if command.getAttr('status') != 'executing': + return [], None + + actions_node = command.getTag('actions') + if actions_node is None: + # If there is no <actions/> element, + # the user-agent can use a single-stage dialog or view. + # The action "execute" is equivalent to the action "complete". + return [AdHocAction.CANCEL, AdHocAction.COMPLETE], AdHocAction.COMPLETE + + actions = [] + for action in actions_node.getChildren(): + name = action.getName() + if name not in ('prev', 'next', 'complete'): + raise ValueError('invalid action name: %s' % name) + actions.append(AdHocAction(name)) + + if not actions: + raise ValueError('actions element without actions') + + # The action "cancel" is always allowed. + actions.append(AdHocAction.CANCEL) + + default = actions_node.getAttr('execute') + if default is None: + # If the "execute" attribute is absent, it defaults to "next". + default = 'next' + + if default not in ('prev', 'next', 'complete'): + raise ValueError('invalid execute attribute %s' % default) + + default = AdHocAction(default) + + # A form which has an <actions/> element and an "execute" attribute + # which evaluates (taking the default into account if absent) to an + # action which is not allowed is therefore invalid. + if default not in actions: + # Some implementations don’t respect this rule. + # Take the first action so we don’t fail here. + default = actions[0] + + return actions, default + + +def _expect_sessionid(status, sent_sessionid): + # Session id should only be expected for multiple stage commands + # or when we initialize the session (set the session attribute) + return status != status.COMPLETED or sent_sessionid is not None ===================================== nbxmpp/modules/mam.py ===================================== @@ -66,7 +66,10 @@ class MAM(BaseModule): raise MalformedStanzaError('rsm set missing', response) complete = fin.getAttr('complete') == 'true' - if not complete: + if max_ != 0 and not complete: + # max_ == 0 is a request for count of the items in a result set + # in this case first and last will be absent + # See: https://xmpp.org/extensions/xep-0059.html#count if rsm.first is None or rsm.last is None: raise MalformedStanzaError('first or last element missing', response) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/99530609dcf9022fccf2a0a… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/99530609dcf9022fccf2a0a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] 36 commits: Windows: Add gssapi dependency
by Philipp Hörist (＠lovetox) 24 Jul '21

24 Jul '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 418e476a by lovetox at 2021-07-24T21:57:04+02:00 Windows: Add gssapi dependency Fixes #10540 - - - - - 1685fd29 by lovetox at 2021-07-24T21:57:04+02:00 Accounts: Use SpinSetting for custom port Fixes #10541 - - - - - 8766a747 by lovetox at 2021-07-24T21:57:04+02:00 Assistant: Add convenience mehtods to Page - Page has now a update_page_complete() method - Page has now a get_visible_buttons() method - Page has now a get_get_default_button() method - - - - - 42c3b9dd by lovetox at 2021-07-24T21:57:04+02:00 AdHoc: Port to new Assistant Fixes #10314 - - - - - 164842ec by lovetox at 2021-07-24T21:57:04+02:00 AdHoc: Add custom progress pages - - - - - c4503a66 by lovetox at 2021-07-24T21:57:04+02:00 AdHoc: Don’t execute callbacks after dialog is destroyed - - - - - 6d68facf by lovetox at 2021-07-24T21:57:04+02:00 ChangePassword: Refactor Dialog - Adapt to new Assistant methods - - - - - d41e784e by lovetox at 2021-07-24T21:57:04+02:00 RemoveAccount: Refactor Dialog - Adapt to new Assistant methods - - - - - 901f5c47 by lovetox at 2021-07-24T21:57:04+02:00 AccountWizard: Refactor Dialog - Adapt to new Assistant methods - Don’t force custom host on Advanced page - - - - - 93022629 by lovetox at 2021-07-24T21:57:04+02:00 AdHoc: There is always a default action - - - - - 6bc96caf by lovetox at 2021-07-24T21:57:04+02:00 AdHoc: Don’t add cancel action nbxmpp provides it already - - - - - b62ffa87 by Daniel Brötzmann at 2021-07-24T21:57:04+02:00 Preferences: Fix STUN Server label - - - - - ae517927 by lovetox at 2021-07-24T21:57:04+02:00 Profile: Fix privacy switch inital state - - - - - 1f534560 by lovetox at 2021-07-24T21:57:04+02:00 Update runtime requirements - - - - - 3df4a219 by lovetox at 2021-07-24T21:57:04+02:00 Fix CI - - - - - 206119a9 by Marcin Mielniczuk at 2021-07-24T21:57:04+02:00 Annotate the type for Page.__gsignals__ to fix the mypy failure - - - - - a051dc82 by lovetox at 2021-07-24T21:57:04+02:00 ServerInfo: Don’t fail while adding error class Fixes #10559 - - - - - f2ba30da by wurstsalat at 2021-07-24T21:57:04+02:00 PortableInstaller: Add directory cleanup - - - - - 6cfd76d7 by wurstsalat at 2021-07-24T21:57:04+02:00 Uninstaller: Kill gdbus.exe if running - - - - - b583adf0 by wurstsalat at 2021-07-24T21:57:04+02:00 Installer: Add Gajim branding text - - - - - b7baa032 by wurstsalat at 2021-07-24T21:57:04+02:00 Jingle: Fix UnboundLocalError for transports variable transport=None is handled in JingleTransportSocks5() Fixes #10545 - - - - - e37b2488 by wurstsalat at 2021-07-24T21:57:43+02:00 Profile: Add Note entry - - - - - 1b37bcff by wurstsalat at 2021-07-24T21:57:43+02:00 Profile: Use textview for multi line Note element - - - - - 7c330631 by wurstsalat at 2021-07-24T21:57:43+02:00 Features: Check for gstreamer gtk plugin for AV support Fixes #10551 - - - - - b4251ecd by wurstsalat at 2021-07-24T21:57:43+02:00 Dependency check: Fix unused-variable - - - - - 4c9a54b5 by wurstsalat at 2021-07-24T21:57:43+02:00 Themes: Apply change of dark/light theme instantly Fixes #10441 - - - - - 7cd4e0f9 by wurstsalat at 2021-07-24T21:57:43+02:00 Themes: Apply user themes instantly - - - - - c6a50126 by André Apitzsch at 2021-07-24T21:57:43+02:00 Fix spell checking Fixes #10558. - - - - - c421f6e1 by André Apitzsch at 2021-07-24T21:57:43+02:00 Fix spell checking Disable spell checking only if there is no text, so it doesn't crash on correction. - - - - - a43905c8 by wurstsalat at 2021-07-24T21:57:43+02:00 Servers: Remove blabber.im Service is gone - - - - - c2cf2994 by wurstsalat at 2021-07-24T21:57:43+02:00 HTTPUpload: Raise FileError if path is not accessible Fixes #10560 - - - - - 4c71cb9c by lovetox at 2021-07-24T21:57:43+02:00 Profile: Don’t fail when adding a note property Fixes #10598 - - - - - bec749f7 by Jonas Schäfer at 2021-07-24T21:57:43+02:00 Update API JID for search.jabber.network integration The JID has been changed recently and this needs to be reflected. The old JID was available for a certain transition period, but that period ended a few weeks back because of a necessary architectural change which decoupled the two domains. Signed-off-by: lovetox <philipp(a)hoerist.com> - - - - - df53d7ea by Matthew White at 2021-07-24T21:57:43+02:00 HistoryManager: Allow it to start in standalone mode Fixes the following error when starting gajim-history-manager: ModuleNotFoundError: No module named 'gajim.gui.emoji_data' - - - - - 292b7ac4 by Matthew White at 2021-07-24T21:57:43+02:00 Test: Fix test_gui_interface failure Partially fixes #10478 about the following error: ERROR: test_gui_interface (unittest.loader._FailedTest) ... ModuleNotFoundError: No module named 'gajim.gui.emoji_data' - - - - - 03ead1ef by André Apitzsch at 2021-07-24T21:57:43+02:00 Replace discouraged pkg_resources for Python 3.9+ See https://setuptools.readthedocs.io/en/latest/pkg_resources.html - - - - - 30 changed files: - README.md - gajim/common/app.py - gajim/common/config.py - gajim/common/configpaths.py - gajim/common/modules/httpupload.py - gajim/common/modules/jingle.py - gajim/common/setting_values.py - gajim/data/gui/profile.ui - gajim/data/gui/themes_window.ui - gajim/data/other/servers.json - gajim/data/style/gajim.css - gajim/gtk/account_wizard.py - gajim/gtk/accounts.py - gajim/gtk/adhoc.py - gajim/gtk/assistant.py - gajim/gtk/change_password.py - gajim/gtk/css_config.py - gajim/gtk/features.py - gajim/gtk/message_input.py - gajim/gtk/preferences.py - gajim/gtk/profile.py - gajim/gtk/remove_account.py - gajim/gtk/server_info.py - gajim/gtk/settings.py - gajim/gtk/themes.py - gajim/gtk/vcard_grid.py - gajim/history_manager.py - setup.cfg - test/gtk/assistant.py - test/unit/test_gui_interface.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/19e371c835a1c8b976d0149f28f0d20… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/19e371c835a1c8b976d0149f28f0d20… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Correctly handle RSM count request
by Philipp Hörist (＠lovetox) 24 Jul '21

24 Jul '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f532ff35 by lovetox at 2021-07-24T21:09:34+02:00 Correctly handle RSM count request Fixes #120 - - - - - 1 changed file: - nbxmpp/modules/mam.py Changes: ===================================== nbxmpp/modules/mam.py ===================================== @@ -66,7 +66,10 @@ class MAM(BaseModule): raise MalformedStanzaError('rsm set missing', response) complete = fin.getAttr('complete') == 'true' - if not complete: + if max_ != 0 and not complete: + # max_ == 0 is a request for count of the items in a result set + # in this case first and last will be absent + # See: https://xmpp.org/extensions/xep-0059.html#count if rsm.first is None or rsm.last is None: raise MalformedStanzaError('first or last element missing', response) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/f532ff354c461e6606162489… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/f532ff354c461e6606162489… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix HistorySync
by Philipp Hörist (＠lovetox) 24 Jul '21

24 Jul '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 6dfb44d3 by lovetox at 2021-07-24T21:08:01+02:00 Fix HistorySync - - - - - 2 changed files: - gajim/app_actions.py - gajim/gtk/history_sync.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -162,8 +162,7 @@ def on_blocking_list(_action, param): def on_history_sync(_action, param): account = param.get_string() open_window('HistorySyncAssistant', - account=account, - parent=interface.roster.window) + account=account) def on_server_info(_action, param): ===================================== gajim/gtk/history_sync.py ===================================== @@ -41,7 +41,7 @@ class Pages(IntEnum): class HistorySyncAssistant(Gtk.Assistant, EventHelper): - def __init__(self, account, parent): + def __init__(self, account): Gtk.Assistant.__init__(self) EventHelper.__init__(self) self.set_application(app.app) @@ -49,7 +49,7 @@ def __init__(self, account, parent): self.set_name('HistorySyncAssistant') self.set_default_size(300, -1) self.set_resizable(False) - self.set_transient_for(parent) + self.set_transient_for(app.window) self.account = account self.con = app.connections[self.account] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6dfb44d3ae10d9f12c52b22a868556fb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6dfb44d3ae10d9f12c52b22a868556fb… 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 July 2021