Commits September 2020

commits@gajim.org

1 participants
105 discussions

[Git][gajim/python-nbxmpp][master] 2 commits: EntityCaps: Add more logging output on invalid presence
by Philipp Hörist 29 Sep '20

29 Sep '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 76142043 by lovetox at 2020-09-26T22:11:36+02:00 EntityCaps: Add more logging output on invalid presence - - - - - 9c9cc108 by lovetox at 2020-09-29T19:45:25+02:00 Use integer log levels - - - - - 2 changed files: - nbxmpp/errors.py - nbxmpp/modules/entity_caps.py Changes: ===================================== nbxmpp/errors.py ===================================== @@ -15,6 +15,8 @@ # You should have received a copy of the GNU General Public License # along with this program; If not, see <http://www.gnu.org/licenses/>. +import logging + from nbxmpp.namespaces import Namespace @@ -29,7 +31,7 @@ class BaseError(Exception): class StanzaError(BaseError): - log_level = 'info' + log_level = logging.INFO app_namespace = None def __init__(self, stanza): @@ -98,7 +100,7 @@ class PubSubStanzaError(StanzaError): class MalformedStanzaError(BaseError): - log_level = 'warning' + log_level = logging.WARNING def __init__(self, text, stanza, is_fatal=True): BaseError.__init__(self, is_fatal=is_fatal) @@ -108,7 +110,7 @@ class MalformedStanzaError(BaseError): class CancelledError(BaseError): - log_level = 'info' + log_level = logging.INFO def __init__(self): BaseError.__init__(self, is_fatal=True) ===================================== nbxmpp/modules/entity_caps.py ===================================== @@ -82,16 +82,19 @@ class EntityCaps(BaseModule): if hash_algo != 'sha-1': self._log.warning('Unsupported hashing algorithm used: %s', hash_algo) + self._log.warning(stanza) return node = caps.getAttr('node') if not node: self._log.warning('node attribute missing') + self._log.warning(stanza) return ver = caps.getAttr('ver') if not ver: self._log.warning('ver attribute missing') + self._log.warning(stanza) return properties.entity_caps = EntityCapsData( View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/854caebc7a441854f79be39… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/854caebc7a441854f79be39… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: GroupChatInfo: Add address copy button
by Philipp Hörist 29 Sep '20

29 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: c8333171 by wurstsalat at 2020-09-29T08:32:53+02:00 GroupChatInfo: Add address copy button - - - - - 98f07508 by Daniel Brötzmann at 2020-09-29T08:39:00+02:00 GroupChatInfo: Use f-strings, make label translatable - - - - - 2 changed files: - gajim/data/gui/groupchat_info_scrolled.ui - gajim/gtk/groupchat_info.py Changes: ===================================== gajim/data/gui/groupchat_info_scrolled.ui ===================================== @@ -13,7 +13,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="valign">start</property> <property name="label" translatable="yes">Address</property> <style> <class name="dim-label"/> @@ -72,19 +71,6 @@ <property name="top_attach">5</property> </packing> </child> - <child> - <object class="GtkLabel" id="address"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> <child> <object class="GtkLabel" id="description"> <property name="can_focus">False</property> @@ -291,5 +277,52 @@ <property name="width">2</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="address"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="selectable">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">Copy Address</property> + <property name="halign">start</property> + <property name="valign">start</property> + <signal name="clicked" handler="_on_copy_address" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">edit-copy-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="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> </object> </interface> ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -136,7 +136,7 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): has_author = bool(author) if has_author and epoch_timestamp is not None: time_ = time.strftime('%c', time.localtime(epoch_timestamp)) - author = '{} - {}'.format(author, time_) + author = f'{author} - {time_}' self._ui.author.set_text(author or '') self._ui.author.set_visible(has_author) @@ -202,7 +202,7 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): # Set discussion logs has_log_uri = bool(info.muc_log_uri) self._ui.logs.set_uri(info.muc_log_uri or '') - self._ui.logs.set_label('Website') + self._ui.logs.set_label(_('Website')) self._ui.logs.set_visible(has_log_uri) self._ui.logs_label.set_visible(has_log_uri) @@ -242,13 +242,17 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): row += 1 grid.show_all() + def _on_copy_address(self, _button): + clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + clipboard.set_text(f'xmpp:{self._info.jid}?join', -1) + @staticmethod def _on_activate_log_link(button): open_uri(button.get_uri()) return Gdk.EVENT_STOP def _on_activate_contact_link(self, button): - open_uri('xmpp:%s?message' % button.get_uri(), account=self._account) + open_uri(f'xmpp:{button.get_uri()}?message', account=self._account) return Gdk.EVENT_STOP @staticmethod View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ce7f7088db801fb17095625801cb745… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ce7f7088db801fb17095625801cb745… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatControl: Fix invalid type error
by Philipp Hörist 28 Sep '20

28 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: ce7f7088 by André Apitzsch at 2020-09-28T21:33:28+02:00 ChatControl: Fix invalid type error - - - - - 1 changed file: - gajim/chat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -813,12 +813,12 @@ class ChatControl(ChatControlBase): def on_mic_hscale_value_changed(self, _widget, value): self._get_audio_content().set_mic_volume(value / 100) # Save volume to config - app.settings.set('audio_input_volume', value) + app.settings.set('audio_input_volume', int(value)) def on_sound_hscale_value_changed(self, _widget, value): self._get_audio_content().set_out_volume(value / 100) # Save volume to config - app.settings.set('audio_output_volume', value) + app.settings.set('audio_output_volume', int(value)) def on_location_eventbox_button_release_event(self, _widget, _event): if 'geoloc' in self.contact.pep: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ce7f7088db801fb17095625801cb745d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ce7f7088db801fb17095625801cb745d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupChatInvitation: Fix invitation label
by Daniel Brötzmann 28 Sep '20

28 Sep '20

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8110474f by Daniel Brötzmann at 2020-09-28T19:58:21+02:00 GroupChatInvitation: Fix invitation label - - - - - 1 changed file: - gajim/gtk/groupchat_invitation.py Changes: ===================================== gajim/gtk/groupchat_invitation.py ===================================== @@ -54,7 +54,7 @@ class GroupChatInvitation(Gtk.ApplicationWindow): contact_label.set_justify(Gtk.Justification.CENTER) contact_label.set_line_wrap(True) invitation_label = Gtk.Label( - label=_('Has invited you to a group chat.\nDo you want to join?')) + label=_('has invited you to a group chat.\nDo you want to join?')) invitation_label.set_halign(Gtk.Align.CENTER) invitation_label.set_justify(Gtk.Justification.CENTER) invitation_label.set_max_width_chars(50) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8110474f8b0ee239368afe6fafe502c0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8110474f8b0ee239368afe6fafe502c0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preferences: Add setting for showing the send button
by Philipp Hörist 27 Sep '20

27 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 42b0d572 by lovetox at 2020-09-27T18:38:29+02:00 Preferences: Add setting for showing the send button - - - - - 1 changed file: - gajim/gtk/preferences.py Changes: ===================================== gajim/gtk/preferences.py ===================================== @@ -339,6 +339,11 @@ class Chats(PreferenceBox): desc=_('Render XHTML styles (colors, etc.) of incoming ' 'messages')), + Setting(SettingKind.SWITCH, + _('Show Send Message Button'), + SettingType.CONFIG, + 'show_send_message_button'), + Setting(SettingKind.SWITCH, _('Show Status Message'), SettingType.CONFIG, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/42b0d572fffa3f697746f69a84bc9eef… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/42b0d572fffa3f697746f69a84bc9eef… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupChatControl: Harmonize Information and Settings page
by Philipp Hörist 26 Sep '20

26 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: adf30467 by lovetox at 2020-09-26T21:55:56+02:00 GroupChatControl: Harmonize Information and Settings page - - - - - 2 changed files: - gajim/data/gui/groupchat_control.ui - gajim/groupchat_control.py Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkBox" id="drop_area"> @@ -1294,7 +1294,6 @@ <object class="GtkGrid" id="info_grid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">center</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> @@ -1325,11 +1324,41 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> - <placeholder/> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Information</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="info_box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + <style> + <class name="margin-18"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> <style> <class name="margin-18"/> @@ -1955,9 +1984,7 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="border_width">18</property> <property name="row_spacing">12</property> - <property name="column_spacing">12</property> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -2024,7 +2051,7 @@ <placeholder/> </child> <style> - <class name="padding-18"/> + <class name="margin-18"/> </style> </object> </child> @@ -2039,6 +2066,9 @@ <property name="top_attach">1</property> </packing> </child> + <style> + <class name="margin-18"/> + </style> </object> <packing> <property name="expand">False</property> ===================================== gajim/groupchat_control.py ===================================== @@ -174,7 +174,7 @@ class GroupchatControl(ChatControlBase): # MUC Info self._subject_data = None self._muc_info_box = GroupChatInfoScrolled(self.account, {'width': 600}) - self.xml.info_grid.attach(self._muc_info_box, 0, 0, 1, 1) + self.xml.info_box.add(self._muc_info_box) # Groupchat settings self._groupchat_settings_box = GroupChatSettings( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/adf304678c0dcde5619b34ac5b8cffb1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/adf304678c0dcde5619b34ac5b8cffb1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupChatSettings: Move ScrolledWindow into .ui file
by Philipp Hörist 26 Sep '20

26 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: acec7725 by lovetox at 2020-09-26T21:21:03+02:00 GroupChatSettings: Move ScrolledWindow into .ui file Fixes #10276 - - - - - 3 changed files: - gajim/data/gui/groupchat_control.ui - gajim/groupchat_control.py - gajim/gtk/groupchat_settings.py Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkBox" id="drop_area"> @@ -1953,12 +1953,10 @@ <property name="name">settings_grid</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">center</property> - <property name="valign">center</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="border_width">18</property> - <property name="row_spacing">6</property> + <property name="row_spacing">12</property> <property name="column_spacing">12</property> <child> <object class="GtkBox"> @@ -1985,11 +1983,61 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> - <placeholder/> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Settings for This Chat</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <property name="overlay_scrolling">False</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox" id="settings_scrolled_box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + <style> + <class name="padding-18"/> + </style> + </object> + </child> + </object> + </child> + <style> + <class name="scrolled-no-border"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> </child> </object> <packing> ===================================== gajim/groupchat_control.py ===================================== @@ -72,7 +72,7 @@ from gajim.gtk.adhoc import AdHocCommand from gajim.gtk.dataform import DataFormWidget from gajim.gtk.groupchat_info import GroupChatInfoScrolled from gajim.gtk.groupchat_invite import GroupChatInvite -from gajim.gtk.groupchat_settings import GroupChatSettingsScrolled +from gajim.gtk.groupchat_settings import GroupChatSettings from gajim.gtk.groupchat_roster import GroupchatRoster from gajim.gtk.util import NickCompletionGenerator from gajim.gtk.util import get_app_window @@ -177,10 +177,9 @@ class GroupchatControl(ChatControlBase): self.xml.info_grid.attach(self._muc_info_box, 0, 0, 1, 1) # Groupchat settings - self._groupchat_settings_box = GroupChatSettingsScrolled( + self._groupchat_settings_box = GroupChatSettings( self.account, self.room_jid, self.context) - self.xml.settings_grid.attach(self._groupchat_settings_box, 0, 0, 1, 1) - + self.xml.settings_scrolled_box.add(self._groupchat_settings_box) # Groupchat invite self.xml.quick_invite_button.set_action_name( ===================================== gajim/gtk/groupchat_settings.py ===================================== @@ -23,43 +23,14 @@ from gajim.gtk.const import SettingType from gajim.gtk.settings import SettingsBox -class GroupChatSettingsScrolled(Gtk.ScrolledWindow): +class GroupChatSettings(SettingsBox): def __init__(self, account, jid, context): - Gtk.ScrolledWindow.__init__(self) - self.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) - self.set_max_content_height(400) - self.set_propagate_natural_height(True) - self.set_hexpand(True) - self.set_vexpand(True) - - box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=18) - box.set_valign(Gtk.Align.CENTER) - label = Gtk.Label(label=_('Settings For This Chat')) - label.get_style_context().add_class('bold16') - label.set_halign(Gtk.Align.CENTER) - box.add(label) - - chat_settings = ChatSettings(account, jid, context) - box.add(chat_settings) - - self.add(box) - self.show_all() - - -class GroupchatSettingsBox(SettingsBox): - def __init__(self, account, jid, settings): SettingsBox.__init__(self, account, jid) self.get_style_context().add_class('settings-border') self.set_selection_mode(Gtk.SelectionMode.NONE) - - for setting in settings: - self.add_setting(setting) - self.update_states() - - -class ChatSettings(GroupchatSettingsBox): - def __init__(self, account, jid, context): + self.set_valign(Gtk.Align.START) + self.set_halign(Gtk.Align.CENTER) chat_state = { 'disabled': _('Disabled'), @@ -106,6 +77,9 @@ class ChatSettings(GroupchatSettingsBox): 'sync_threshold', context=context, props={'entries': THRESHOLD_OPTIONS}), + ] - GroupchatSettingsBox.__init__(self, account, jid, settings) + for setting in settings: + self.add_setting(setting) + self.update_states() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/acec7725876b1dc53d705f4be659a2b4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/acec7725876b1dc53d705f4be659a2b4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ConversationTextview: Use encrypted-color
by Philipp Hörist 26 Sep '20

26 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5ca5eb88 by Daniel Brötzmann at 2020-09-26T11:22:10+02:00 ConversationTextview: Use encrypted-color - - - - - 1 changed file: - gajim/conversation_textview.py Changes: ===================================== gajim/conversation_textview.py ===================================== @@ -68,7 +68,7 @@ TRUST_SYMBOL_DATA = { 'warning-color'), Trust.BLIND: ('security-medium-symbolic', _('Unverified'), - 'success-color'), + 'encrypted-color'), Trust.VERIFIED: ('security-high-symbolic', _('Verified'), 'encrypted-color') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5ca5eb8858b0cf45d90709cb199bd47a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5ca5eb8858b0cf45d90709cb199bd47a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 8 commits: Remove now obsolete data_form_window.ui
by Philipp Hörist 26 Sep '20

26 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2714e1e0 by Daniel Brötzmann at 2020-09-26T10:50:20+02:00 Remove now obsolete data_form_window.ui - - - - - 8e249a07 by Daniel Brötzmann at 2020-09-26T10:50:22+02:00 ExceptionDialog: Fix deprecation warnings, improve layout - - - - - 45651912 by Daniel Brötzmann at 2020-09-26T10:50:23+02:00 GroupchatControl: Fix deprecation warnings - - - - - 614f8549 by Daniel Brötzmann at 2020-09-26T10:50:24+02:00 Notifications: Fix deprecation warning - - - - - 33ee9736 by Daniel Brötzmann at 2020-09-26T10:50:24+02:00 ServiceDiscovery: Fix deprecation warning - - - - - 4182a1ea by Daniel Brötzmann at 2020-09-26T10:50:25+02:00 SingleMessageWindow: Fix deprecation warning - - - - - b80ef6fc by Daniel Brötzmann at 2020-09-26T10:50:26+02:00 SSLErrorDialog: Fix deprecation warnings - - - - - 63a7cfe6 by Daniel Brötzmann at 2020-09-26T10:50:27+02:00 GCTooltip: Fix deprecation warning - - - - - 8 changed files: - − gajim/data/gui/data_form_window.ui - gajim/data/gui/exception_dialog.ui - gajim/data/gui/groupchat_control.ui - gajim/data/gui/popup_notification_window.ui - gajim/data/gui/service_discovery_window.ui - gajim/data/gui/single_message_window.ui - gajim/data/gui/ssl_error_dialog.ui - gajim/data/gui/tooltip_gc_contact.ui Changes: ===================================== gajim/data/gui/data_form_window.ui deleted ===================================== @@ -1,385 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkWindow" id="data_form_fake_window"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkBox" id="data_form_vbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">3</property> - <property name="orientation">vertical</property> - <property name="spacing">3</property> - <child> - <object class="GtkLabel" id="instructions_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Fill in the form.</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkNotebook" id="data_form_types_notebook"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="show_tabs">False</property> - <property name="show_border">False</property> - <child> - <object class="GtkScrolledWindow" id="single_form_scrolledwindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="expand">True</property> - <child> - <object class="GtkViewport" id="single_form_viewport"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="resize_mode">queue</property> - <property name="shadow_type">none</property> - <child> - <placeholder/> - </child> - </object> - </child> - </object> - <packing> - <property name="tab_expand">True</property> - </packing> - </child> - <child> - <object class="GtkBox" id="multiple_form_hbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow38"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="records_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </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="GtkBox" id="buttons_vbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkButton" id="add_button"> - <property name="label">gtk-add</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="remove_button"> - <property name="label">gtk-remove</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="hseparator17"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">3</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="edit_button"> - <property name="label">gtk-edit</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="hseparator18"> - <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="padding">3</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkButton" id="up_button"> - <property name="label">gtk-go-up</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="GtkButton" id="down_button"> - <property name="label">gtk-go-down</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">6</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="hseparator19"> - <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="padding">3</property> - <property name="position">7</property> - </packing> - </child> - <child> - <object class="GtkButton" id="clear_button"> - <property name="label">gtk-clear</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">8</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="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <object class="GtkWindow" id="data_form_window"> - <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="title" translatable="yes">Group Chat Configuration</property> - <property name="default_width">650</property> - <property name="default_height">450</property> - <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_data_form_window_destroy" swapped="no"/> - <child> - <object class="GtkBox" id="vbox68"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow35"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">etched-in</property> - <child> - <object class="GtkViewport" id="viewport1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkBox" id="vbox110"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="config_vbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">5</property> - <property name="orientation">vertical</property> - <property name="spacing">5</property> - <child> - <object class="GtkLabel" id="title_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="title_hseparator"> - <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="padding">5</property> - <property name="position">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="config_hseparator"> - <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="padding">5</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="add_on_vbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">5</property> - <property name="orientation">vertical</property> - <property name="spacing">5</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButtonBox" id="hbuttonbox32"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ok_button"> - <property name="label">gtk-ok</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_ok_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> -</interface> ===================================== gajim/data/gui/exception_dialog.ui ===================================== @@ -1,14 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkApplicationWindow" id="exception_dialog"> <property name="can_focus">False</property> <property name="window_position">center</property> <property name="type_hint">dialog</property> - <child> - <placeholder/> - </child> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -26,7 +23,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">center</property> - <property name="stock">gtk-dialog-error</property> + <property name="icon_name">dialog-error</property> <property name="icon_size">6</property> </object> <packing> @@ -47,9 +44,11 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Sorry, that should not have happened</property> + <property name="wrap">True</property> + <property name="max_width_chars">30</property> + <property name="xalign">0</property> <style> <class name="large-header"/> - <class name="dim-label"/> </style> </object> <packing> @@ -68,6 +67,7 @@ By reporting this bug you might help people to fix this.</property> <property name="wrap">True</property> <property name="max_width_chars">60</property> <property name="lines">3</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -97,12 +97,11 @@ By reporting this bug you might help people to fix this.</property> <property name="layout_style">end</property> <child> <object class="GtkButton" id="close_btn"> - <property name="label">gtk-close</property> + <property name="label">_Close</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> - <property name="always_show_image">True</property> + <property name="use_underline">True</property> <signal name="clicked" handler="on_close_clicked" swapped="no"/> </object> <packing> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -166,7 +166,6 @@ <property name="height_request">48</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> </object> <packing> <property name="expand">False</property> @@ -362,7 +361,6 @@ <object class="GtkImage" id="lock_image"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-dialog-authentication</property> <property name="icon_size">1</property> </object> </child> @@ -485,7 +483,7 @@ <property name="relief">none</property> <property name="popup">formattings_menu</property> <child> - <object class="GtkImage" id="image10"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="icon_name">format-text-bold-symbolic</property> ===================================== gajim/data/gui/popup_notification_window.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkEventBox" id="eventbox"> <property name="name">NotificationPopup</property> <property name="visible">True</property> @@ -74,7 +74,7 @@ <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-close</property> + <property name="icon_name">window-close</property> <property name="icon_size">1</property> </object> </child> ===================================== gajim/data/gui/service_discovery_window.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkListStore" id="liststore1"> <columns>  @@ -16,9 +16,6 @@ <property name="default_height">550</property> <signal name="destroy" handler="_on_service_discovery_window_destroy" swapped="no"/> <signal name="key-press-event" handler="_on_key_press_event" swapped="no"/> - <child> - <placeholder/> - </child> <child> <object class="GtkBox" id="service_discovery"> <property name="width_request">400</property> @@ -37,7 +34,6 @@ <object class="GtkImage" id="banner_agent_icon"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> <property name="icon_size">6</property> </object> <packing> ===================================== gajim/data/gui/single_message_window.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -289,13 +289,13 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="close_button"> - <property name="label">gtk-close</property> + <property name="label">_Close</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> <property name="no_show_all">True</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> <signal name="clicked" handler="_on_close_clicked" swapped="no"/> </object> <packing> ===================================== gajim/data/gui/ssl_error_dialog.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkBox" id="ssl_error_box"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -28,7 +28,7 @@ <object class="GtkLabel" id="intro_text"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_right">30</property> + <property name="margin_end">30</property> <property name="margin_bottom">6</property> <property name="wrap">True</property> <property name="max_width_chars">50</property> @@ -76,8 +76,8 @@ <property name="receives_default">False</property> <property name="no_show_all">True</property> <property name="halign">start</property> - <property name="margin_left">15</property> - <property name="margin_right">15</property> + <property name="margin_start">15</property> + <property name="margin_end">15</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="_on_add_certificate_toggled" swapped="no"/> ===================================== gajim/data/gui/tooltip_gc_contact.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkGrid" id="tooltip_grid"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -10,7 +10,6 @@ <object class="GtkImage" id="avatar"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> </object> <packing> <property name="left_attach">0</property> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/08ea859ad480f0986036099fcf084b2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/08ea859ad480f0986036099fcf084b2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Events: Don’t fire signal before removing remaining events
by Philipp Hörist 26 Sep '20

26 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: df22a60c by wurstsalat at 2020-09-26T10:41:20+02:00 Events: Don’t fire signal before removing remaining events - - - - - 61de0674 by wurstsalat at 2020-09-26T10:41:20+02:00 SubscriptionRequest: Remove remaining events on block/report - - - - - 08ea859a by wurstsalat at 2020-09-26T10:41:20+02:00 Roster: Remove remaining events on block/report - - - - - 3 changed files: - gajim/common/events.py - gajim/gtk/subscription_request.py - gajim/roster_window.py Changes: ===================================== gajim/common/events.py ===================================== @@ -280,9 +280,10 @@ class Events: del self._events[account][jid] self.fire_event_removed(removed_list) return - # no event nor type given, remove them all - self.fire_event_removed(self._events[account][jid]) + # No event nor type given, remove them all + removed_list = self._events[account][jid] del self._events[account][jid] + self.fire_event_removed(removed_list) def change_jid(self, account, old_jid, new_jid): if account not in self._events: ===================================== gajim/gtk/subscription_request.py ===================================== @@ -104,12 +104,14 @@ class SubscriptionRequest(Gtk.ApplicationWindow): self._remove_contact() def _on_block_clicked(self, _widget): + app.events.remove_events(self.account, self.jid) self._deny_request() con = app.connections[self.account] con.get_module('Blocking').block([self.jid]) self._remove_contact() def _on_report_clicked(self, _widget): + app.events.remove_events(self.account, self.jid) self._deny_request() con = app.connections[self.account] con.get_module('Blocking').block([self.jid], report='spam') ===================================== gajim/roster_window.py ===================================== @@ -2638,6 +2638,7 @@ class RosterWindow: jid_list = [contact.jid for contact in l_] con.get_module('Blocking').block(jid_list, report) for contact in l_: + app.events.remove_events(acct, contact.jid) ctrl = app.interface.msg_win_mgr.get_control( contact.jid, acct) if ctrl: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c8d19f60b5aa149291768b37c4cf0e6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c8d19f60b5aa149291768b37c4cf0e6… 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 September 2020