Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Rework InvitationReceivedDialog
by Philipp Hörist 05 Apr '19

05 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 318ae4e9 by Daniel Brötzmann at 2019-04-05T18:08:00Z Rework InvitationReceivedDialog - - - - - 5 changed files: - + gajim/data/gui/groupchat_invitation_received.ui - gajim/dialogs.py - gajim/gtk/dialogs.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/data/gui/groupchat_invitation_received.ui ===================================== @@ -0,0 +1,156 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.20"/> + <object class="GtkGrid" id="grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">18</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="invitation_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label"><b>contact/jid</b> has invited you to the group chat <b>muc.jid</b></property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + <property name="max_width_chars">70</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">system-users-symbolic</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Group Chat Invitation</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">12</property> + <property name="spacing">6</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkButton" id="decline_button"> + <property name="label" translatable="yes">_Decline</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_decline_button_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="GtkButton" id="accept_button"> + <property name="label" translatable="yes">_Accept</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_accept_button_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </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">0</property> + <property name="top_attach">4</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkExpander" id="message_expander"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="margin_top">6</property> + <property name="resize_toplevel">True</property> + <child> + <object class="GtkEntry" id="decline_message"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="margin_top">6</property> + <property name="placeholder_text" translatable="yes">Message...</property> + <property name="show_emoji_icon">True</property> + </object> + </child> + <child type="label"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">6</property> + <property name="label" translatable="yes">_Message if you decline (optional)</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">decline_message</property> + <signal name="mnemonic-activate" handler="on_message_mnemonic_activate" swapped="no"/> + <style> + <class name="dim-label"/> + </style> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="comment_label"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label"><comment></property> + <property name="wrap">True</property> + <property name="max_width_chars">70</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> +</interface> ===================================== gajim/dialogs.py ===================================== @@ -910,6 +910,7 @@ class SynchroniseSelectAccountDialog: def on_destroy(widget): del app.interface.instances['import_contacts'] + class SynchroniseSelectContactsDialog: def __init__(self, account, remote_account): self.local_account = account @@ -1208,63 +1209,6 @@ class RosterItemExchangeWindow: self.window.destroy() -class InvitationReceivedDialog: - def __init__(self, account, event): - self.account = account - self.room_jid = str(event.muc) - self.from_ = str(event.from_) - self.password = event.password - self.is_continued = event.continued - - if event.from_.bareMatch(event.muc): - contact_text = event.from_.getResource() - else: - contact = app.contacts.get_first_contact_from_jid( - account, event.from_.getBare()) - if contact is None: - contact_text = str(event.from_) - else: - contact_text = contact.get_shown_name() - - pritext = _('''You are invited to a groupchat''') - #Don't translate $Contact - if self.is_continued: - sectext = _('$Contact has invited you to join a discussion') - else: - sectext = _('$Contact has invited you to group chat %(room_jid)s')\ - % {'room_jid': self.room_jid} - - sectext = sectext.replace('$Contact', contact_text) - - if event.reason: - comment = GLib.markup_escape_text(event.reason) - comment = _('Comment: %s') % comment - sectext += '\n\n%s' % comment - sectext += '\n\n' + _('Do you want to accept the invitation?') - - def on_yes(_checked, _text): - if self.is_continued: - app.interface.join_gc_room(self.account, - self.room_jid, - app.nicks[self.account], - self.password, - is_continued=True) - else: - app.interface.join_gc_minimal(self.account, - self.room_jid, - password=self.password) - - def on_no(text): - app.connections[account].get_module('MUC').decline( - self.room_jid, self.from_, text) - - dlg = YesNoDialog(pritext, - sectext, - text_label=_('Reason (if you decline):'), - on_response_yes=on_yes, - on_response_no=on_no) - dlg.set_title(_('Groupchat Invitation')) - class ProgressDialog: def __init__(self, title_text, during_text, messages_queue): """ ===================================== gajim/gtk/dialogs.py ===================================== @@ -16,6 +16,7 @@ from datetime import datetime from collections import namedtuple +from gi.repository import GLib from gi.repository import Gtk from gi.repository import Pango @@ -998,6 +999,76 @@ class ChangePasswordDialog(Gtk.Dialog): self._password2_entry.set_sensitive(True) +class InvitationReceivedDialog(Gtk.ApplicationWindow): + def __init__(self, account, event): + Gtk.ApplicationWindow.__init__(self) + self.set_name('InvitationReceivedDialog') + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_title(_('Group Chat Invitation ')) + + self._ui = get_builder('groupchat_invitation_received.ui') + self.add(self._ui.grid) + self.show_all() + self._ui.connect_signals(self) + + self.account = account + self.room_jid = str(event.muc) + self.from_ = str(event.from_) + self.password = event.password + self.is_continued = event.continued + + if event.from_.bareMatch(event.muc): + contact_text = event.from_.getResource() + else: + contact = app.contacts.get_first_contact_from_jid( + self.account, event.from_.getBare()) + if contact is None: + contact_text = str(event.from_) + else: + contact_text = contact.get_shown_name() + + # is_continued when invited from 1:1 chat + if self.is_continued: + invitation_label = _('<b>%s</b> has invited you to join ' + 'a discussion') % contact_text + else: + invitation_label = _('<b>%(contact)s</b> has invited you to the ' + 'group chat <b>%(room_jid)s</b>') % \ + {'contact': contact_text, + 'room_jid': self.room_jid} + self._ui.invitation_label.set_markup(invitation_label) + + if event.reason: + comment = GLib.markup_escape_text(event.reason) + comment = _('Comment: %s') % comment + self._ui.comment_label.show() + self._ui.comment_label.set_text(comment) + + def on_message_mnemonic_activate(self, widget, group_cycling=False): + self._ui.message_expander.set_expanded(True) + + def on_accept_button_clicked(self, widget): + if self.is_continued: + app.interface.join_gc_room(self.account, + self.room_jid, + app.nicks[self.account], + self.password, + is_continued=True) + else: + app.interface.join_gc_minimal(self.account, + self.room_jid, + password=self.password) + self.destroy() + + def on_decline_button_clicked(self, widget): + text = self._ui.decline_message.get_text() + app.connections[self.account].get_module('MUC').decline( + self.room_jid, self.from_, text) + self.destroy() + + class NewConfirmationDialog(Gtk.MessageDialog): def __init__(self, title, text, sec_text, buttons, modal=True, transient_for=None): ===================================== gajim/gui_interface.py ===================================== @@ -112,6 +112,7 @@ from gajim.gtk.dialogs import YesNoDialog from gajim.gtk.dialogs import PlainConnectionDialog from gajim.gtk.dialogs import SSLErrorDialog from gajim.gtk.dialogs import ChangeNickDialog +from gajim.gtk.dialogs import InvitationReceivedDialog from gajim.gtk.profile import ProfileWindow from gajim.gtk.join_groupchat import JoinGroupchatWindow from gajim.gtk.filechoosers import FileChooserDialog @@ -548,7 +549,7 @@ class Interface: def handle_event_gc_invitation(self, event): if helpers.allow_popup_window(event.account) or not self.systray_enabled: - dialogs.InvitationReceivedDialog(event.account, event) + InvitationReceivedDialog(event.account, event) return from_ = str(event.from_) @@ -1467,7 +1468,7 @@ class Interface: event = app.events.get_first_event(account, jid, type_) if event is None: return - dialogs.InvitationReceivedDialog(account, event) + InvitationReceivedDialog(account, event) app.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) elif type_ == 'subscription_request': ===================================== gajim/roster_window.py ===================================== @@ -73,6 +73,7 @@ from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import NonModalConfirmationDialog from gajim.gtk.dialogs import NewConfirmationCheckDialog from gajim.gtk.dialogs import DialogButton +from gajim.gtk.dialogs import InvitationReceivedDialog from gajim.gtk.join_groupchat import JoinGroupchatWindow from gajim.gtk.single_message import SingleMessageWindow from gajim.gtk.add_contact import AddNewContactWindow @@ -1977,7 +1978,7 @@ class RosterWindow: return True if event.type_ == 'gc-invitation': - dialogs.InvitationReceivedDialog(account, event) + InvitationReceivedDialog(account, event) app.events.remove_events(account, jid, event) return True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/318ae4e9d41a0dc0af65e1cbc202e93a8e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/318ae4e9d41a0dc0af65e1cbc202e93a8e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Dont send invalid presence show value
by Philipp Hörist 05 Apr '19

05 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 06782727 by Philipp Hörist at 2019-04-05T17:40:14Z Dont send invalid presence show value - - - - - 471d9ca0 by Philipp Hörist at 2019-04-05T17:43:01Z Windows: Dont override format region settings - - - - - 239ab145 by Philipp Hörist at 2019-04-05T17:44:30Z Refactor Software Version - Simplify modules because nbxmpp handles more stuff - - - - - 8 changed files: - gajim/common/connection.py - gajim/common/i18n.py - gajim/common/modules/presence.py - gajim/common/modules/software_version.py - gajim/gtk/preferences.py - gajim/gtk/server_info.py - gajim/remote_control.py - gajim/vcard.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -1486,6 +1486,9 @@ class Connection(CommonConnection, ConnectionHandlers): # Get bookmarks self.get_module('Bookmarks').request_bookmarks() + # Enable Software Version + self.get_module('SoftwareVersion').set_enabled(True) + # Get annotations self.get_module('Annotations').request_annotations() ===================================== gajim/common/i18n.py ===================================== @@ -170,7 +170,9 @@ try: if os.name == 'nt': # Set the env var on Windows because gettext.find() uses it to # find the translation - os.environ['LANG'] = LANG + # Use LANGUAGE instead of LANG, LANG sets LC_ALL and thus + # doesn't retain other region settings like LC_TIME + os.environ['LANGUAGE'] = LANG except Exception as error: print('Failed to determine default language', file=sys.stderr) import traceback ===================================== gajim/common/modules/presence.py ===================================== @@ -356,6 +356,10 @@ class Presence(BaseModule): def get_presence(self, to=None, typ=None, priority=None, show=None, status=None, nick=None, caps=True, sign=None, idle_time=None): + if show not in ('chat', 'away', 'xa', 'dnd'): + # Gajim sometimes passes invalid show values here + # until this is fixed this is a workaround + show = None presence = nbxmpp.Presence(to, typ, priority, show, status) if nick is not None: nick_tag = presence.setTag('nick', namespace=nbxmpp.NS_NICK) ===================================== gajim/common/modules/software_version.py ===================================== @@ -6,101 +6,39 @@ # # Gajim is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. # XEP-0092: Software Version -import nbxmpp -from nbxmpp.structs import StanzaHandler - from gajim.common import app from gajim.common.helpers import get_os_info -from gajim.common.nec import NetworkIncomingEvent from gajim.common.modules.base import BaseModule class SoftwareVersion(BaseModule): - def __init__(self, con): - BaseModule.__init__(self, con) - - self.handlers = [ - StanzaHandler(name='iq', - callback=self._answer_request, - typ='get', - ns=nbxmpp.NS_VERSION), - ] - def request_os_info(self, jid, resource): - if not app.account_is_connected(self._account): - return - # If we are invisible, do not request - if self._con.connected == app.SHOW_LIST.index('invisible'): - return + _nbxmpp_extends = 'SoftwareVersion' + _nbxmpp_methods = [ + 'set_software_version', + 'request_software_version', + 'disable', + ] - if resource: - jid += '/' + resource - iq = nbxmpp.Iq(to=jid, typ='get', queryNS=nbxmpp.NS_VERSION) - - self._log.info('Requested: %s', jid) - - self._con.connection.SendAndCallForResponse(iq, self._result_received) - - def _result_received(self, stanza): - client_info, os_info = None, None - if not nbxmpp.isResultNode(stanza): - self._log.info('Error: %s', stanza.getError()) - else: - try: - client_info, os_info = self._extract_info(stanza) - except Exception: - self._log.exception('Error') - self._log.error(stanza) - - self._log.info('Received: %s %s %s', - stanza.getFrom(), client_info, os_info) - - app.nec.push_incoming_event( - VersionResultReceivedEvent(None, conn=self._con, - jid=stanza.getFrom(), - client_info=client_info, - os_info=os_info)) - - @staticmethod - def _extract_info(stanza): - query = stanza.getTag('query') - name = query.getTag('name').getData() - version = query.getTag('version').getData() - client_info = '%s %s' % (name, version) - os_info = query.getTag('os') - if os_info is not None: - os_info = os_info.getData() - return client_info, os_info + def __init__(self, con): + BaseModule.__init__(self, con) - def _answer_request(self, _con, stanza, _properties): - self._log.info('%s asked for the software version', stanza.getFrom()) - if app.config.get_per('accounts', self._account, 'send_os_info'): - os_info = get_os_info() - iq = stanza.buildReply('result') - query = iq.getQuery() - query.setTagData('name', 'Gajim') - query.setTagData('version', app.version) - query.setTagData('os', os_info) - self._log.info('Answer: Gajim %s %s', app.version, os_info) + def set_enabled(self, enabled): + if enabled: + if not app.config.get_per('accounts', self._account, 'send_os_info'): + return + self._nbxmpp('SoftwareVersion').set_software_version( + 'Gajim', app.version, get_os_info()) else: - iq = stanza.buildReply('error') - err = nbxmpp.ErrorNode(nbxmpp.ERR_SERVICE_UNAVAILABLE) - iq.addChild(node=err) - self._log.info('Send service-unavailable') - self._con.connection.send(iq) - raise nbxmpp.NodeProcessed - - -class VersionResultReceivedEvent(NetworkIncomingEvent): - name = 'version-result-received' + self._nbxmpp('SoftwareVersion').disable() def get_instance(*args, **kwargs): ===================================== gajim/gtk/preferences.py ===================================== @@ -879,6 +879,8 @@ class Preferences(Gtk.ApplicationWindow): def on_send_os_info_checkbutton_toggled(self, widget): widget.set_inconsistent(False) self.on_per_account_checkbutton_toggled(widget, 'send_os_info') + for con in app.connections.values(): + con.get_module('SoftwareVersion').set_enabled(widget.get_active()) def on_ignore_events_from_unknown_contacts_checkbutton_toggled(self, widget): widget.set_inconsistent(False) ===================================== gajim/gtk/server_info.py ===================================== @@ -17,6 +17,7 @@ from collections import namedtuple from datetime import timedelta import nbxmpp +from nbxmpp.util import is_error_result from gi.repository import Gtk from gi.repository import Gdk @@ -24,6 +25,8 @@ from gajim.common import app from gajim.common import ged from gajim.common.i18n import _ +from gajim.gtk.util import ensure_not_destroyed + log = logging.getLogger('gajim.gtk.serverinfo') @@ -34,6 +37,7 @@ class ServerInfoDialog(Gtk.Dialog): destroy_with_parent=True) self.account = account + self._destroyed = False self.set_transient_for(app.interface.roster.window) self.set_resizable(False) @@ -69,10 +73,6 @@ class ServerInfoDialog(Gtk.Dialog): self.connect('response', self.on_response) self.connect('destroy', self.on_destroy) - app.ged.register_event_handler('version-result-received', - ged.CORE, - self._nec_version_result_received) - app.ged.register_event_handler('server-disco-received', ged.GUI1, self._server_disco_received) @@ -81,7 +81,8 @@ class ServerInfoDialog(Gtk.Dialog): self.uptime = '' self.hostname = app.get_hostname_from_account(account) con = app.connections[account] - con.get_module('SoftwareVersion').request_os_info(self.hostname, None) + con.get_module('SoftwareVersion').request_software_version( + self.hostname, callback=self._software_version_received) self.request_last_activity() for feature in self.get_features(): @@ -138,10 +139,12 @@ class ServerInfoDialog(Gtk.Dialog): 'days': delta.days, 'hours': hours} self.update(self.get_infos, self.info_listbox) - def _nec_version_result_received(self, obj): - if obj.jid != self.hostname: - return - self.version = obj.client_info or _('Unknown') + @ensure_not_destroyed + def _software_version_received(self, result): + if is_error_result(result): + self.version = _('Unknown') + else: + self.version = '%s %s' % (result.name, result.version) self.update(self.get_infos, self.info_listbox) def _server_disco_received(self, obj): @@ -229,11 +232,8 @@ class ServerInfoDialog(Gtk.Dialog): self.destroy() def on_destroy(self, *args): + self._destroyed = True del app.interface.instances[self.account]['server_info'] - app.ged.remove_event_handler('version-result-received', - ged.CORE, - self._nec_version_result_received) - app.ged.remove_event_handler('server-disco-received', ged.GUI1, self._server_disco_received) ===================================== gajim/remote_control.py ===================================== @@ -267,9 +267,6 @@ class GajimRemote(Server): <signal name='NewMessage'> <arg type='av' /> </signal> - <signal name='OsInfo'> - <arg type='av' /> - </signal> <signal name='Roster'> <arg type='av' /> </signal> @@ -299,8 +296,6 @@ class GajimRemote(Server): super().__init__(self.con, '/org/gajim/dbus/RemoteObject') self.first_show = True - app.ged.register_event_handler('version-result-received', ged.POSTGUI, - self.on_os_info) app.ged.register_event_handler('time-result-received', ged.POSTGUI, self.on_time) app.ged.register_event_handler('roster-info', ged.POSTGUI, @@ -346,12 +341,6 @@ class GajimRemote(Server): self.raise_signal('MessageSent', (obj.conn.name, [ obj.jid, obj.message, obj.keyID, chatstate])) - def on_os_info(self, obj): - self.raise_signal('OsInfo', (obj.conn.name, [obj.jid.getStripped(), - obj.jid.getResource(), - obj.client_info, - obj.os_info])) - def on_time(self, obj): self.raise_signal('EntityTime', (obj.conn.name, [obj.jid.getStripped(), obj.jid.getResource(), ===================================== gajim/vcard.py ===================================== @@ -33,6 +33,8 @@ from gi.repository import Gtk from gi.repository import GLib from gi.repository import Gdk from nbxmpp.structs import AnnotationNote +from nbxmpp.util import is_error_result +from nbxmpp.protocol import JID from gajim import gtkgui_helpers from gajim.gui_menu_builder import show_save_as_menu @@ -102,8 +104,6 @@ class VcardWindow: self.update_progressbar_timeout_id = GLib.timeout_add(self.update_intervall, self.update_progressbar) - app.ged.register_event_handler('version-result-received', ged.GUI1, - self.set_os_info) app.ged.register_event_handler('time-result-received', ged.GUI1, self.set_entity_time) @@ -148,8 +148,6 @@ class VcardWindow: if note is None or new_annotation != note.data: new_note = AnnotationNote(jid=self.contact.jid, data=new_annotation) con.get_module('Annotations').set_note(new_note) - app.ged.remove_event_handler('version-result-received', ged.GUI1, - self.set_os_info) app.ged.remove_event_handler('time-result-received', ged.GUI1, self.set_entity_time) @@ -263,34 +261,27 @@ class VcardWindow: self.clear_values() self._set_values(vcard, jid) - def set_os_info(self, obj): - if obj.conn.name != self.account: - return + def set_os_info(self, result, jid): if self.xml.get_object('information_notebook').get_n_pages() < 5: return - if self.gc_contact: - if obj.jid != self.contact.jid: - return - elif obj.jid.getStripped() != self.contact.jid: - return + + error = is_error_result(result) i = 0 client = '' os_info = '' while i in self.os_info: - if self.os_info[i]['resource'] == obj.jid.getResource(): - if obj.client_info: - self.os_info[i]['client'] = obj.client_info + if self.os_info[i]['resource'] == JID(jid).getResource(): + if not error: + self.os_info[i]['client'] = '%s %s' % (result.name, + result.version) else: self.os_info[i]['client'] = Q_('?Client:Unknown') - if obj.os_info: - self.os_info[i]['os'] = obj.os_info + + if not error and result.os is not None: + self.os_info[i]['os'] = result.os else: self.os_info[i]['os'] = Q_('?OS:Unknown') - else: - if not self.os_info[i]['client']: - self.os_info[i]['client'] = Q_('?Client:Unknown') - if not self.os_info[i]['os']: - self.os_info[i]['os'] = Q_('?OS:Unknown') + if i > 0: client += '\n' os_info += '\n' @@ -417,12 +408,16 @@ class VcardWindow: self.os_info_arrived = True else: # Request os info if contact is connected if self.gc_contact: - j, r = app.get_room_and_nick_from_fjid(self.real_jid) - GLib.idle_add(con.get_module('SoftwareVersion').request_os_info, - j, r) + con.get_module('SoftwareVersion').request_software_version( + self.real_jid, + callback=self.set_os_info, + user_data=self.real_jid) else: - GLib.idle_add(con.get_module('SoftwareVersion').request_os_info, - self.contact.jid, self.contact.resource) + jid = self.contact.get_full_jid() + con.get_module('SoftwareVersion').request_software_version( + jid, + callback=self.set_os_info, + user_data=jid) # do not wait for entity_time if contact is not connected or has error # additional check for observer is needed, as show is offline for him @@ -451,8 +446,9 @@ class VcardWindow: uf_resources += '\n' + c.resource + \ _(' resource with priority ') + str(c.priority) if c.show not in ('offline', 'error'): - GLib.idle_add(con.get_module('SoftwareVersion').request_os_info, - c.jid, c.resource) + jid = c.get_full_jid() + con.get_module('SoftwareVersion').request_software_version( + jid, callback=self.set_os_info, user_data=jid) GLib.idle_add(con.get_module('EntityTime').request_entity_time, c.jid, c.resource) self.os_info[i] = {'resource': c.resource, 'client': '', View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4d43eacfd07b7a4d75cdffbba3448e492… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4d43eacfd07b7a4d75cdffbba3448e492… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rework Certificate dialog
by Philipp Hörist 05 Apr '19

05 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4d43eacf by Daniel Brötzmann at 2019-04-05T15:19:35Z Rework Certificate dialog - - - - - 2 changed files: - + gajim/data/gui/certificate_dialog.ui - gajim/gtk/dialogs.py Changes: ===================================== gajim/data/gui/certificate_dialog.ui ===================================== @@ -0,0 +1,446 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.20"/> + <object class="GtkBox" id="certificate_box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="border_width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">application-certificate-symbolic</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label_cert_for_account"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label"><Certificate for account %s></property> + <property name="justify">center</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">20</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Common Name (CN)</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="data_it_common_name"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label"><></property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Organization (O)</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="data_it_organization"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label"><></property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Organizational Unit (OU)</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="data_it_organizational_unit"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label"><></property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Serial Number</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="data_it_serial_number"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label"><></property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Common Name (CN)</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="data_ib_common_name"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label"><></property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Organization (O)</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="data_ib_organization"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label"><></property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Organizational Unit (OU)</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="data_ib_organizational_unit"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label"><></property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Issued on</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">10</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="data_issued_on"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label"><></property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">10</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Expires on</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">11</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="data_expires_on"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label"><></property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">11</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">baseline</property> + <property name="label" translatable="yes">SHA-1</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">13</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">baseline</property> + <property name="margin_top">6</property> + <property name="label" translatable="yes">SHA-256</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">15</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="data_sha1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="label"><></property> + <property name="wrap">True</property> + <property name="wrap_mode">char</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">14</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="data_sha256"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="label"><></property> + <property name="wrap">True</property> + <property name="wrap_mode">char</property> + <property name="selectable">True</property> + <property name="max_width_chars">42</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">16</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">baseline</property> + <property name="margin_top">6</property> + <property name="label" translatable="yes">Issued to</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">baseline</property> + <property name="margin_top">12</property> + <property name="label" translatable="yes">Issued by</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">baseline</property> + <property name="margin_top">12</property> + <property name="label" translatable="yes">Validity</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">9</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">baseline</property> + <property name="margin_top">12</property> + <property name="label" translatable="yes">Fingerprints</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">12</property> + <property name="width">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/gtk/dialogs.py ===================================== @@ -12,6 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from datetime import datetime + from collections import namedtuple from gi.repository import Gtk @@ -23,7 +25,6 @@ from gajim.common.i18n import _ from gajim.common.const import ButtonAction from gajim.gtk.util import get_builder -from gajim.gtk.util import load_icon class DialogButton(namedtuple('DialogButton', ('response text callback args ' @@ -880,47 +881,49 @@ class DoubleInputDialog: self.cancel_handler() -class CertificatDialog(InformationDialog): +class CertificateDialog(Gtk.ApplicationWindow): def __init__(self, transient_for, account, cert): + Gtk.ApplicationWindow.__init__(self) + self.set_name('CertificateDialog') + self.set_application(app.app) + self.set_show_menubar(False) + self.set_resizable(False) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_title(_('Certificate')) + + self._ui = get_builder('certificate_dialog.ui') + self.add(self._ui.certificate_box) + issuer = cert.get_issuer() subject = cert.get_subject() - InformationDialog.__init__(self, - _('Certificate for account %s') % account, _('''<b>Issued to:</b> -Common Name (CN): %(scn)s -Organization (O): %(sorg)s -Organizationl Unit (OU): %(sou)s -Serial Number: %(sn)s - -<b>Issued by:</b> -Common Name (CN): %(icn)s -Organization (O): %(iorg)s -Organizationl Unit (OU): %(iou)s - -<b>Validity:</b> -Issued on: %(io)s -Expires on: %(eo)s - -<b>Fingerprint</b> -SHA-1 Fingerprint: %(sha1)s - -SHA-256 Fingerprint: %(sha256)s -''') % { - 'scn': subject.commonName, 'sorg': subject.organizationName, - 'sou': subject.organizationalUnitName, - 'sn': cert.get_serial_number(), 'icn': issuer.commonName, - 'iorg': issuer.organizationName, - 'iou': issuer.organizationalUnitName, - 'io': cert.get_notBefore().decode('utf-8'), - 'eo': cert.get_notAfter().decode('utf-8'), - 'sha1': cert.digest('sha1').decode('utf-8'), - 'sha256': cert.digest('sha256').decode('utf-8')}) - surface = load_icon('application-certificate', self, size=32) - if surface is not None: - img = Gtk.Image.new_from_surface(surface) - img.show_all() - self.set_image(img) + + self._ui.label_cert_for_account.set_text( + _('Certificate for account\n%s') % account) + + self._ui.data_it_common_name.set_text(subject.commonName) + self._ui.data_it_organization.set_text(subject.organizationName) + self._ui.data_it_organizational_unit.set_text( + subject.organizationalUnitName) + self._ui.data_it_serial_number.set_text(str(cert.get_serial_number())) + + self._ui.data_ib_common_name.set_text(issuer.commonName) + self._ui.data_ib_organization.set_text(issuer.organizationName) + self._ui.data_ib_organizational_unit.set_text( + issuer.organizationalUnitName) + + issued = datetime.strptime(cert.get_notBefore().decode('ascii'), '%Y%m%d%H%M%SZ') + issued = issued.strftime('%B %d, %Y, %H:%M:%S %z') + self._ui.data_issued_on.set_text(issued) + expires = datetime.strptime(cert.get_notAfter().decode('ascii'), '%Y%m%d%H%M%SZ') + expires = expires.strftime('%B %d, %Y, %H:%M:%S %z') + self._ui.data_expires_on.set_text(expires) + + self._ui.data_sha1.set_text(cert.digest('sha1').decode('utf-8')) + self._ui.data_sha256.set_text(cert.digest('sha256').decode('utf-8')) + self.set_transient_for(transient_for) - self.set_title(_('Certificate for account %s') % account) + self._ui.connect_signals(self) + self.show_all() class SSLErrorDialog(ConfirmationDialogDoubleCheck): @@ -939,7 +942,7 @@ class SSLErrorDialog(ConfirmationDialogDoubleCheck): area.pack_start(b, True, True, 0) def on_cert_clicked(self, button): - CertificatDialog(self, self.account, self.cert) + CertificateDialog(self, self.account, self.cert) class ChangePasswordDialog(Gtk.Dialog): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4d43eacfd07b7a4d75cdffbba3448e4924… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4d43eacfd07b7a4d75cdffbba3448e4924… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Only show avatar Save As menu if sha not None
by Philipp Hörist 05 Apr '19

05 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a4861063 by Daniel Brötzmann at 2019-04-03T07:08:53Z Only show avatar Save As menu if sha not None - - - - - 1 changed file: - gajim/chat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -628,7 +628,8 @@ class ChatControl(ChatControlBase): else: sha = self.gc_contact.avatar_sha name = self.gc_contact.get_shown_name() - gui_menu_builder.show_save_as_menu(sha, name) + if sha is not None: + gui_menu_builder.show_save_as_menu(sha, name) return True def on_location_eventbox_button_release_event(self, widget, event): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a48610632e9630c4c26fb551ae60f1c351… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a48610632e9630c4c26fb551ae60f1c351… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Add Software Version (XEP-0092) module
by Philipp Hörist 03 Apr '19

03 Apr '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: a161f7fa by Philipp Hörist at 2019-04-03T16:54:07Z Add Software Version (XEP-0092) module - - - - - 79330a50 by Philipp Hörist at 2019-04-03T19:30:17Z Detect direct invite correctly - - - - - 4 changed files: - nbxmpp/dispatcher.py - nbxmpp/modules/muc.py - + nbxmpp/modules/software_version.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -66,6 +66,7 @@ from nbxmpp.modules.openpgp import OpenPGP from nbxmpp.modules.omemo import OMEMO from nbxmpp.modules.annotations import Annotations from nbxmpp.modules.muclumbus import Muclumbus +from nbxmpp.modules.software_version import SoftwareVersion from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -200,6 +201,7 @@ class XMPPDispatcher(PlugIn): self._modules['OMEMO'] = OMEMO(self._owner) self._modules['Annotations'] = Annotations(self._owner) self._modules['Muclumbus'] = Muclumbus(self._owner) + self._modules['SoftwareVersion'] = SoftwareVersion(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/muc.py ===================================== @@ -82,7 +82,7 @@ class MUC: callback=self._process_direct_invite, typ='normal', ns=NS_CONFERENCE, - priority=11), + priority=12), StanzaHandler(name='message', callback=self._process_voice_request, ns=NS_DATA, @@ -90,7 +90,7 @@ class MUC: StanzaHandler(name='message', callback=self._process_message, ns=NS_MUC_USER, - priority=12), + priority=13), ] @staticmethod @@ -225,15 +225,14 @@ class MUC: if direct is None: return - muc_jid = direct.getAttr('jid') - if muc_jid is None: - # Not a direct invite + if stanza.getTag('x', namespace=NS_MUC_USER) is not None: + # not a direct invite # See https://xmpp.org/extensions/xep-0045.html#example-57 # read implementation notes return data = {} - data['muc'] = JID(muc_jid) + data['muc'] = JID(direct.getAttr('jid')) data['from_'] = properties.jid data['reason'] = direct.getAttr('reason') data['password'] = direct.getAttr('password') ===================================== nbxmpp/modules/software_version.py ===================================== @@ -0,0 +1,105 @@ +# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_VERSION +from nbxmpp.protocol import Iq +from nbxmpp.protocol import isResultNode +from nbxmpp.protocol import ErrorNode +from nbxmpp.protocol import NodeProcessed +from nbxmpp.protocol import ERR_SERVICE_UNAVAILABLE +from nbxmpp.structs import SoftwareVersionResult +from nbxmpp.structs import StanzaHandler +from nbxmpp.util import call_on_response +from nbxmpp.util import callback +from nbxmpp.util import raise_error + +log = logging.getLogger('nbxmpp.m.software_version') + + +class SoftwareVersion: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='iq', + callback=self._answer_request, + typ='get', + ns=NS_VERSION), + ] + + self._name = None + self._version = None + self._os = None + + self._enabled = False + + def disable(self): + self._enabled = False + + @call_on_response('_software_version_received') + def request_software_version(self, jid): + log.info('Request software version for %s', jid) + return Iq(typ='get', to=jid, queryNS=NS_VERSION) + + @callback + def _software_version_received(self, stanza): + if not isResultNode(stanza): + return raise_error(log.info, stanza) + + try: + return SoftwareVersionResult(*self._parse_info(stanza)) + except Exception as error: + log.warning(error) + return raise_error(log.warning, stanza, 'stanza-malformed') + + @staticmethod + def _parse_info(stanza): + name = stanza.getQueryChild('name').getData() + version = stanza.getQueryChild('version').getData() + + os_info = stanza.getQueryChild('os') + if os_info is not None: + os_info = os_info.getData() + + return name, version, os_info + + def set_software_version(self, name, version, os=None): + self._name, self._version, self._os = name, version, os + self._enabled = True + + def _answer_request(self, _con, stanza, _properties): + log.info('Request received from %s', stanza.getFrom()) + if (not self._enabled or + self._name is None or + self._version is None): + iq = stanza.buildReply('error') + iq.addChild(node=ErrorNode(ERR_SERVICE_UNAVAILABLE)) + log.info('Send service-unavailable') + + else: + iq = stanza.buildReply('result') + query = iq.getQuery() + query.setTagData('name', self._name) + query.setTagData('version', self._version) + if self._os is not None: + query.setTagData('os', self._os) + log.info('Send software version: %s %s %s', + self._name, self._version, self._os) + + self._client.send(iq) + raise NodeProcessed ===================================== nbxmpp/structs.py ===================================== @@ -104,6 +104,8 @@ MuclumbusResult = namedtuple('MuclumbusResult', 'first last max end items') MuclumbusItem = namedtuple('MuclumbusItem', 'jid name nusers description language is_open anonymity_mode') +SoftwareVersionResult = namedtuple('SoftwareVersionResult', 'name version os') + class OMEMOBundle(namedtuple('OMEMOBundle', 'spk spk_signature ik otpks')): def pick_prekey(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/6bdd04662e78d57dc015661bc… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/6bdd04662e78d57dc015661bc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] OpenPGP: Fix secret key request
by Philipp Hörist 02 Apr '19

02 Apr '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 6bdd0466 by Philipp Hörist at 2019-04-02T17:54:02Z OpenPGP: Fix secret key request - - - - - 1 changed file: - nbxmpp/modules/openpgp.py Changes: ===================================== nbxmpp/modules/openpgp.py ===================================== @@ -271,7 +271,7 @@ class OpenPGP: 'PGP secretkey has no data') try: - key = b64decode(data.getData(), return_type=bytes) + key = b64decode(data, return_type=bytes) except Exception as error: return raise_error(log.warning, stanza, 'stanza-malformed', str(error)) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/6bdd04662e78d57dc015661bcd… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/6bdd04662e78d57dc015661bcd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rework SubscriptionRequestWindow
by Philipp Hörist 02 Apr '19

02 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: e83a2467 by Daniel Brötzmann at 2019-04-02T17:49:57Z Rework SubscriptionRequestWindow - - - - - 5 changed files: - gajim/data/gui/subscription_request_window.ui - gajim/dialogs.py - + gajim/gtk/subscription_request.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/data/gui/subscription_request_window.ui ===================================== @@ -1,95 +1,143 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkMenu" id="subscription_request_popup_menu"> + <requires lib="gtk+" version="3.20"/> + <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="start_chat_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Start Chat</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_start_chat_activate" swapped="no"/> - </object> - </child> - <child> - <object class="GtkMenuItem" id="information_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label">_Information</property> - <property name="use_underline">True</property> - <signal name="activate" handler="on_contact_info_activate" swapped="no"/> - </object> - </child> + <property name="icon_name">user-available-symbolic</property> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">user-info-symbolic</property> </object> <object class="GtkBox" id="subscription_box"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">18</property> - <property name="margin_right">18</property> - <property name="margin_top">18</property> - <property name="margin_bottom">18</property> + <property name="halign">start</property> + <property name="border_width">18</property> <property name="orientation">vertical</property> - <property name="spacing">5</property> + <property name="spacing">6</property> <child> - <object class="GtkLabel" id="from_label"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="jid_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label"><XMPP address></property> + <property name="xalign">0</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="request_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label"><subscription request></property> + <property name="wrap">True</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="subscription_text"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="margin_top">6</property> + <property name="label"><subscription text> +</property> + <property name="wrap">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <attributes> + <attribute name="style" value="italic"/> + </attributes> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <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">Contact Information</property> + <property name="valign">center</property> + <property name="image">image2</property> + <signal name="clicked" handler="on_contact_info_button_clicked" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <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">Start Chat</property> + <property name="valign">center</property> + <property name="image">image1</property> + <signal name="clicked" handler="on_start_chat_button_clicked" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkScrolledWindow" id="scrolledwindow8"> - <property name="height_request">100</property> + <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="border_width">5</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTextView" id="message_textview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">False</property> - <property name="wrap_mode">word</property> - <property name="cursor_visible">False</property> - </object> - </child> + <property name="can_focus">False</property> + <property name="margin_top">12</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkButtonBox" id="hbuttonbox3"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">5</property> + <property name="halign">baseline</property> + <property name="margin_top">12</property> <property name="spacing">12</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="close_button"> - <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="use_underline">True</property> - <signal name="clicked" handler="on_close_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="homogeneous">True</property> <child> <object class="GtkButton" id="deny_button"> <property name="label" translatable="yes">_Deny</property> @@ -97,59 +145,45 @@ <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 he or she cannot know when you're connected</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_button_clicked" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkMenuButton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="popup">subscription_request_popup_menu</property> - <property name="use_popover">False</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">applications-system-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> <child> <object class="GtkButton" id="authorize_button"> - <property name="label" translatable="yes">Au_thorize</property> + <property name="label" translatable="yes">Ac_cept</property> <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 he or she can know when you're connected</property> + <property name="tooltip_text" translatable="yes">Authorize contact so the contact can know if you are connected</property> <property name="use_underline">True</property> <signal name="clicked" handler="on_authorize_button_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> + <property name="fill">True</property> + <property name="position">3</property> </packing> </child> </object> ===================================== gajim/dialogs.py ===================================== @@ -37,7 +37,6 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib -from gajim import vcard from gajim import dataforms_widget from gajim.common import ged @@ -53,7 +52,6 @@ from gajim.common.exceptions import GajimGeneralException # Compat with Gajim 1.0.3 for plugins from gajim.gtk.dialogs import * -from gajim.gtk.add_contact import AddNewContactWindow from gajim.gtk.util import get_icon_name from gajim.gtk.util import resize_window from gajim.gtk.util import get_builder @@ -842,89 +840,6 @@ class ChangeStatusMessageDialog(TimeoutDialog): self.pep_dict['mood_text']) -class SubscriptionRequestWindow(Gtk.ApplicationWindow): - def __init__(self, jid, text, account, user_nick=None): - Gtk.ApplicationWindow.__init__(self) - self.set_name('SubscriptionRequest') - self.set_application(app.app) - self.set_show_menubar(False) - self.set_resizable(False) - self.set_position(Gtk.WindowPosition.CENTER) - self.set_title(_('Subscription Request')) - - xml = get_builder('subscription_request_window.ui') - self.add(xml.get_object('subscription_box')) - self.jid = jid - self.account = account - self.user_nick = user_nick - if len(app.connections) >= 2: - prompt_text = \ - _('Subscription request for account %(account)s from %(jid)s')\ - % {'account': account, 'jid': self.jid} - else: - prompt_text = _('Subscription request from %s') % self.jid - - from_label = xml.get_object('from_label') - from_label.set_text(prompt_text) - - textview = xml.get_object('message_textview') - textview.get_buffer().set_text(text) - - self.set_default(xml.get_object('authorize_button')) - xml.connect_signals(self) - self.show_all() - - def on_subscription_request_window_destroy(self, widget): - """ - Close window - """ - if self.jid in app.interface.instances[self.account]['sub_request']: - # remove us from open windows - del app.interface.instances[self.account]['sub_request'][self.jid] - - def on_close_button_clicked(self, widget): - self.destroy() - - def on_authorize_button_clicked(self, widget): - """ - Accept the request - """ - app.connections[self.account].get_module('Presence').subscribed(self.jid) - self.destroy() - contact = app.contacts.get_contact(self.account, self.jid) - if not contact or _('Not in Roster') in contact.groups: - AddNewContactWindow(self.account, self.jid, self.user_nick) - - def on_contact_info_activate(self, widget): - """ - Ask vcard - """ - if self.jid in app.interface.instances[self.account]['infos']: - app.interface.instances[self.account]['infos'][self.jid].window.present() - else: - contact = app.contacts.create_contact(jid=self.jid, account=self.account) - app.interface.instances[self.account]['infos'][self.jid] = \ - vcard.VcardWindow(contact, self.account) - # Remove jabber page - app.interface.instances[self.account]['infos'][self.jid].xml.\ - get_object('information_notebook').remove_page(0) - - def on_start_chat_activate(self, widget): - """ - Open chat - """ - app.interface.new_chat_from_jid(self.account, self.jid) - - def on_deny_button_clicked(self, widget): - """ - Refuse the request - """ - app.connections[self.account].get_module('Presence').unsubscribed(self.jid) - contact = app.contacts.get_contact(self.account, self.jid) - if contact and _('Not in Roster') in contact.get_shown_groups(): - app.interface.roster.remove_contact(self.jid, self.account) - self.destroy() - class SynchroniseSelectAccountDialog: def __init__(self, account): # 'account' can be None if we are about to create our first one ===================================== gajim/gtk/subscription_request.py ===================================== @@ -0,0 +1,101 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import Gtk + +from gajim import vcard + +from gajim.common import app +from gajim.common.i18n import _ + +from gajim.gtk.add_contact import AddNewContactWindow +from gajim.gtk.util import get_builder + + +class SubscriptionRequestWindow(Gtk.ApplicationWindow): + def __init__(self, jid, text, account, user_nick=None): + Gtk.ApplicationWindow.__init__(self) + self.set_name('SubscriptionRequest') + self.set_application(app.app) + self.set_show_menubar(False) + self.set_resizable(False) + 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) + if len(app.connections) >= 2: + prompt_text = \ + _('Subscription request for account %(account)s from %(jid)s')\ + % {'account': 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) + + self._ui.connect_signals(self) + self.show_all() + + def on_subscription_request_window_destroy(self, widget): + """ + Close window + """ + if self.jid in app.interface.instances[self.account]['sub_request']: + # Remove us from open windows + del app.interface.instances[self.account]['sub_request'][self.jid] + + def on_authorize_button_clicked(self, widget): + """ + Accept the request + """ + app.connections[self.account].get_module('Presence').subscribed(self.jid) + self.destroy() + contact = app.contacts.get_contact(self.account, self.jid) + if not contact or _('Not in Roster') in contact.groups: + AddNewContactWindow(self.account, self.jid, self.user_nick) + + def on_contact_info_button_clicked(self, widget): + """ + Ask for vCard + """ + if self.jid in app.interface.instances[self.account]['infos']: + app.interface.instances[self.account]['infos'][self.jid].window.present() + else: + contact = app.contacts.create_contact(jid=self.jid, account=self.account) + app.interface.instances[self.account]['infos'][self.jid] = \ + vcard.VcardWindow(contact, self.account) + # Remove xmpp page + app.interface.instances[self.account]['infos'][self.jid].xml.\ + get_object('information_notebook').remove_page(0) + + def on_start_chat_button_clicked(self, widget): + """ + Open chat + """ + app.interface.new_chat_from_jid(self.account, self.jid) + + def on_deny_button_clicked(self, widget): + """ + Refuse the request + """ + app.connections[self.account].get_module('Presence').unsubscribed(self.jid) + contact = app.contacts.get_contact(self.account, self.jid) + if contact and _('Not in Roster') in contact.get_shown_groups(): + app.interface.roster.remove_contact(self.jid, self.account) + self.destroy() ===================================== gajim/gui_interface.py ===================================== @@ -119,6 +119,7 @@ from gajim.gtk.emoji_data import emoji_data from gajim.gtk.emoji_data import emoji_ascii_data from gajim.gtk.groupchat_config import GroupchatConfig from gajim.gtk.filetransfer import FileTransfersWindow +from gajim.gtk.subscription_request import SubscriptionRequestWindow from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray @@ -414,8 +415,8 @@ class Interface: if obj.jid in self.instances[account]['sub_request']: self.instances[account]['sub_request'][obj.jid].destroy() self.instances[account]['sub_request'][obj.jid] = \ - dialogs.SubscriptionRequestWindow(obj.jid, obj.status, account, - obj.user_nick) + SubscriptionRequestWindow(obj.jid, obj.status, account, + obj.user_nick) return event = events.SubscriptionRequestEvent(obj.status, obj.user_nick) @@ -1473,8 +1474,7 @@ class Interface: event = app.events.get_first_event(account, jid, type_) if event is None: return - dialogs.SubscriptionRequestWindow(jid, event.text, account, - event.nick) + SubscriptionRequestWindow(jid, event.text, account, event.nick) app.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) elif type_ == 'unsubscribed': ===================================== gajim/roster_window.py ===================================== @@ -84,6 +84,7 @@ from gajim.gtk.discovery import ServiceDiscoveryWindow from gajim.gtk.accounts import AccountsWindow from gajim.gtk.tooltips import RosterTooltip from gajim.gtk.adhoc_commands import CommandWindow +from gajim.gtk.subscription_request import SubscriptionRequestWindow from gajim.gtk.util import get_icon_name from gajim.gtk.util import resize_window from gajim.gtk.util import restore_roster_position @@ -1981,8 +1982,7 @@ class RosterWindow: return True if event.type_ == 'subscription_request': - dialogs.SubscriptionRequestWindow(jid, event.text, account, - event.nick) + SubscriptionRequestWindow(jid, event.text, account, event.nick) app.events.remove_events(account, jid, event) return True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e83a2467036884082017aa4fe232c278ae… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/e83a2467036884082017aa4fe232c278ae… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] FeaturesDialog: Replace python-dbus for avahi
by Philipp Hörist 31 Mar '19

31 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 139156ba by Philipp Hörist at 2019-03-31T19:52:22Z FeaturesDialog: Replace python-dbus for avahi - - - - - 1 changed file: - gajim/gtk/features.py Changes: ===================================== gajim/gtk/features.py ===================================== @@ -108,7 +108,7 @@ class FeaturesDialog(Gtk.Dialog): app.is_installed('ZEROCONF'), _('Enables Gajim to automatically detected clients in a ' 'local network for serverless chats'), - _('Requires: python-dbus'), + _('Requires: gir1.2-avahi-0.6'), _('Requires: pybonjour and bonjour SDK running (%(url)s)') % {'url': 'https://developer.apple.com/opensource/)'}, None), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/139156ba5ef17b6390c29b5bda775c1e05… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/139156ba5ef17b6390c29b5bda775c1e05… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update dependency check for avahi support
by Philipp Hörist 31 Mar '19

31 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 16bbe31d by André Apitzsch at 2019-03-31T17:17:34Z Update dependency check for avahi support - - - - - 1 changed file: - gajim/common/app.py Changes: ===================================== gajim/common/app.py ===================================== @@ -189,7 +189,7 @@ gajim_optional_features = {} # type: Dict[str, List[str]] caps_hash = {} # type: Dict[str, List[str]] _dependencies = { - 'PYTHON-DBUS': False, + 'AVAHI': False, 'PYBONJOUR': False, 'PYGPG': False, 'GPG_BINARY': False, @@ -208,7 +208,7 @@ def is_installed(dependency): return _dependencies['PYGPG'] and _dependencies['GPG_BINARY'] if dependency == 'ZEROCONF': # Alias for checking zeroconf libs - return _dependencies['PYTHON-DBUS'] or _dependencies['PYBONJOUR'] + return _dependencies['AVAHI'] or _dependencies['PYBONJOUR'] return _dependencies[dependency] def is_flatpak(): @@ -240,8 +240,9 @@ def detect_dependencies(): pass try: - import dbus # pylint: disable=unused-variable - _dependencies['PYTHON-DBUS'] = True + gi.require_version('Avahi', '0.6') + from gi.repository import Avahi # pylint: disable=unused-variable + _dependencies['AVAHI'] = True except Exception: pass View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/16bbe31df6c858e2cc14443042ea71314a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/16bbe31df6c858e2cc14443042ea71314a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Handle None timestring gracefully
by Philipp Hörist 31 Mar '19

31 Mar '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 414b12cb by Philipp Hörist at 2019-03-31T08:23:38Z Handle None timestring gracefully - - - - - 1 changed file: - nbxmpp/modules/date_and_time.py Changes: ===================================== nbxmpp/modules/date_and_time.py ===================================== @@ -145,6 +145,8 @@ def parse_datetime(timestring, check_utc=False, return a datetime or epoch ''' + if timestring is None: + return None if convert not in (None, 'utc', 'local'): raise TypeError('"%s" is not a valid value for convert') if check_utc: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/414b12cb028e9c5e420a1c24ed… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/414b12cb028e9c5e420a1c24ed… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits