Commits February 2022

commits@gajim.org

1 participants
43 discussions

[Git][gajim/gajim][master] Respect timestamp formatting on message copy
by Daniel Brötzmann (＠wurstsalat) 20 Feb '22

20 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b45ab768 by wurstsalat at 2022-02-20T14:44:50+01:00 Respect timestamp formatting on message copy - - - - - 1 changed file: - gajim/gtk/conversation/rows/message.py Changes: ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -35,6 +35,7 @@ from gajim.common.const import Trust from gajim.common.const import TRUST_SYMBOL_DATA from gajim.common.helpers import AdditionalDataDict +from gajim.common.helpers import from_one_line from gajim.common.helpers import get_group_chat_nick from gajim.common.helpers import get_muc_context from gajim.common.helpers import message_needs_highlight @@ -309,10 +310,12 @@ def is_mergeable(self, message: MessageRow) -> bool: return abs(message.timestamp - self.timestamp) < MERGE_TIMEFRAME def on_copy_message(self, _widget: Gtk.Widget) -> None: - timestamp = self.timestamp.strftime('%x, %X') + time_format = from_one_line(app.settings.get('chat_timestamp_format')) + timestamp_formatted = self.timestamp.strftime(time_format) + clip = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) text = self._message_widget.get_text() - clip.set_text(f'{timestamp} - {self.name}: {text}', -1) + clip.set_text(f'{timestamp_formatted} - {self.name}: {text}', -1) def on_quote_message(self, _widget: Gtk.Widget) -> None: self.emit('quote', self._message_widget.get_text()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b45ab768f7f923e228fe10074b049507… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b45ab768f7f923e228fe10074b049507… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Profile: Fix assertion error
by Daniel Brötzmann (＠wurstsalat) 20 Feb '22

20 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 9af64847 by wurstsalat at 2022-02-20T14:32:32+01:00 Profile: Fix assertion error - - - - - 1 changed file: - gajim/gtk/profile.py Changes: ===================================== gajim/gtk/profile.py ===================================== @@ -165,7 +165,7 @@ def _on_access_model_received(self, task: Task) -> None: else: self._avatar_nick_public = (self._avatar_nick_public or access_model) - assert self._avatar_nick_public + assert self._avatar_nick_public is not None self._set_avatar_nick_access_switch(self._avatar_nick_public) def _on_vcard_received(self, task: Task): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9af6484717ecfb2913190880be303f8a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9af6484717ecfb2913190880be303f8a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CommonContact: Never support Jingle unless overriden
by Philipp Hörist (＠lovetox) 18 Feb '22

18 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8854d0ac by Emmanuel Gil Peyrot at 2022-02-18T09:33:25+01:00 CommonContact: Never support Jingle unless overriden cd40d79f637166eab82aa5df133532a50f78564c introduced a new is_jingle_available property, but it was only enabled on BareContact. GroupchatParticipant was thus left without this property, raising an issue when opening a private chat. Fixes opening private messages, thanks Darkseid for the report! - - - - - 1 changed file: - gajim/common/modules/contacts.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -215,6 +215,10 @@ def is_groupchat(self) -> bool: def is_pm_contact(self) -> bool: return False + @property + def is_jingle_available(self) -> bool: + return False + def get_address(self, _prefer_real: bool = True) -> JID: return self._jid View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8854d0ac1415e077bf0bcf67eb9d2181… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8854d0ac1415e077bf0bcf67eb9d2181… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: AccountSideBar: Add unread counter
by Daniel Brötzmann (＠wurstsalat) 16 Feb '22

16 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 15ab2328 by wurstsalat at 2022-02-16T23:30:13+01:00 AccountSideBar: Add unread counter - - - - - b48b75bf by wurstsalat at 2022-02-16T23:31:49+01:00 Update pyrightconfig - - - - - 4 changed files: - gajim/gtk/account_side_bar.py - gajim/gtk/main.py - gajim/gtk/notification_manager.py - pyrightconfig.json Changes: ===================================== gajim/gtk/account_side_bar.py ===================================== @@ -60,6 +60,11 @@ def activate_account_page(self, account: str) -> None: self.select_row(row) + def update_unread_count(self, account: str, count: int) -> None: + for row in cast(list[Account], self.get_children()): + if row.account == account: + row.set_unread_count(count) + break class Account(Gtk.ListBoxRow): def __init__(self, account: str) -> None: @@ -75,6 +80,13 @@ def __init__(self, account: str) -> None: self._image = AccountAvatar(account) + self._unread_label = Gtk.Label() + self._unread_label.get_style_context().add_class( + 'unread-counter') + self._unread_label.set_no_show_all(True) + self._unread_label.set_halign(Gtk.Align.END) + self._unread_label.set_valign(Gtk.Align.START) + self._account_color_bar = Gtk.Box() self._account_color_bar.set_size_request(6, -1) self._account_color_bar.get_style_context().add_class( @@ -88,7 +100,11 @@ def __init__(self, account: str) -> None: account_box.add(self._account_color_bar) self._update_account_color() - self.add(account_box) + overlay = Gtk.Overlay() + overlay.add(account_box) + overlay.add_overlay(self._unread_label) + + self.add(overlay) self.show_all() def _update_account_color(self) -> None: @@ -99,6 +115,13 @@ def _update_account_color(self) -> None: self._account_class = app.css_config.get_dynamic_class(self.account) context.add_class(self._account_class) + def set_unread_count(self, count: int) -> None: + if count < 1000: + self._unread_label.set_text(str(count)) + else: + self._unread_label.set_text('999+') + self._unread_label.set_visible(bool(count)) + def update(self) -> None: self._update_account_color() ===================================== gajim/gtk/main.py ===================================== @@ -181,6 +181,9 @@ def _on_account_disabled(self, event: events.AccountDisabled) -> None: self._main_stack.remove_account_page(event.account) self._main_stack.remove_chats_for_account(event.account) + def update_account_unread_count(self, account: str, count: int) -> None: + self._account_side_bar.update_unread_count(account, count) + def _on_client_state_changed(self, client: Client, _signal_name: str, ===================================== gajim/gtk/notification_manager.py ===================================== @@ -82,16 +82,25 @@ def update_actions(self) -> None: online = app.account_is_connected(self._account) blocking_support = self._client.get_module('Blocking').supported - app.window.lookup_action( - f'subscription-accept-{self._account}').set_enabled(online) - app.window.lookup_action( - f'subscription-deny-{self._account}').set_enabled(online) - app.window.lookup_action( - f'subscription-block-{self._account}').set_enabled( - online and blocking_support) - app.window.lookup_action( - f'subscription-report-{self._account}').set_enabled( - online and blocking_support) + sub_accept = app.window.lookup_action( + f'subscription-accept-{self._account}') + assert sub_accept is not None + sub_accept.set_enabled(online) + + sub_deny = app.window.lookup_action( + f'subscription-deny-{self._account}') + assert sub_deny is not None + sub_deny.set_enabled(online) + + sub_block = app.window.lookup_action( + f'subscription-block-{self._account}') + assert sub_block is not None + sub_block.set_enabled(online and blocking_support) + + sub_report = app.window.lookup_action( + f'subscription-report-{self._account}') + assert sub_report is not None + sub_report.set_enabled(online and blocking_support) def _remove_actions(self) -> None: actions = [ @@ -103,6 +112,13 @@ def _remove_actions(self) -> None: for action in actions: app.window.remove_action(f'{action}-{self._account}') + def update_unread_count(self): + count = len(self.get_children()) + app.window.update_account_unread_count(self._account, count) + + def _on_row_destroy(self, _widget: Gtk.Widget) -> None: + self.update_unread_count() + def _on_subscription_accept(self, _action: Gio.SimpleAction, param: GLib.Variant @@ -116,7 +132,7 @@ def _on_subscription_accept(self, open_window('AddContact', account=self._account, jid=jid, nick=contact.name) if row is not None: - self.remove(row) + row.destroy() def _on_subscription_block(self, _action: Gio.SimpleAction, @@ -127,7 +143,7 @@ def _on_subscription_block(self, self._client.get_module('Blocking').block([jid]) row = self._get_notification_row(jid) if row is not None: - self.remove(row) + row.destroy() def _on_subscription_report(self, _action: Gio.SimpleAction, @@ -138,7 +154,7 @@ def _on_subscription_report(self, self._client.get_module('Blocking').block([jid], report='spam') row = self._get_notification_row(jid) if row is not None: - self.remove(row) + row.destroy() def _on_subscription_deny(self, _action: Gio.SimpleAction, @@ -148,7 +164,7 @@ def _on_subscription_deny(self, self._deny_request(jid) row = self._get_notification_row(jid) if row is not None: - self.remove(row) + row.destroy() def _deny_request(self, jid: str) -> None: self._client.get_module('Presence').unsubscribed(jid) @@ -165,8 +181,13 @@ def add_subscription_request(self, ) -> None: row = self._get_notification_row(event.jid) if row is None: - self.add(SubscriptionRequestRow( - self._account, event.jid, event.status, event.user_nick)) + new_row = SubscriptionRequestRow( + self._account, + event.jid, + event.status, + event.user_nick) + new_row.connect('destroy', self._on_row_destroy) + self.add(new_row) contact = self._client.get_module('Contacts').get_contact( event.jid) @@ -178,15 +199,19 @@ def add_subscription_request(self, type='subscription-request', title=_('Subscription Request'), text=text)) + self.update_unread_count() elif row.type == 'unsubscribed': - self.remove(row) + row.destroy() def add_unsubscribed(self, event: UnsubscribedPresenceReceived ) -> None: row = self._get_notification_row(event.jid) if row is None: - self.add(UnsubscribedRow(self._account, event.jid)) + new_row = UnsubscribedRow(self._account, event.jid) + new_row.connect('destroy', self._on_row_destroy) + self.add(new_row) + self.update_unread_count() contact = self._client.get_module('Contacts').get_contact( event.jid) @@ -199,33 +224,43 @@ def add_unsubscribed(self, title=_('Contact Unsubscribed'), text=text)) elif row.type == 'subscribe': - self.remove(row) + row.destroy() def add_invitation_received(self, event: MucInvitation) -> None: row = self._get_notification_row(str(event.muc)) - if row is None: - self.add(InvitationReceivedRow(self._account, event)) + if row is not None: + return - if get_muc_context(event.muc) == 'public': - jid = event.from_ - else: - jid = event.from_.bare - contact = self._client.get_module('Contacts').get_contact(jid) - text = _('%(contact)s invited you to %(chat)s') % { - 'contact': contact.name, - 'chat': event.info.muc_name} + new_row = InvitationReceivedRow(self._account, event) + new_row.connect('destroy', self._on_row_destroy) + self.add(new_row) + self.update_unread_count() - app.ged.raise_event( - Notification(account=self._account, - jid=jid, - type='group-chat-invitation', - title=_('Group Chat Invitation'), - text=text)) + if get_muc_context(event.muc) == 'public': + jid = event.from_ + else: + jid = event.from_.bare + contact = self._client.get_module('Contacts').get_contact(jid) + text = _('%(contact)s invited you to %(chat)s') % { + 'contact': contact.name, + 'chat': event.info.muc_name} + + app.ged.raise_event( + Notification(account=self._account, + jid=jid, + type='group-chat-invitation', + title=_('Group Chat Invitation'), + text=text)) def add_invitation_declined(self, event: MucDecline) -> None: row = self._get_notification_row(str(event.muc)) - if row is None: - self.add(InvitationDeclinedRow(self._account, event)) + if row is not None: + return + + new_row = InvitationDeclinedRow(self._account, event) + new_row.connect('destroy', self._on_row_destroy) + self.add(new_row) + self.update_unread_count() class NotificationRow(Gtk.ListBoxRow): ===================================== pyrightconfig.json ===================================== @@ -58,6 +58,7 @@ "gajim/gtk/manage_sounds.py", "gajim/gtk/message_input.py", "gajim/gtk/notification.py", + "gajim/gtk/notification_manager.py", "gajim/gtk/password_dialog.py", "gajim/gtk/preview_audio.py", "gajim/gtk/proxies.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e9cfd624146a7c95fd34ccf4bb202f8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e9cfd624146a7c95fd34ccf4bb202f8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupchatManage: Add destroy action
by Daniel Brötzmann (＠wurstsalat) 16 Feb '22

16 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e9cfd624 by wurstsalat at 2022-02-16T18:30:27+01:00 GroupchatManage: Add destroy action - - - - - 3 changed files: - gajim/data/gui/groupchat_manage.ui - gajim/gtk/builder.pyi - gajim/gtk/groupchat_manage.py Changes: ===================================== gajim/data/gui/groupchat_manage.ui ===================================== @@ -2,9 +2,6 @@  <interface> <requires lib="gtk+" version="3.24"/> - <object class="GtkTextBuffer" id="subject_buffer"> - <signal name="changed" handler="_on_subject_text_changed" swapped="no"/> - </object> <object class="GtkStack" id="stack"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -131,18 +128,51 @@ </packing> </child> <child> - <object class="GtkButton" id="manage_save_button"> - <property name="label" translatable="yes">Save</property> + <object class="GtkBox"> <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> - <property name="can-default">True</property> - <property name="receives-default">False</property> - <property name="halign">end</property> - <signal name="clicked" handler="_on_manage_save_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> + <property name="can-focus">False</property> + <child> + <object class="GtkButton" id="manage_save_button"> + <property name="label" translatable="yes">Save</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">False</property> + <signal name="clicked" handler="_on_manage_save_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </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> + <child> + <object class="GtkButton" id="destroy_muc_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Destroy Groupchat…</property> + <signal name="clicked" handler="_on_destroy_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">user-trash-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> @@ -193,7 +223,6 @@ <property name="right-margin">6</property> <property name="top-margin">6</property> <property name="bottom-margin">6</property> - <property name="buffer">subject_buffer</property> </object> </child> </object> @@ -240,7 +269,7 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">center</property> - <property name="valign">center</property> + <property name="valign">start</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="border-width">18</property> @@ -312,6 +341,8 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">Update Avatar</property> + <property name="justify">center</property> + <property name="wrap">True</property> <style> <class name="bold16"/> </style> @@ -337,6 +368,172 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="valign">start</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel"> + <property name="width-request">300</property> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-bottom">6</property> + <property name="label" translatable="yes">Destroy This Chat</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <property name="max-width-chars">22</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Reason for destruction</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="destroy_reason_entry"> + <property name="width-request">200</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="margin-bottom">6</property> + <property name="activates-default">True</property> + <property name="caps-lock-warning">False</property> + <property name="secondary-icon-name">face-smile-symbolic</property> + <property name="secondary-icon-tooltip-text" translatable="yes">Insert Emoji</property> + <property name="secondary-icon-tooltip-markup" translatable="yes">Insert Emoji</property> + <property name="placeholder-text" translatable="yes">Reason (optional)...</property> + <property name="show-emoji-icon">True</property> + </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="halign">start</property> + <property name="label" translatable="yes">Where participants should go</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="destroy_alternate_entry"> + <property name="width-request">200</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="margin-bottom">6</property> + <property name="activates-default">True</property> + <property name="caps-lock-warning">False</property> + <property name="placeholder-text" translatable="yes">Alternate venue (optional)...</property> + <signal name="changed" handler="_on_destroy_alternate_changed" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-top">18</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Cancel</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_destroy_cancelled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="destroy_button"> + <property name="label" translatable="yes">_Destroy</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">True</property> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_destroy_confirmed" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="name">destroy</property> + <property name="position">2</property> + </packing> + </child> <style> <class name="padding-18"/> </style> ===================================== gajim/gtk/builder.pyi ===================================== @@ -510,17 +510,20 @@ class GroupchatInviterBuilder(Builder): class GroupchatManageBuilder(Builder): - subject_buffer: Gtk.TextBuffer stack: Gtk.Stack avatar_button_image: Gtk.Image avatar_select_button: Gtk.Button muc_description_entry: Gtk.Entry muc_name_entry: Gtk.Entry manage_save_button: Gtk.Button + destroy_muc_button: Gtk.Button subject_textview: Gtk.TextView subject_change_button: Gtk.Button avatar_selector_grid: Gtk.Grid avatar_update_button: Gtk.Button + destroy_reason_entry: Gtk.Entry + destroy_alternate_entry: Gtk.Entry + destroy_button: Gtk.Button class GroupchatNickChooserBuilder(Builder): ===================================== gajim/gtk/groupchat_manage.py ===================================== @@ -27,6 +27,7 @@ from gajim.common import app from gajim.common.const import AvatarSize +from gajim.common.helpers import validate_jid from gajim.common.i18n import _ from gajim.common.modules.contacts import GroupchatContact @@ -64,12 +65,15 @@ def __init__(self, self._prepare_subject() self._prepare_manage() + + self._ui.subject_textview.get_buffer().connect( + 'changed', self._on_subject_text_changed) self.connect('destroy', self._on_destroy) self.show_all() def _on_destroy(self, *args: Any) -> None: - self._avatar_selector = None + del self._avatar_selector app.check_finalize(self) @property @@ -142,6 +146,7 @@ def _prepare_manage(self) -> None: if self_contact.affiliation.is_owner: self._client.get_module('MUC').request_config( self._contact.jid, callback=self._on_manage_form_received) + self._ui.destroy_muc_button.set_sensitive(True) def _on_manage_form_received(self, task: Task) -> None: try: @@ -242,3 +247,37 @@ def update_avatar(self): AvatarSize.GROUP_INFO, self.get_scale_factor()) self._ui.avatar_button_image.set_from_surface(surface) + + def _on_destroy_clicked(self, _button: Gtk.Button) -> None: + self._ui.stack.set_visible_child_name('destroy') + self._ui.destroy_reason_entry.grab_focus() + self._ui.destroy_button.grab_default() + + def _on_destroy_alternate_changed(self, entry: Gtk.Entry) -> None: + jid = entry.get_text() + if jid: + try: + jid = validate_jid(jid) + except Exception: + icon = 'dialog-warning-symbolic' + text = _('Invalid XMPP Address') + self._ui.destroy_alternate_entry.set_icon_from_icon_name( + Gtk.EntryIconPosition.SECONDARY, icon) + self._ui.destroy_alternate_entry.set_icon_tooltip_text( + Gtk.EntryIconPosition.SECONDARY, text) + self._ui.destroy_button.set_sensitive(False) + return + self._ui.destroy_alternate_entry.set_icon_from_icon_name( + Gtk.EntryIconPosition.SECONDARY, None) + self._ui.destroy_button.set_sensitive(True) + + def _on_destroy_confirmed(self, _button: Gtk.Button) -> None: + reason = self._ui.destroy_reason_entry.get_text() + alternate_jid = self._ui.destroy_alternate_entry.get_text() + self._client.get_module('MUC').destroy( + self._contact.jid, reason, alternate_jid) + window = self.get_toplevel() + window.destroy() + + def _on_destroy_cancelled(self, _button: Gtk.Button) -> None: + self._ui.stack.set_visible_child_name('manage') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e9cfd624146a7c95fd34ccf4bb202f8f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e9cfd624146a7c95fd34ccf4bb202f8f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update DOAP
by Daniel Brötzmann (＠wurstsalat) 14 Feb '22

14 Feb '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 2b2a3580 by Daniel Brötzmann at 2022-02-14T08:33:13+00:00 Update DOAP - - - - - 1 changed file: - data/gajim.doap Changes: ===================================== data/gajim.doap ===================================== @@ -678,5 +678,12 @@ <xmpp:version>0.2</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0454.html"/> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.1.0</xmpp:version> + </xmpp:SupportedXep> + </implements> </Project> </rdf:RDF> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2b2a358055ad3d7cf38ea2dd4a3462a4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2b2a358055ad3d7cf38ea2dd4a3462a4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: Update dependencies
by André (＠andre) 12 Feb '22

12 Feb '22

André pushed to branch master at gajim / gajim Commits: 4f662bb0 by André Apitzsch at 2022-02-12T10:52:13+01:00 Flatpak: Update dependencies - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -61,11 +61,11 @@ modules: - name: python3-pyparsing buildsystem: simple build-commands: - - pip3 install pyparsing-2.4.7-py2.py3-none-any.whl + - pip3 install pyparsing-3.0.7-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/p/pyparsing/pyparsing-2.4.7… - sha256: ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b + url: https://files.pythonhosted.org/packages/py3/p/pyparsing/pyparsing-3.0.7-py3… + sha256: a6c06a88f252e6c322f65faf8f418b16213b51bdfaece0524c1c1bc30c63c484 - name: python3-packaging buildsystem: simple @@ -117,31 +117,31 @@ modules: only-arches: - aarch64 build-commands: - - pip3 install cryptography-36.0.0-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl + - pip3 install cryptography-36.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-36… - sha256: 4c702855cd3174666ef0d2d13dcc879090aa9c6c38f5578896407a7028f75b9f + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-36… + sha256: 5d59a9d55027a8b88fd9fd2826c4392bd487d74bf628bb9d39beecc62a644c12 - name: python3-cryptography buildsystem: simple only-arches: - x86_64 build-commands: - - pip3 install cryptography-36.0.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pip3 install cryptography-36.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-36… - sha256: d91bc9f535599bed58f6d2e21a2724cb0c3895bf41c6403fe881391d29096f1d + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-36… + sha256: 0a817b961b46894c5ca8a66b599c745b9a3d9f822725221f0e0fe49dc043a3a3 - name: python3-pyopenssl buildsystem: simple build-commands: - - pip3 install pyOpenSSL-21.0.0-py2.py3-none-any.whl + - pip3 install pyOpenSSL-22.0.0-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/p/pyOpenSSL/pyOpenSSL-21.0.… - sha256: 8935bd4920ab9abfebb07c41a4f58296407ed77f04bd1a92914044b848ba1ed6 + url: https://files.pythonhosted.org/packages/py2.py3/p/pyOpenSSL/pyOpenSSL-22.0.… + sha256: ea252b38c87425b64116f808355e8da644ef9b07e429398bfece610f893ee2e0 - name: python3-dbus-python build-options: @@ -173,62 +173,62 @@ modules: - name: python3-zipp buildsystem: simple build-commands: - - pip3 install zipp-3.6.0-py3-none-any.whl + - pip3 install zipp-3.7.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.6.0-py3-none-any.… - sha256: 9fe5ea21568a0a70e50f273397638d39b03353731e6cbbb3fd8502a33fec40bc + url: https://files.pythonhosted.org/packages/py3/z/zipp/zipp-3.7.0-py3-none-any.… + sha256: b47250dd24f92b7dd6a0a8fc5244da14608f3ca90a5efcd37a3b1642fac9a375 # keyring dependency - name: python3-importlib-metadata buildsystem: simple build-commands: - - pip3 install importlib_metadata-4.8.2-py3-none-any.whl + - pip3 install importlib_metadata-4.11.0-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… - sha256: 53ccfd5c134223e497627b9815d5030edf77d2ed573922f7a0b8f8bb81a1c100 + url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… + sha256: 6affcdb3aec542dd98df8211e730bba6c5f2bec8288d47bacacde898f548c9ad - name: python3-keyring buildsystem: simple build-commands: - - pip3 install keyring-23.4.0-py3-none-any.whl + - pip3 install keyring-23.5.0-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.4.0-py3-no… - sha256: 3dc0f66062a4f8f6f2ce30d6a516e6e623e6c3c2e76864204ceaf64695408f07 + url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.5.0-py3-no… + sha256: b0d28928ac3ec8e42ef4cc227822647a19f1d544f21f96457965dc01cf555261 - name: python3-css-parser buildsystem: simple build-commands: - - pip3 install css_parser-1.0.6-py2.py3-none-any.whl + - pip3 install css_parser-1.0.7-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/c/css_parser/css_parser-1.0… - sha256: 6fc4f8f0a4b62c77f043765e375cc64971c54ff9a0502fec7e8f1fb28bb96082 + url: https://files.pythonhosted.org/packages/py2.py3/c/css_parser/css_parser-1.0… + sha256: de7018ec9d3f20f7d692973c37f22ae9a22123c60c77b11849363f47ef6f3387 - name: python3-precis_i18n buildsystem: simple build-commands: - - pip3 install precis_i18n-1.0.3-py3-none-any.whl + - pip3 install precis_i18n-1.0.4-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/p/precis_i18n/precis_i18n-1.0.3… - sha256: b9a4ff1f2f8c4a762393cb1b80bf4cadfbe861ec299f752068cc42f281322d45 + url: https://files.pythonhosted.org/packages/py3/p/precis_i18n/precis_i18n-1.0.4… + sha256: 8b4f6100c2f5e44db61081d53c9c07ff92e50d0a7b36eedd2f4fb7d40c48576d # gssapi dependency - name: python3-decorator buildsystem: simple build-commands: - - pip3 install decorator-5.1.0-py3-none-any.whl + - pip3 install decorator-5.1.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/d/decorator/decorator-5.1.0-py3… - sha256: 7b12e7c3c6ab203a29e157335e9122cb03de9ab7264b137594103fd4a683b374 + url: https://files.pythonhosted.org/packages/py3/d/decorator/decorator-5.1.1-py3… + sha256: b8c3f85900b9dc423225913c5aace94729fe1fa9763b38939a95226f02d37186 - name: python3-gssapi buildsystem: simple @@ -280,8 +280,8 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-8.4.0.tar.gz - sha256: b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed + url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.0.1.tar.gz + sha256: 6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa - name: python3-nbxmpp buildsystem: simple View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4f662bb0611a2178c2b41955e237bdab… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4f662bb0611a2178c2b41955e237bdab… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix default value for dev_use_message_label
by Philipp Hörist (＠lovetox) 06 Feb '22

06 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: adbd80e1 by lovetox at 2022-02-06T21:34:55+01:00 Fix default value for dev_use_message_label - - - - - 1 changed file: - gajim/common/setting_values.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -261,7 +261,7 @@ class _ACCOUNT_DEFAULT: 'groupchat_roster_width': 210, 'dev_force_bookmark_2': False, 'developer_modus': False, - 'dev_use_message_label': False, + 'dev_use_message_label': True, 'use_libappindicator': True, 'show_help_start_chat': True, 'gc_notify_on_all_messages_private_default': True, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/adbd80e1fe88cb92eb904addb410fcc9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/adbd80e1fe88cb92eb904addb410fcc9… You're receiving this email because of your account on dev.gajim.org.

1 0

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

06 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ec7827c6 by lovetox at 2022-02-05T12:58:29+01:00 Remove unused import - - - - - cd40d79f by lovetox at 2022-02-05T13:21:26+01:00 Contacts: Add is_jingle_available property - - - - - 3 changed files: - gajim/common/modules/contacts.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -26,6 +26,7 @@ import cairo from nbxmpp.const import Affiliation from nbxmpp.const import Role +from nbxmpp.namespaces import Namespace from nbxmpp.protocol import JID from nbxmpp.structs import DiscoInfo from nbxmpp.structs import LocationData @@ -415,6 +416,12 @@ def set_blocked(self) -> None: def set_unblocked(self) -> None: self.notify('blocking-update') + @property + def is_jingle_available(self) -> bool: + if not self.supports(Namespace.JINGLE_FILE_TRANSFER_5): + return False + return self.is_available + class ResourceContact(CommonContact): def __init__(self, logger: logging.Logger, jid: JID, account: str) -> None: ===================================== gajim/gtk/controls/chat.py ===================================== @@ -215,12 +215,8 @@ def update_actions(self) -> None: self._client.get_module('HTTPUpload').available) # Send file (Jingle) - jingle_support = self.contact.supports(Namespace.JINGLE_FILE_TRANSFER_5) - jingle_conditions = bool(jingle_support and - self.contact.is_available and - not self.contact.is_pm_contact) jingle = self._get_action('send-file-jingle-') - jingle.set_enabled(online and jingle_conditions) + jingle.set_enabled(online and self.contact.is_jingle_available) # Send file self._get_action('send-file-').set_enabled(jingle.get_enabled() or ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -49,7 +49,6 @@ from gajim.common import ged from gajim.common import helpers from gajim.common.client import Client -from gajim.common.config import Option from gajim.common.const import AvatarSize from gajim.common.const import SimpleClientState from gajim.common.helpers import AdditionalDataDict View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c81f009d76dbea13abe17c26a4a4012… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c81f009d76dbea13abe17c26a4a4012… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ChatPage: Move set_control_active() to ChatStack
by Philipp Hörist (＠lovetox) 05 Feb '22

05 Feb '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: e7444431 by lovetox at 2022-02-05T12:41:44+01:00 ChatPage: Move set_control_active() to ChatStack - - - - - c81f009d by lovetox at 2022-02-05T12:43:00+01:00 ChatStack: Add type annotations - - - - - 4 changed files: - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - gajim/gtk/controls/groupchat.py - pyrightconfig.json Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -96,7 +96,6 @@ def __init__(self): self._ui.paned.set_position(app.settings.get('chat_handle_position')) self._ui.paned.connect('button-release-event', self._on_button_release) - self._last_control: Optional[ControlT] = None self._startup_finished: bool = False self._add_actions() @@ -183,16 +182,6 @@ def _on_chat_selected(self, self.emit('chat-selected', workspace_id, account, jid) self._reset_chat_idle_time(account, jid) - control = self.get_control(account, jid) - if control is None: - return - - if control != self._last_control: - if self._last_control is not None: - self._last_control.set_control_active(False) - control.set_control_active(True) - self._last_control = control - def _on_chat_unselected(self, _chat_list_stack: ChatListStack) -> None: self._chat_stack.clear() self._search_view.set_context(None, None) @@ -321,7 +310,6 @@ def remove_chat(self, account: str, jid: JID) -> None: def _on_chat_removed(self, _chat_list: ChatList, account: str, jid: JID, type_: str) -> None: self._chat_stack.remove_chat(account, jid) - self._last_control = None if type_ == 'groupchat': client = app.get_client(account) client.get_module('MUC').leave(jid) ===================================== gajim/gtk/chat_stack.py ===================================== @@ -26,7 +26,6 @@ from gajim.common import app from gajim.common import ged from gajim.common.i18n import _ -from gajim.common.events import ApplicationEvent from .controls.chat import ChatControl from .controls.groupchat import GroupchatControl @@ -55,6 +54,7 @@ def __init__(self): self.show_all() self._controls: dict[tuple[str, JID], ControlT] = {} + self._current_control = None def get_control(self, account: str, jid: JID) -> Optional[ControlT]: try: @@ -104,12 +104,24 @@ def remove_chat(self, account: str, jid: JID) -> None: control.shutdown() def show_chat(self, account: str, jid: JID) -> None: - self.set_visible_child_name(f'{account}:{jid}') + new_name = f'{account}:{jid}' + current_name = self.get_visible_child_name() + assert current_name is not None + + if current_name == new_name: + return + control = self.get_control(account, jid) if control is None: log.warning('No Control found for %s, %s', account, jid) return + if self._current_control is not None: + self._current_control.set_control_active(False) + control.set_control_active(True) + self._current_control = control + + self.set_visible_child_name(new_name) GLib.idle_add(control.focus) def is_chat_loaded(self, account: str, jid: JID) -> bool: @@ -126,9 +138,12 @@ def unload_chat(self, account: str, jid: JID) -> None: def clear(self) -> None: self.set_visible_child_name('empty') + self._current_control = None - def process_event(self, event: ApplicationEvent) -> None: + def process_event(self, event: Any) -> None: control = self.get_control(event.account, event.jid) + if control is None: + return control.process_event(event) def remove_chats_for_account(self, account: str) -> None: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -49,6 +49,7 @@ from gajim.common import ged from gajim.common import helpers from gajim.common.client import Client +from gajim.common.config import Option from gajim.common.const import AvatarSize from gajim.common.const import SimpleClientState from gajim.common.helpers import AdditionalDataDict @@ -1160,7 +1161,7 @@ def send_message(self, def _on_message_error(self, event: events.MessageError) -> None: self.conversation_view.show_error(event.message_id, event.error) - def shutdown(self, reason=None): + def shutdown(self, reason: Optional[str] = None) -> None: app.settings.disconnect_signals(self) self.contact.disconnect(self) ===================================== pyrightconfig.json ===================================== @@ -36,6 +36,7 @@ "gajim/gtk/chat_filter.py", "gajim/gtk/chat_list_stack.py", "gajim/gtk/chat_page.py", + "gajim/gtk/chat_stack.py", "gajim/gtk/const.py", "gajim/gtk/contact_info.py", "gajim/gtk/contacts_flowbox.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/023b5e8371c8933215591eae4f1e666… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/023b5e8371c8933215591eae4f1e666… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2022