Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 5 commits: RosterTooltip: Improve string length for name, jid, and status
by Philipp Hörist 13 Dec '19

13 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ae4276a3 by Daniel Brötzmann at 2019-12-13T13:43:41Z RosterTooltip: Improve string length for name, jid, and status Applies ellipsizing on strings for name, jid, and status messages. Overly long group chat topics will be shortened as well. - - - - - ee3860e0 by Daniel Brötzmann at 2019-12-13T13:43:41Z RosterTooltip: Shorten contact status messages for multiple resources This shortens status messages correctly if there is more than one resource. Additionally, this always adds a new line for status messages to keep the tooltip's width small. - - - - - a378b6b7 by Daniel Brötzmann at 2019-12-13T13:43:42Z GCTooltip: Improve name, jid, and status formatting - - - - - 98f2e2f6 by Daniel Brötzmann at 2019-12-13T13:43:42Z RosterTooltip: Add hint for Observers group - - - - - 8adb6ce3 by Daniel Brötzmann at 2019-12-13T13:43:42Z RosterTooltip: Use group chat description for status - - - - - 4 changed files: - gajim/data/gui/tooltip_gc_contact.ui - gajim/data/gui/tooltip_roster_contact.ui - gajim/gtk/tooltips.py - gajim/roster_window.py Changes: ===================================== gajim/data/gui/tooltip_gc_contact.ui ===================================== @@ -24,6 +24,9 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="hexpand">True</property> + <property name="ellipsize">end</property> + <property name="single_line_mode">True</property> + <property name="max_width_chars">36</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -40,6 +43,8 @@ <property name="halign">start</property> <property name="valign">start</property> <property name="ellipsize">end</property> + <property name="single_line_mode">True</property> + <property name="max_width_chars">25</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -84,7 +89,9 @@ <property name="valign">start</property> <property name="wrap">True</property> <property name="wrap_mode">word-char</property> - <property name="max_width_chars">25</property> + <property name="ellipsize">end</property> + <property name="max_width_chars">40</property> + <property name="lines">3</property> <property name="xalign">0</property> <attributes> <attribute name="style" value="italic"/> ===================================== gajim/data/gui/tooltip_roster_contact.ui ===================================== @@ -42,6 +42,8 @@ <property name="halign">start</property> <property name="valign">start</property> <property name="hexpand">True</property> + <property name="ellipsize">end</property> + <property name="max_width_chars">36</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -216,7 +218,9 @@ <property name="valign">start</property> <property name="wrap">True</property> <property name="wrap_mode">word-char</property> - <property name="max_width_chars">25</property> + <property name="ellipsize">end</property> + <property name="max_width_chars">40</property> + <property name="lines">3</property> <property name="xalign">0</property> <attributes> <attribute name="style" value="italic"/> @@ -233,8 +237,9 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="valign">start</property> - <property name="use_markup">True</property> <property name="ellipsize">end</property> + <property name="single_line_mode">True</property> + <property name="max_width_chars">25</property> <style> <class name="large-header"/> </style> ===================================== gajim/gtk/tooltips.py ===================================== @@ -73,30 +73,21 @@ class StatusTable: self.text_label = Gtk.Label() self.text_label.set_line_wrap(True) self.text_label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) - self.text_label.set_max_width_chars(25) + self.text_label.set_lines(3) + self.text_label.set_ellipsize(Pango.EllipsizeMode.END) + self.text_label.set_max_width_chars(30) self.text_label.set_halign(Gtk.Align.START) self.text_label.set_valign(Gtk.Align.START) + self.text_label.set_xalign(0) self.text_label.set_selectable(False) - self.text_label.set_markup(text) + + self.text_label.set_text(text) self.table.attach(self.text_label, 1 + col_inc, self.current_row, 3 - col_inc, 1) self.current_row += 1 - @staticmethod - def get_status_info(resource, priority, _show, status): - str_status = resource + ' (' + str(priority) + ')' - if status: - status = status.strip() - if status != '': - # reduce to 100 chars, 1 line - status = helpers.reduce_chars_newlines(status, 100, 1) - str_status = GLib.markup_escape_text(str_status) - status = GLib.markup_escape_text(status) - str_status += ' - <i>' + status + '</i>' - return str_status - def add_status_row(self, show, str_status, show_lock=False, indent=True, transport=None): """ @@ -113,10 +104,15 @@ class StatusTable: self.table.attach(spacer, 1, self.current_row, 1, 1) self.table.attach(image, 2, self.current_row, 1, 1) status_label = Gtk.Label() - status_label.set_markup(str_status) + status_label.set_text(str_status) status_label.set_halign(Gtk.Align.START) status_label.set_valign(Gtk.Align.START) + status_label.set_xalign(0) status_label.set_line_wrap(True) + status_label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) + status_label.set_lines(3) + status_label.set_ellipsize(Pango.EllipsizeMode.END) + status_label.set_max_width_chars(30) self.table.attach(status_label, 3, self.current_row, 1, 1) if show_lock: lock_image = Gtk.Image() @@ -346,25 +342,15 @@ class RosterTooltip(StatusTable): return self.contact_jid = self.prim_contact.jid name = GLib.markup_escape_text(self.prim_contact.get_shown_name()) - name_markup = '<b>{}</b>'.format(name) + if app.config.get('mergeaccounts'): color = app.config.get('tooltip_account_name_color') account_name = GLib.markup_escape_text( self.prim_contact.account.name) - name_markup += " <span foreground='{}'>({})</span>".format( + name += " <span foreground='{}'>({})</span>".format( color, account_name) - if account and helpers.jid_is_blocked(account, self.prim_contact.jid): - name_markup += _(' [blocked]') - - try: - controls = app.interface.minimized_controls[account] - if self.prim_contact.jid in controls: - name_markup += _(' [minimized]') - except KeyError: - pass - - self._ui.name.set_markup(name_markup) + self._ui.name.set_markup(name) self._ui.name.show() self.num_resources = 0 @@ -387,27 +373,26 @@ class RosterTooltip(StatusTable): for priority in contact_keys: for acontact in contacts_dict[priority]: show = self._get_icon_name_for_tooltip(acontact) - if acontact.status and len(acontact.status) > 25: - status = '' - add_text = True - else: - status = acontact.status - add_text = False - - status_line = self.get_status_info( - acontact.resource, - acontact.priority, - acontact.show, - status) - self.add_status_row(show, status_line, transport=transport) - if add_text: - self.add_text_row(acontact.status, 2) + status = acontact.status + resource_line = '%s (%s)' % (acontact.resource, + str(acontact.priority)) + self.add_status_row( + show, resource_line, transport=transport) + if status: + self.add_text_row(status, 2) self._ui.tooltip_grid.attach(self.table, 1, 3, 2, 1) self.table.show_all() else: # only one resource - if contact.show and contact.status: + if contact.is_groupchat: + disco_info = app.logger.get_last_disco_info(contact.jid) + if disco_info is not None: + description = disco_info.muc_description + if description: + self._ui.status.set_text(description) + self._ui.status.show() + elif contact.show and contact.status: status = contact.status.strip() if status: self._ui.status.set_text(status) ===================================== gajim/roster_window.py ===================================== @@ -5357,7 +5357,9 @@ class RosterWindow: def query_tooltip(self, widget, x_pos, y_pos, _keyboard_mode, tooltip): try: - row = widget.get_path_at_pos(x_pos, y_pos)[0] + path = widget.get_path_at_pos(x_pos, y_pos) + row = path[0] + col = path[1] except TypeError: self._roster_tooltip.clear_tooltip() return False @@ -5378,6 +5380,15 @@ class RosterWindow: jid = model[iter_][Column.JID] connected_contacts = [] + if typ == 'group': + if jid == _('Observers'): + widget.set_tooltip_cell(tooltip, row, col, None) + tooltip.set_text( + _('Observers can see your status, but you ' + 'are not allowed to see theirs')) + return True + return False + if typ in ('contact', 'self_contact'): contacts = app.contacts.get_contacts(account, jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2b98092681fe46451afad821d8039c8be… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2b98092681fe46451afad821d8039c8be… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Zeroconf: Catch all exceptions in test_bonjour()
by Philipp Hörist 12 Dec '19

12 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2b980926 by Philipp Hörist at 2019-12-12T20:44:27Z Zeroconf: Catch all exceptions in test_bonjour() Fixes #9926 - - - - - 1 changed file: - gajim/common/zeroconf/zeroconf.py Changes: ===================================== gajim/common/zeroconf/zeroconf.py ===================================== @@ -48,9 +48,7 @@ def test_avahi(): def test_bonjour(): try: import pybonjour # pylint: disable=unused-import - except ImportError: - return False - except WindowsError: # pylint: disable=undefined-variable + except Exception: return False return True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2b98092681fe46451afad821d8039c8bec… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2b98092681fe46451afad821d8039c8bec… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] XMLConsole: Close search bar first when pressing Esc
by Philipp Hörist 11 Dec '19

11 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: d485535c by Daniel Brötzmann at 2019-12-11T11:58:22Z XMLConsole: Close search bar first when pressing Esc - - - - - 1 changed file: - gajim/gtk/xml_console.py Changes: ===================================== gajim/gtk/xml_console.py ===================================== @@ -116,6 +116,9 @@ class XMLConsoleWindow(Gtk.ApplicationWindow, EventHelper): def _on_key_press_event(self, _widget, event): if event.keyval == Gdk.KEY_Escape: + if self._ui.search_revealer.get_child_revealed(): + self._ui.search_revealer.set_reveal_child(False) + return self.destroy() if (event.get_state() & Gdk.ModifierType.CONTROL_MASK and event.keyval == Gdk.KEY_Return or View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d485535c975bfa10f79ae8c6ca902c2482… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d485535c975bfa10f79ae8c6ca902c2482… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] OMEMO: Correctly parse empty devicelist nodes
by Philipp Hörist 11 Dec '19

11 Dec '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ed895375 by Philipp Hörist at 2019-12-11T20:14:53Z OMEMO: Correctly parse empty devicelist nodes Fixes #94 - - - - - 1 changed file: - nbxmpp/modules/omemo.py Changes: ===================================== nbxmpp/modules/omemo.py ===================================== @@ -209,6 +209,8 @@ class OMEMO: pubsub_node = stanza.getTag('pubsub') items_node = pubsub_node.getTag('items') item = items_node.getTag('item') + if item is None: + return None try: return self._parse_devicelist(item) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ed895375da7c8c4471c385cd78… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/ed895375da7c8c4471c385cd78… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Bytestream: Simplify event code
by Philipp Hörist 10 Dec '19

10 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: e00dad0b by Philipp Hörist at 2019-12-10T22:12:48Z Bytestream: Simplify event code - - - - - 1b1ca88c by Philipp Hörist at 2019-12-10T22:18:10Z Interface: Simplify event code - - - - - 3 changed files: - gajim/common/connection_handlers_events.py - gajim/common/modules/bytestream.py - gajim/gui_interface.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -168,21 +168,6 @@ class FileRequestReceivedEvent(nec.NetworkIncomingEvent): self.file_props.transfered_size = [] return True -class FileRequestErrorEvent(nec.NetworkIncomingEvent): - name = 'file-request-error' - - def generate(self): - self.jid = app.get_jid_without_resource(self.jid) - return True - -class FileTransferCompletedEvent(nec.NetworkIncomingEvent): - name = 'file-transfer-completed' - - def generate(self): - jid = str(self.file_props.receiver) - self.jid = app.get_jid_without_resource(jid) - return True - class NotificationEvent(nec.NetworkIncomingEvent): name = 'notification' base_network_events = ['decrypted-message-received', ===================================== gajim/common/modules/bytestream.py ===================================== @@ -36,8 +36,8 @@ from gajim.common import helpers from gajim.common import jingle_xtls from gajim.common.file_props import FilesProp from gajim.common.socks5 import Socks5SenderClient +from gajim.common.nec import NetworkEvent from gajim.common.modules.base import BaseModule -from gajim.common.connection_handlers_events import FileRequestErrorEvent log = logging.getLogger('gajim.c.m.bytestream') @@ -218,12 +218,12 @@ class Bytestream(BaseModule): if contact.get_full_jid() == receiver_jid: file_props.error = -5 self.remove_transfer(file_props) - app.nec.push_incoming_event(FileRequestErrorEvent( - None, - conn=self._con, - jid=contact.jid, - file_props=file_props, - error_msg='')) + app.nec.push_incoming_event( + NetworkEvent('file-request-error', + conn=self._con, + jid=app.get_jid_without_resource(contact.jid), + file_props=file_props, + error_msg='')) sender_jid = file_props.sender if contact.get_full_jid() == sender_jid: file_props.error = -3 @@ -273,12 +273,12 @@ class Bytestream(BaseModule): self._result_socks5_sid, file_props) if not listener: file_props.error = -5 - app.nec.push_incoming_event(FileRequestErrorEvent( - None, - conn=self._con, - jid=receiver, - file_props=file_props, - error_msg='')) + app.nec.push_incoming_event( + NetworkEvent('file-request-error', + conn=self._con, + jid=app.get_jid_without_resource(receiver), + file_props=file_props, + error_msg='')) self._connect_error(file_props.sid, error='not-acceptable', error_type='modify') @@ -524,12 +524,12 @@ class Bytestream(BaseModule): if msg: self.disconnect_transfer(file_props) file_props.error = -3 - app.nec.push_incoming_event(FileRequestErrorEvent( - None, - conn=self._con, - jid=to, - file_props=file_props, - error_msg=msg)) + app.nec.push_incoming_event( + NetworkEvent('file-request-error', + conn=self._con, + jid=app.get_jid_without_resource(to), + file_props=file_props, + error_msg=msg)) def _proxy_auth_ok(self, proxy): """ @@ -559,12 +559,12 @@ class Bytestream(BaseModule): if not file_props: return file_props.error = -4 - app.nec.push_incoming_event(FileRequestErrorEvent( - None, - conn=self._con, - jid=jid, - file_props=file_props, - error_msg='')) + app.nec.push_incoming_event( + NetworkEvent('file-request-error', + conn=self._con, + jid=app.get_jid_without_resource(jid), + file_props=file_props, + error_msg='')) raise nbxmpp.NodeProcessed def _on_bytestream_set(self, con, iq_obj): ===================================== gajim/gui_interface.py ===================================== @@ -77,8 +77,7 @@ from gajim.common import logging_helpers from gajim.common.structs import MUCData from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ -from gajim.common.connection_handlers_events import ( - OurShowEvent, FileTransferCompletedEvent) +from gajim.common.connection_handlers_events import OurShowEvent from gajim.common.modules.httpupload import HTTPUploadProgressEvent from gajim.common.connection import Connection @@ -637,8 +636,12 @@ class Interface: if file_props.error == 0: ft.set_progress( file_props.type_, file_props.sid, file_props.received_len) + jid = app.get_jid_without_resource(str(file_props.receiver)) app.nec.push_incoming_event( - FileTransferCompletedEvent(None, file_props=file_props)) + NetworkEvent('file-transfer-completed', + file_props=file_props, + jid=jid)) + else: ft.set_status(file_props, 'stop') if not file_props.completed and (file_props.stalled or View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/294eece25bcf57ebc6e0ad86311fc0a14… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/294eece25bcf57ebc6e0ad86311fc0a14… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Jingle: Simplify event code
by Philipp Hörist 10 Dec '19

10 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 294eece2 by Philipp Hörist at 2019-12-10T21:57:12Z Jingle: Simplify event code - - - - - 3 changed files: - gajim/common/connection_handlers_events.py - gajim/common/jingle_session.py - gajim/gui_interface.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -57,51 +57,6 @@ class OurShowEvent(nec.NetworkIncomingEvent): class MessageSentEvent(nec.NetworkIncomingEvent): name = 'message-sent' -class JingleRequestReceivedEvent(nec.NetworkIncomingEvent): - name = 'jingle-request-received' - - def generate(self): - self.fjid = self.jingle_session.peerjid - self.jid, self.resource = app.get_room_and_nick_from_fjid(self.fjid) - self.sid = self.jingle_session.sid - return True - -class JingleConnectedReceivedEvent(nec.NetworkIncomingEvent): - name = 'jingle-connected-received' - - def generate(self): - self.fjid = self.jingle_session.peerjid - self.jid, self.resource = app.get_room_and_nick_from_fjid(self.fjid) - self.sid = self.jingle_session.sid - return True - -class JingleDisconnectedReceivedEvent(nec.NetworkIncomingEvent): - name = 'jingle-disconnected-received' - - def generate(self): - self.fjid = self.jingle_session.peerjid - self.jid, self.resource = app.get_room_and_nick_from_fjid(self.fjid) - self.sid = self.jingle_session.sid - return True - -class JingleTransferCancelledEvent(nec.NetworkIncomingEvent): - name = 'jingleFT-cancelled-received' - - def generate(self): - self.fjid = self.jingle_session.peerjid - self.jid, self.resource = app.get_room_and_nick_from_fjid(self.fjid) - self.sid = self.jingle_session.sid - return True - -class JingleErrorReceivedEvent(nec.NetworkIncomingEvent): - name = 'jingle-error-received' - - def generate(self): - self.fjid = self.jingle_session.peerjid - self.jid, self.resource = app.get_room_and_nick_from_fjid(self.fjid) - self.sid = self.jingle_session.sid - return True - class NewAccountConnectedEvent(nec.NetworkIncomingEvent): name = 'new-account-connected' ===================================== gajim/common/jingle_session.py ===================================== @@ -33,13 +33,13 @@ from enum import Enum, unique import nbxmpp from gajim.common import app -from gajim.common.jingle_transport import get_jingle_transport, JingleTransportIBB -from gajim.common.jingle_content import get_jingle_content, JingleContentSetupException +from gajim.common.jingle_transport import get_jingle_transport +from gajim.common.jingle_transport import JingleTransportIBB +from gajim.common.jingle_content import get_jingle_content +from gajim.common.jingle_content import JingleContentSetupException from gajim.common.jingle_ft import State -from gajim.common.connection_handlers_events import ( - FilesProp, JingleRequestReceivedEvent, JingleDisconnectedReceivedEvent, - JingleTransferCancelledEvent, JingleConnectedReceivedEvent, - JingleErrorReceivedEvent) +from gajim.common.connection_handlers_events import FilesProp +from gajim.common.nec import NetworkEvent log = logging.getLogger("app.c.jingle_session") @@ -469,9 +469,9 @@ class JingleSession: if (creator, name) in self.contents: content = self.contents[(creator, name)] # TODO: this will fail if content is not an RTP content - app.nec.push_incoming_event(JingleDisconnectedReceivedEvent( - None, conn=self.connection, jingle_session=self, - media=content.media, reason='removed')) + self._raise_event('jingle-disconnected-received', + media=content.media, + reason='removed') content.destroy() if not self.contents: reason = nbxmpp.Node('reason') @@ -507,10 +507,7 @@ class JingleSession: # self.add_content(name, content, creator) # self.__content_reject(content) # self.contents[(content.creator, content.name)].destroy() - app.nec.push_incoming_event(JingleRequestReceivedEvent(None, - conn=self.connection, - jingle_session=self, - contents=contents)) + self._raise_event('jingle-request-received', contents=contents) def __on_session_initiate(self, stanza, jingle, error, action): """ @@ -572,10 +569,7 @@ class JingleSession: self.state = JingleStates.PENDING # Send event about starting a session - app.nec.push_incoming_event(JingleRequestReceivedEvent(None, - conn=self.connection, - jingle_session=self, - contents=contents[0])) + self._raise_event('jingle-ft-cancelled-received', contents=contents[0]) def __broadcast(self, stanza, jingle, error, action): """ @@ -612,11 +606,9 @@ class JingleSession: # TODO text = reason if reason == 'cancel' and self.session_type_ft: - app.nec.push_incoming_event(JingleTransferCancelledEvent(None, - conn=self.connection, - jingle_session=self, - media=None, - reason=text)) + self._raise_event('jingle-ft-cancelled-received', + media=None, + reason=text) def __broadcast_all(self, stanza, jingle, error, action): """ @@ -663,10 +655,7 @@ class JingleSession: if text: text = '%s (%s)' % (error, text) if type_ != 'modify': - app.nec.push_incoming_event(JingleErrorReceivedEvent(None, - conn=self.connection, - jingle_session=self, - reason=text or error)) + self._raise_event('jingle-error-received', reason=text or error) @staticmethod def __reason_from_stanza(stanza): @@ -781,11 +770,9 @@ class JingleSession: else: text = reason self.connection.get_module('Jingle').delete_jingle_session(self.sid) - app.nec.push_incoming_event(JingleDisconnectedReceivedEvent(None, - conn=self.connection, - jingle_session=self, - media=None, - reason=text)) + self._raise_event('jingle-disconnected-received', + media=None, + reason=text) def __content_add(self, content): # TODO: test @@ -811,11 +798,9 @@ class JingleSession: self.__append_content(jingle, content) self.connection.connection.send(stanza) # TODO: this will fail if content is not an RTP content - app.nec.push_incoming_event(JingleDisconnectedReceivedEvent(None, - conn=self.connection, - jingle_session=self, - media=content.media, - reason='rejected')) + self._raise_event('jingle-disconnected-received', + media=content.media, + reason='rejected') def __content_modify(self): assert self.state != JingleStates.ENDED @@ -827,17 +812,12 @@ class JingleSession: self.__append_content(jingle, content) self.connection.connection.send(stanza) # TODO: this will fail if content is not an RTP content - app.nec.push_incoming_event(JingleDisconnectedReceivedEvent(None, - conn=self.connection, - jingle_session=self, - media=content.media, - reason='removed')) + self._raise_event('jingle-disconnected-received', + media=content.media, + reason='removed') def content_negotiated(self, media): - app.nec.push_incoming_event(JingleConnectedReceivedEvent(None, - conn=self.connection, - jingle_session=self, - media=media)) + self._raise_event('jingle-connected-received', media=media) def __transport_accept(self, transport): assert self.state != JingleStates.ENDED @@ -847,3 +827,15 @@ class JingleSession: self.connection.connection.send(stanza) self.collect_iq_id(stanza.getID()) self.state = JingleStates.ACTIVE + + def _raise_event(self, name, **kwargs): + jid, resource = app.get_room_and_nick_from_fjid(self.peerjid) + app.nec.push_incoming_event( + NetworkEvent(name, + conn=self.connection, + fjid=self.peerjid, + jid=jid, + sid=self.sid, + resource=resource, + jingle_session=self, + **kwargs)) ===================================== gajim/gui_interface.py ===================================== @@ -1102,7 +1102,7 @@ class Interface: self.handle_event_jingle_disconnected], 'jingle-error-received': [self.handle_event_jingle_error], 'jingle-request-received': [self.handle_event_jingle_incoming], - 'jingleFT-cancelled-received': [self.handle_event_jingleft_cancel], + 'jingle-ft-cancelled-received': [self.handle_event_jingleft_cancel], 'message-not-sent': [self.handle_event_msgnotsent], 'message-sent': [self.handle_event_msgsent], 'metacontacts-received': [self.handle_event_metacontacts], View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/294eece25bcf57ebc6e0ad86311fc0a143… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/294eece25bcf57ebc6e0ad86311fc0a143… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add more options for validating JIDs
by Philipp Hörist 09 Dec '19

09 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 99f52e7e by Philipp Hörist at 2019-12-09T20:20:12Z Add more options for validating JIDs - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1627,12 +1627,23 @@ def get_default_muc_config(): } -def validate_jid(jid): +def validate_jid(jid, type_=None): try: - return JID(str(jid)) + jid = JID(str(jid)) except InvalidJid as error: raise ValueError(error) + if type_ is None: + return jid + if type_ == 'bare' and jid.isBare: + return jid + if type_ == 'full' and jid.isFull: + return jid + if type_ == 'domain' and jid.isDomain: + return jid + + raise ValueError('Not a %s JID' % type_) + def to_user_string(error): text = error.get_text(get_rfc5646_lang()) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/99f52e7e9ef84863fd8d52830d2594823d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/99f52e7e9ef84863fd8d52830d2594823d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] JID: isDomain and isFull property
by Philipp Hörist 09 Dec '19

09 Dec '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 9fe5483e by Philipp Hörist at 2019-12-09T20:08:15Z JID: isDomain and isFull property - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -897,6 +897,14 @@ class JID: def isBare(self): return self.node and self.domain and not self.resource + @property + def isDomain(self): + return self.domain and not self.node and not self.resource + + @property + def isFull(self): + return self.domain and self.node and self.resource + def __eq__(self, other): """ Compare the JID to another instance or to string for equality View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/9fe5483eb06a6fbf7c80eefd64… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/9fe5483eb06a6fbf7c80eefd64… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix tracebacks in preferences
by Philipp Hörist 07 Dec '19

07 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7ffde4a9 by Emmanuel Gil Peyrot at 2019-12-07T12:53:52Z Fix tracebacks in preferences If any error happens while creating the Gstreamer pipeline and elements, guard against them being None. - - - - - 2 changed files: - gajim/common/multimedia_helpers.py - gajim/gtk/preferences.py Changes: ===================================== gajim/common/multimedia_helpers.py ===================================== @@ -107,7 +107,7 @@ class VideoInputManager(DeviceManager): # Camera source on Linux self.detect_element('v4l2src', _('V4L2: %s')) # X11 screen sharing on Linux - self.detect_element('ximagesrc', _('X11'), '%s ! ffmpegcolorspace') + self.detect_element('ximagesrc', _('X11')) # Recommended source on Windows self.detect_element('ksvideosrc', _('Windows')) # Recommended source on OS X ===================================== gajim/gtk/preferences.py ===================================== @@ -14,6 +14,7 @@ import logging +from gi.repository import GLib from gi.repository import Gtk from gi.repository import Gdk from gi.repository import Pango @@ -413,7 +414,12 @@ class Preferences(Gtk.ApplicationWindow): self.av_widget = widget src_name = app.config.get('video_input_device') - self.av_src = Gst.parse_bin_from_description(src_name, True) + try: + self.av_src = Gst.parse_bin_from_description(src_name, True) + except GLib.Error: + log.error('Failed to parse "%s" as Gstreamer element,' + ' falling back to autovideosrc', src_name) + self.av_src = None if self.av_src is not None: self.av_pipeline.add(self.av_src) self.av_src.link(self.av_sink) @@ -435,13 +441,18 @@ class Preferences(Gtk.ApplicationWindow): combobox.set_active(0) def on_av_unmap(tab): - self.av_pipeline.set_state(Gst.State.NULL) - self.av_pipeline.remove(self.av_src) - self.av_src = None - self.av_pipeline.remove(self.av_sink) - self.av_sink = None - tab.remove(self.av_widget) - self.av_widget = None + if self.av_pipeline is not None: + self.av_pipeline.set_state(Gst.State.NULL) + if self.av_src is not None: + self.av_pipeline.remove(self.av_src) + self.av_src = None + if self.av_sink is not None: + self.av_pipeline.remove(self.av_sink) + self.av_sink = None + if self.av_widget is not None: + tab.remove(self.av_widget) + self.av_widget = None + self.av_pipeline = None self.av_pipeline = None self.av_src = None @@ -984,10 +995,17 @@ class Preferences(Gtk.ApplicationWindow): self.on_av_combobox_changed(widget, 'audio_output_device') def on_video_input_combobox_changed(self, widget): - device = self.on_av_combobox_changed(widget, 'video_input_device') + model = widget.get_model() + active = widget.get_active() + device = model[active][1] - src = Gst.parse_bin_from_description(device, True) - if src is None: + try: + src = Gst.parse_bin_from_description(device, True) + except GLib.Error: + # TODO: disable the entry instead of just selecting the default. + log.error('Failed to parse "%s" as Gstreamer element,' + ' falling back to autovideosrc', device) + widget.set_active(0) return self.av_pipeline.set_state(Gst.State.NULL) @@ -997,6 +1015,7 @@ class Preferences(Gtk.ApplicationWindow): src.link(self.av_sink) self.av_src = src self.av_pipeline.set_state(Gst.State.PLAYING) + app.config.set('video_input_device', device) def on_video_framerate_combobox_changed(self, widget): self.on_av_combobox_changed(widget, 'video_framerate') View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7ffde4a989f983a672628f3eecb7d0185d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7ffde4a989f983a672628f3eecb7d0185d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] README: Update package locations
by Philipp Hörist 07 Dec '19

07 Dec '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 313d241a by André Apitzsch at 2019-12-07T12:16:27Z README: Update package locations - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== @@ -28,15 +28,17 @@ ### Compile-time Requirements -- python-setuptools +- python3-setuptools ### Installation Procedure #### Packages -- [Arch](https://aur.archlinux.org/packages/gajim-git/) -- [Debian](https://packages.debian.org/stretch-backports/gajim) +- [Arch Linux](https://www.archlinux.org/packages/community/any/gajim/) +- [Debian](https://packages.debian.org/stable/gajim) +- [Fedora](https://apps.fedoraproject.org/packages/gajim) +- [Ubuntu](https://packages.ubuntu.com/gajim) #### Snapshots View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/313d241a19a6e95d674dc1840613fb8634… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/313d241a19a6e95d674dc1840613fb8634… 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