Commits July 2020

commits@gajim.org

1 participants
77 discussions

[Git][gajim/gajim][master] SubscriptionRequest: Add block/report features
by Philipp Hörist 04 Jul '20

04 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1f8d766a by Daniel Brötzmann at 2020-07-04T12:31:35+02:00 SubscriptionRequest: Add block/report features - - - - - 2 changed files: - gajim/data/gui/subscription_request_window.ui - gajim/gtk/subscription_request.py Changes: ===================================== gajim/data/gui/subscription_request_window.ui ===================================== @@ -1,7 +1,67 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> + <object class="GtkPopoverMenu" id="deny_popover"> + <property name="can_focus">False</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkModelButton" id="deny_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="text" translatable="yes">_Deny</property> + <signal name="clicked" handler="_on_deny_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkModelButton" id="block_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="text" translatable="yes">_Block User</property> + <signal name="clicked" handler="_on_block_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkModelButton" id="report_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="text" translatable="yes">_Report as Spam</property> + <signal name="clicked" handler="_on_report_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="submenu">main</property> + <property name="position">1</property> + </packing> + </child> + </object> <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -26,22 +86,20 @@ <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="jid_label"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label"><XMPP address></property> + <property name="label">Subscription Request</property> <property name="wrap">True</property> <property name="wrap_mode">word-char</property> - <property name="max_width_chars">50</property> - <property name="xalign">0</property> <style> <class name="large-header"/> </style> </object> <packing> - <property name="left_attach">1</property> + <property name="left_attach">0</property> <property name="top_attach">0</property> + <property name="width">2</property> </packing> </child> <child> @@ -84,38 +142,35 @@ </packing> </child> <child> - <object class="GtkButton" id="contact_info_button"> + <object class="GtkButton" id="start_chat_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Contact Information</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Start Chat</property> <property name="valign">center</property> - <property name="image">image2</property> - <signal name="clicked" handler="_on_contact_info_clicked" swapped="no"/> + <property name="image">image1</property> + <signal name="clicked" handler="_on_start_chat_clicked" swapped="no"/> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkButton" id="start_chat_button"> + <object class="GtkButton" id="contact_info_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Start Chat</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Contact Information</property> <property name="valign">center</property> - <property name="image">image1</property> - <signal name="clicked" handler="_on_start_chat_clicked" swapped="no"/> + <property name="image">image2</property> + <signal name="clicked" handler="_on_contact_info_clicked" swapped="no"/> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">1</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">False</property> @@ -144,15 +199,20 @@ <property name="spacing">12</property> <property name="homogeneous">True</property> <child> - <object class="GtkButton" id="deny_button"> - <property name="label" translatable="yes">_Deny</property> + <object class="GtkMenuButton"> <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="tooltip_text" translatable="yes">Deny authorization from contact so the contact cannot know if you are connected</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="_on_deny_clicked" swapped="no"/> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="popover">deny_popover</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Deny…</property> + <property name="use_underline">True</property> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -166,9 +226,8 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Authorize contact so the contact can know if you are connected</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Allows the contact to see your online status</property> <property name="use_underline">True</property> <signal name="clicked" handler="_on_authorize_clicked" swapped="no"/> <style> @@ -178,7 +237,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> </object> ===================================== gajim/gtk/subscription_request.py ===================================== @@ -13,6 +13,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from gi.repository import Gtk +from gi.repository import Gdk from gajim import vcard @@ -33,25 +34,38 @@ class SubscriptionRequest(Gtk.ApplicationWindow): self.set_position(Gtk.WindowPosition.CENTER) self.set_title(_('Subscription Request')) - self._ui = get_builder('subscription_request_window.ui') - self.add(self._ui.subscription_box) self.jid = jid self.account = account self.user_nick = user_nick - self._ui.jid_label.set_text(self.jid) + + self._ui = get_builder('subscription_request_window.ui') + self.add(self._ui.subscription_box) + self._ui.authorize_button.grab_default() + if len(app.connections) >= 2: - prompt_text = \ - _('Subscription request for account %(account)s from %(jid)s')\ - % {'account': account, 'jid': self.jid} + prompt_text = _( + 'Subscription request for account %(account)s from ' + '%(jid)s') % {'account': self.account, 'jid': self.jid} else: prompt_text = _('Subscription request from %s') % self.jid self._ui.request_label.set_text(prompt_text) self._ui.subscription_text.set_text(text) + con = app.connections[self.account] + if con.get_module('Blocking').supported: + self._ui.block_button.set_sensitive(True) + self._ui.report_button.set_sensitive(True) + + self.connect('key-press-event', self._on_key_press) + self._ui.connect_signals(self) self.show_all() + def _on_key_press(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() + def _on_authorize_clicked(self, _widget): """ Accept the request @@ -86,12 +100,28 @@ class SubscriptionRequest(Gtk.ApplicationWindow): app.interface.new_chat_from_jid(self.account, self.jid) def _on_deny_clicked(self, _widget): - """ - Refuse the request - """ + self._deny_request() + self._remove_contact() + + def _on_block_clicked(self, _widget): + self._deny_request() + con = app.connections[self.account] + con.get_module('Blocking').block([self.jid]) + self._remove_contact() + + def _on_report_clicked(self, _widget): + self._deny_request() + con = app.connections[self.account] + con.get_module('Blocking').block([self.jid], report='spam') + self._remove_contact() + + def _deny_request(self): con = app.connections[self.account] con.get_module('Presence').unsubscribed(self.jid) + + def _remove_contact(self): contact = app.contacts.get_contact(self.account, self.jid) if contact and _('Not in contact list') in contact.get_shown_groups(): - app.interface.roster.remove_contact(self.jid, self.account) + app.interface.roster.remove_contact( + self.jid, self.account, force=True, backend=True) self.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1f8d766ae8949ed4fb5cbec669978bde… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1f8d766ae8949ed4fb5cbec669978bde… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Preferences: Fix tooltip string for auto copy
by Philipp Hörist 03 Jul '20

03 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: eb86de45 by Daniel Brötzmann at 2020-07-03T22:41:06+02:00 Preferences: Fix tooltip string for auto copy - - - - - ccb2676b by Daniel Brötzmann at 2020-07-03T22:41:06+02:00 MessageWindow: Fix deprecated properties, don’t expand label - - - - - 2 changed files: - gajim/data/gui/message_window.ui - gajim/data/gui/preferences_window.ui Changes: ===================================== gajim/data/gui/message_window.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkEventBox" id="chat_tab_ebox"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -17,7 +17,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="stock">gtk-missing-image</property> </object> <packing> <property name="expand">False</property> @@ -30,8 +29,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="margin_left">3</property> - <property name="hexpand">True</property> + <property name="margin_start">3</property> <property name="use_markup">True</property> <property name="ellipsize">end</property> <property name="single_line_mode">True</property> @@ -48,17 +46,16 @@ </child> <child> <object class="GtkButton" id="tab_close_button"> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="halign">end</property> <property name="relief">none</property> <child> - <object class="GtkImage" id="image1329"> + <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> @@ -78,9 +75,6 @@ <property name="default_width">480</property> <property name="default_height">440</property> <property name="show_menubar">False</property> - <child type="titlebar"> - <placeholder/> - </child> <child> <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> @@ -88,5 +82,8 @@ <property name="scrollable">True</property> </object> </child> + <child type="titlebar"> + <placeholder/> + </child> </object> </interface> ===================================== gajim/data/gui/preferences_window.ui ===================================== @@ -585,7 +585,7 @@ <property name="label" translatable="yes">Enable auto copy</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If enabled, selecting Text will be copied to the clipboard, otherwise you can copy text with CTRL + SHIFT + C</property> + <property name="tooltip_text" translatable="yes">If enabled, selected text will automatically be copied to the clipboard, otherwise you can copy text with CTRL + SHIFT + C</property> <property name="halign">start</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/67f854f95dc1a102bec5d46e652298b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/67f854f95dc1a102bec5d46e652298b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Blocking: Add XEP-0377 Spam Reporting
by Philipp Hörist 03 Jul '20

03 Jul '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 496d79a3 by Daniel Brötzmann at 2020-07-03T10:27:35+02:00 Blocking: Add XEP-0377 Spam Reporting - - - - - 2 changed files: - nbxmpp/modules/blocking.py - nbxmpp/namespaces.py Changes: ===================================== nbxmpp/modules/blocking.py ===================================== @@ -56,12 +56,16 @@ class Blocking(BaseModule): return BlockingListResult(blocking_list=blocked) @call_on_response('_default_response') - def block(self, jids): + def block(self, jids, report=None): self._log.info('Block: %s', jids) iq = Iq('set', Namespace.BLOCKING) query = iq.setQuery(name='block') for jid in jids: - query.addChild(name='item', attrs={'jid': jid}) + item = query.addChild(name='item', attrs={'jid': jid}) + if report in ('spam', 'abuse'): + action = item.addChild(name='report', + namespace=Namespace.REPORTING) + action.setTag(report) return iq @call_on_response('_default_response') ===================================== nbxmpp/namespaces.py ===================================== @@ -128,6 +128,7 @@ class _Namespaces: RECEIPTS: str = 'urn:xmpp:receipts' REGISTER: str = 'jabber:iq:register' REGISTER_FEATURE: str = 'http://jabber.org/features/iq-register' + REPORTING: str = 'urn:xmpp:reporting:0' ROSTER: str = 'jabber:iq:roster' ROSTERNOTES: str = 'storage:rosternotes' ROSTERX: str = 'http://jabber.org/protocol/rosterx' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/496d79a39c81b272fc1c878c… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/496d79a39c81b272fc1c878c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MusicTrackListener: Catch all errors
by Philipp Hörist 03 Jul '20

03 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 67f854f9 by André Apitzsch at 2020-07-03T17:08:57+02:00 MusicTrackListener: Catch all errors Fixes #10164. - - - - - 1 changed file: - gajim/common/dbus/music_track.py Changes: ===================================== gajim/common/dbus/music_track.py ===================================== @@ -85,10 +85,8 @@ class MusicTrackListener: -1, None) except GLib.Error as error: - if error.domain == 'g-dbus-error-quark': - log.debug("Could not list names: %s", error.message) - return - raise + log.debug("Could not list names: %s", error.message) + return for name in result[0]: if name.startswith(MPRIS_PLAYER_PREFIX): @@ -199,12 +197,10 @@ class MusicTrackListener: -1, None) except GLib.Error as error: - if error.domain == 'g-dbus-error-quark': - log.debug("Could not enable music listener: %s", error.message) - return None - raise - else: - return self._get_music_info(result[0]) + log.debug("Could not enable music listener: %s", error.message) + return None + + return self._get_music_info(result[0]) def enable(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/67f854f95dc1a102bec5d46e652298b2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/67f854f95dc1a102bec5d46e652298b2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Determine correctly if block/unblock menuitem is shown
by Philipp Hörist 02 Jul '20

02 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: c647828e by lovetox at 2020-07-02T23:48:52+02:00 Determine correctly if block/unblock menuitem is shown - - - - - 1 changed file: - gajim/gui_menu_builder.py Changes: ===================================== gajim/gui_menu_builder.py ===================================== @@ -397,7 +397,7 @@ control=None, gc_contact=None, is_anonymous=True): if helpers.jid_is_blocked(account, jid): block_menuitem.set_no_show_all(True) block_menuitem.hide() - if transport != 'jabber': + if transport not in ('jabber', None): unblock_menuitem.set_no_show_all(True) unblock_menuitem.hide() unignore_menuitem.set_no_show_all(False) @@ -409,7 +409,7 @@ control=None, gc_contact=None, is_anonymous=True): else: unblock_menuitem.set_no_show_all(True) unblock_menuitem.hide() - if transport != 'jabber': + if transport not in ('jabber', None): block_menuitem.set_no_show_all(True) block_menuitem.hide() ignore_menuitem.set_no_show_all(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c647828e80c63c14e8e89335c9da8757… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c647828e80c63c14e8e89335c9da8757… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Interface: Store password with correct backend
by Philipp Hörist 02 Jul '20

02 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: b7671671 by lovetox at 2020-07-02T22:48:28+02:00 Interface: Store password with correct backend On account creation use the passwords module to store the password correctly - - - - - 73d1350b by lovetox at 2020-07-02T22:50:39+02:00 Remove comment - - - - - 30bfc9eb by lovetox at 2020-07-02T23:08:39+02:00 CertStore: Add cert to cache on add_certificate() Otherwise the cert is only available after a restart Fixes #10160 - - - - - 2 changed files: - gajim/common/cert_store.py - gajim/gui_interface.py Changes: ===================================== gajim/common/cert_store.py ===================================== @@ -62,6 +62,7 @@ class CertificateStore: def add_certificate(self, certificate): log.info('Add certificate to trust store') + self._certs.append(certificate) pem = certificate.props.certificate_pem path = self._get_random_path() write_file_async(path, ===================================== gajim/gui_interface.py ===================================== @@ -1521,7 +1521,6 @@ class Interface: '%s@%s' % (username, domain)) config['hostname'] = domain config['savepass'] = True - config['password'] = password config['anonymous_auth'] = anonymous config['autoconnect'] = True config['sync_with_global_status'] = True @@ -1542,10 +1541,14 @@ class Interface: for opt in config: app.config.set_per('accounts', account, opt, config[opt]) + # Password module depends on existing config + passwords.save_password(account, password) + app.css_config.refresh() - # refresh accounts window + # Action must be added before account window is updated app.app.add_account_actions(account) + window = get_app_window('AccountsWindow') if window is not None: window.add_account(account) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3e1dcf0178bdd4fc1683e3287d2b8cf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3e1dcf0178bdd4fc1683e3287d2b8cf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MamPreferences: Correctly display preference state for JID
by Philipp Hörist 01 Jul '20

01 Jul '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3e1dcf01 by lovetox at 2020-07-01T20:04:49+02:00 MamPreferences: Correctly display preference state for JID - - - - - 1 changed file: - gajim/gtk/mam_preferences.py Changes: ===================================== gajim/gtk/mam_preferences.py ===================================== @@ -78,10 +78,10 @@ class MamPreferences(Gtk.ApplicationWindow, EventHelper): self._ui.default_combo.set_active_id(result.default) self._ui.preferences_store.clear() for jid in result.always: - self._ui.preferences_store.append((str(jid), 'Always')) + self._ui.preferences_store.append((str(jid), True)) for jid in result.never: - self._ui.preferences_store.append((str(jid), 'Never')) + self._ui.preferences_store.append((str(jid), False)) @ensure_not_destroyed def _mam_prefs_saved(self, result): @@ -137,8 +137,8 @@ class MamPreferences(Gtk.ApplicationWindow, EventHelper): never = [] default = self._ui.default_combo.get_active_id() for item in self._ui.preferences_store: - jid, type_ = item - if type_ == 'Always': + jid, archive = item + if archive: always.append(jid) else: never.append(jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3e1dcf0178bdd4fc1683e3287d2b8cf9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3e1dcf0178bdd4fc1683e3287d2b8cf9… 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 2020