Commits February 2019

commits@gajim.org

1 participants
58 discussions

[Git][gajim/gajim][master] Determine windows version reliably
by Philipp Hörist 15 Feb '19

15 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: a944e7e6 by Philipp Hörist at 2019-02-15T16:02:40Z Determine windows version reliably Fixes #9578 - - - - - 1 changed file: - gajim/common/zeroconf/client_zeroconf.py Changes: ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -16,7 +16,6 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import socket -import platform import ssl import errno import sys @@ -76,7 +75,7 @@ class ZeroconfListener(IdleObject): self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) self._serv.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) if os.name == 'nt': - if int(platform.win32_ver()[0]) >= 6: # Win Vista + + if sys.getwindowsversion().major >= 6: # Win Vista + # 47 is socket.IPPROTO_IPV6 # 27 is socket.IPV6_V6ONLY under windows, but not defined ... self._serv.setsockopt(41, 27, 0) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a944e7e6e19a997842ad16be3ddf38f5d5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a944e7e6e19a997842ad16be3ddf38f5d5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Determine windows version reliably
by Philipp Hörist 15 Feb '19

15 Feb '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: f4b4e9cc by Philipp Hörist at 2019-02-15T15:56:52Z Determine windows version reliably Fixes #9578 - - - - - 1 changed file: - gajim/common/zeroconf/client_zeroconf.py Changes: ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -26,7 +26,6 @@ from gajim.common.zeroconf import zeroconf from nbxmpp.protocol import * import socket -import platform import ssl import errno import sys @@ -73,7 +72,7 @@ class ZeroconfListener(IdleObject): self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) self._serv.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) if os.name == 'nt': - if int(platform.win32_ver()[0]) >= 6: # Win Vista + + if sys.getwindowsversion().major >= 6: # Win Vista + # 47 is socket.IPPROTO_IPV6 # 27 is socket.IPV6_V6ONLY under windows, but not defined ... self._serv.setsockopt(41, 27, 0) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f4b4e9cc885ebc3eb77a924123db6695f5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f4b4e9cc885ebc3eb77a924123db6695f5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Add mobile phone indicator
by Philipp Hörist 15 Feb '19

15 Feb '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 064f249c by Philipp Hörist at 2019-02-15T15:45:58Z Add mobile phone indicator Shows a mobile phone icon if the last message was received by a client which identifies as phone - - - - - 5 changed files: - gajim/chat_control.py - gajim/common/caps_cache.py - gajim/common/contacts.py - gajim/common/modules/message.py - gajim/data/gui/chat_control.ui Changes: ===================================== gajim/chat_control.py ===================================== @@ -225,6 +225,9 @@ class ChatControl(ChatControlBase): app.ged.register_event_handler('pep-received', ged.GUI1, self._nec_pep_received) + app.ged.register_event_handler('update-client-info', ged.GUI1, + self._on_update_client_info) + if self.TYPE_ID == message_control.TYPE_CHAT: # Dont connect this when PrivateChatControl is used app.ged.register_event_handler('update-roster-avatar', ged.GUI1, @@ -435,6 +438,17 @@ class ChatControl(ChatControlBase): else: self.update_pep(obj.pep_type) + def _on_update_client_info(self, event): + if event.account != self.account: + return + if event.jid != self.contact.jid: + return + contact = app.contacts.get_contact( + self.account, event.jid, event.resource) + if contact is None: + return + self.xml.get_object('phone_image').set_visible(contact.uses_phone) + def _update_jingle(self, jingle_type): if jingle_type not in ('audio', 'video'): return @@ -1063,6 +1077,9 @@ class ChatControl(ChatControlBase): app.ged.remove_event_handler('pep-received', ged.GUI1, self._nec_pep_received) + app.ged.remove_event_handler('update-client-info', ged.GUI1, + self._on_update_client_info) + if self.TYPE_ID == message_control.TYPE_CHAT: app.ged.remove_event_handler('update-roster-avatar', ged.GUI1, self._nec_update_avatar) ===================================== gajim/common/caps_cache.py ===================================== @@ -77,6 +77,14 @@ def client_supports(client_caps, requested_feature): return requested_feature not in FEATURE_BLACKLIST return False +def get_client_identity(client_caps): + lookup_item = client_caps.get_cache_lookup_strategy() + cache_item = lookup_item(capscache) + + for identity in cache_item.identities: + if identity.get('category') == 'client': + return identity.get('type') + def create_suitable_client_caps(node, caps_hash, hash_method, fjid=None): """ Create and return a suitable ClientCaps object for the given node, ===================================== gajim/common/contacts.py ===================================== @@ -116,6 +116,10 @@ class CommonContact(XMPPEntity): return False return caps_cache.client_supports(self.client_caps, requested_feature) + @property + def uses_phone(self): + return caps_cache.get_client_identity(self.client_caps) == 'phone' + class Contact(CommonContact): """ ===================================== gajim/common/modules/message.py ===================================== @@ -207,6 +207,11 @@ class Message: 'gc_control': gc_control } + app.nec.push_incoming_event(NetworkEvent('update-client-info', + account=self._account, + jid=jid, + resource=resource)) + event = MessageReceivedEvent(None, **event_attr) app.nec.push_incoming_event(event) ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -407,12 +407,13 @@ </packing> </child> <child> - <object class="GtkBox" id="banner_vbox"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="border_width">5</property> - <property name="orientation">vertical</property> + <property name="valign">center</property> + <property name="margin_left">5</property> + <property name="hexpand">True</property> + <property name="row_spacing">2</property> <child> <object class="GtkLabel" id="banner_name_label"> <property name="name">ChatControl-BannerNameLabel</property> @@ -423,9 +424,9 @@ <property name="xalign">0</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> </packing> </child> <child> @@ -433,6 +434,7 @@ <property name="name">ChatControl-BannerLabel</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="label">label</property> <property name="use_markup">True</property> <property name="selectable">True</property> @@ -440,14 +442,27 @@ <signal name="populate-popup" handler="on_banner_label_populate_popup" swapped="no"/> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkImage" id="phone_image"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">The last message was written on a mobile client</property> + <property name="halign">start</property> + <property name="margin_right">4</property> + <property name="icon_name">phone-apple-iphone-symbolic</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/064f249c5a5dcabdfc6011cda5d59c4a99… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/064f249c5a5dcabdfc6011cda5d59c4a99… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 4 commits: Fix deprecation warning
by Philipp Hörist 15 Feb '19

15 Feb '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 9419e8dd by Philipp Hörist at 2019-02-15T15:35:44Z Fix deprecation warning set_cipher_list wants bytes - - - - - 05f1c780 by Philipp Hörist at 2019-02-15T15:35:56Z XTLS: Fix endless loop on write error - - - - - a1d68677 by Philipp Hörist at 2019-02-15T15:35:57Z Dont fail on urn:xmpp:hashes:1 Fixes #9514 - - - - - 4189d5b9 by Philipp Hörist at 2019-02-15T15:35:57Z Fix filetransfer tooltip - - - - - 5 changed files: - gajim/common/app.py - gajim/common/jingle_session.py - gajim/common/jingle_xtls.py - gajim/common/socks5.py - gajim/tooltips.py Changes: ===================================== gajim/common/app.py ===================================== @@ -148,6 +148,7 @@ socks5queue = None gupnp_igd = None gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'} + gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE, nbxmpp.NS_MUC, nbxmpp.NS_MUC_USER, nbxmpp.NS_MUC_ADMIN, nbxmpp.NS_MUC_OWNER, nbxmpp.NS_MUC_CONFIG, nbxmpp.NS_COMMANDS, nbxmpp.NS_DISCO_INFO, 'ipv6', ===================================== gajim/common/jingle_session.py ===================================== @@ -445,6 +445,8 @@ class JingleSession: if child.getName() == 'checksum': hash_ = child.getTag('file').getTag(name='hash', namespace=nbxmpp.NS_HASHES_2) + if hash_ is None: + continue algo = hash_.getAttr('algo') if algo in nbxmpp.Hashes2.supported: file_props = FilesProp.getFileProp(self.connection.name, ===================================== gajim/common/jingle_xtls.py ===================================== @@ -100,7 +100,7 @@ def get_context(fingerprint, verify_cb=None, remote_jid=None): flags = (SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3 | SSL.OP_SINGLE_DH_USE \ | SSL.OP_NO_TICKET) ctx.set_options(flags) - ctx.set_cipher_list('HIGH:!aNULL:!3DES') + ctx.set_cipher_list(b'HIGH:!aNULL:!3DES') if fingerprint == 'server': # for testing purposes only ctx.set_verify(SSL.VERIFY_NONE|SSL.VERIFY_FAIL_IF_NO_PEER_CERT, ===================================== gajim/common/socks5.py ===================================== @@ -687,13 +687,11 @@ class Socks5: OpenSSL.SSL.WantX509LookupError) as e: log.info('SSL rehandshake request: %s', repr(e)) raise e + except OpenSSL.SSL.SysCallError: + return self._on_send_exception() except Exception as e: if e.errno not in (EINTR, ENOBUFS, EWOULDBLOCK): - # peer stopped reading - self.state = 8 # end connection - self.disconnect() - self.file_props.error = -1 - return -1 + return self._on_send_exception() self.size += lenn current_time = time.time() self.file_props.elapsed_time += current_time - \ @@ -719,6 +717,13 @@ class Socks5: self.disconnect() return -1 + def _on_send_exception(self): + # peer stopped reading + self.state = 8 # end connection + self.disconnect() + self.file_props.error = -1 + return -1 + def get_file_contents(self, timeout): """ Read file contents from socket and write them to file ===================================== gajim/tooltips.py ===================================== @@ -609,8 +609,7 @@ class FileTransfersTooltip(): self.sid = sid return False, self.widget - @staticmethod - def _create_tooltip(file_props, sid): + def _create_tooltip(self, file_props, _sid): ft_table = Gtk.Table(2, 1) ft_table.set_property('column-spacing', 2) current_row = 1 @@ -642,26 +641,7 @@ class FileTransfersTooltip(): if not transfered_len: transfered_len = 0 properties.append((_('Transferred: '), helpers.convert_bytes(transfered_len))) - status = '' - if file_props.started: - status = _('Not started') - if file_props.stopped: - status = _('Stopped') - elif file_props.completed: - status = _('Completed') - elif not file_props.connected: - if file_props.completed: - status = _('Completed') - else: - if file_props.paused: - status = Q_('?transfer status:Paused') - elif file_props.stalled: - # stalled is not paused. it is like 'frozen' it stopped alone - status = _('Stalled') - else: - status = _('Transferring') - else: - status = _('Not started') + status = self._get_current_status(file_props) properties.append((_('Status: '), status)) file_desc = file_props.desc or '' properties.append((_('Description: '), GLib.markup_escape_text( @@ -686,6 +666,24 @@ class FileTransfersTooltip(): ft_table.show_all() return ft_table + @staticmethod + def _get_current_status(file_props): + if file_props.stopped: + return _('Aborted') + if file_props.completed: + return _('Completed') + if file_props.paused: + return Q_('?transfer status:Paused') + if file_props.stalled: + # stalled is not paused. it is like 'frozen' it stopped alone + return _('Stalled') + + if file_props.connected: + if file_props.started: + return _('Transferring') + return _('Not started') + return _('Not started') + def colorize_status(status): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/bf9aed69fe6384772ea4ab849a54881b4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/bf9aed69fe6384772ea4ab849a54881b4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][nbxmpp_0.6] Fix hash namespace
by Philipp Hörist 15 Feb '19

15 Feb '19

Philipp Hörist pushed to branch nbxmpp_0.6 at gajim / python-nbxmpp Commits: e6b41270 by Philipp Hörist at 2019-02-15T15:09:40Z Fix hash namespace (cherry picked from commit 8d4f759d525a308f35e4585c43917c6bcd70606a) - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -1431,7 +1431,7 @@ class Hashes2(Node): supported = ('sha-256', 'sha-512', 'sha3-256', 'sha3-512', 'blake2b-256', 'blake2b-512') - def __init__(self, nsp=NS_HASHES): + def __init__(self, nsp=NS_HASHES_2): Node.__init__(self, None, {}, [], None, None, False, None) self.setNamespace(nsp) self.setName('hash') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/e6b412709574be62024ef77fd1… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/e6b412709574be62024ef77fd1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Fix depreaction warning
by Philipp Hörist 15 Feb '19

15 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: bc7e0e1e by Philipp Hörist at 2019-02-15T13:58:11Z Fix depreaction warning set_cipher_list wants bytes - - - - - 7fe03dcb by Philipp Hörist at 2019-02-15T13:58:56Z XTLS: Fix endless loop on write error - - - - - 53d6b1dc by Philipp Hörist at 2019-02-15T14:04:50Z Dont advertise urn:xmpp:hashes:1 Fixes #9514 - - - - - 8455a0fa by Philipp Hörist at 2019-02-15T14:49:47Z Fix filetransfer tooltip - - - - - 5 changed files: - gajim/common/app.py - gajim/common/jingle_session.py - gajim/common/jingle_xtls.py - gajim/common/socks5.py - gajim/gtk/tooltips.py Changes: ===================================== gajim/common/app.py ===================================== @@ -162,7 +162,6 @@ gajim_common_features = [ nbxmpp.NS_CONFERENCE, nbxmpp.NS_CORRECT, nbxmpp.NS_EME, - nbxmpp.NS_HASHES, nbxmpp.NS_HASHES_2, nbxmpp.NS_HASHES_MD5, nbxmpp.NS_HASHES_SHA1, ===================================== gajim/common/jingle_session.py ===================================== @@ -445,6 +445,8 @@ class JingleSession: if child.getName() == 'checksum': hash_ = child.getTag('file').getTag(name='hash', namespace=nbxmpp.NS_HASHES_2) + if hash_ is None: + continue algo = hash_.getAttr('algo') if algo in nbxmpp.Hashes2.supported: file_props = FilesProp.getFileProp(self.connection.name, ===================================== gajim/common/jingle_xtls.py ===================================== @@ -90,7 +90,7 @@ def get_context(fingerprint, verify_cb=None, remote_jid=None): flags = (SSL.OP_NO_SSLv2 | SSL.OP_NO_SSLv3 | SSL.OP_SINGLE_DH_USE \ | SSL.OP_NO_TICKET) ctx.set_options(flags) - ctx.set_cipher_list('HIGH:!aNULL:!3DES') + ctx.set_cipher_list(b'HIGH:!aNULL:!3DES') if fingerprint == 'server': # for testing purposes only ctx.set_verify(SSL.VERIFY_NONE|SSL.VERIFY_FAIL_IF_NO_PEER_CERT, ===================================== gajim/common/socks5.py ===================================== @@ -687,13 +687,11 @@ class Socks5: OpenSSL.SSL.WantX509LookupError) as e: log.info('SSL rehandshake request: %s', repr(e)) raise e + except OpenSSL.SSL.SysCallError: + return self._on_send_exception() except Exception as e: if e.errno not in (EINTR, ENOBUFS, EWOULDBLOCK): - # peer stopped reading - self.state = 8 # end connection - self.disconnect() - self.file_props.error = -1 - return -1 + return self._on_send_exception() self.size += lenn current_time = time.time() self.file_props.elapsed_time += current_time - \ @@ -719,6 +717,13 @@ class Socks5: self.disconnect() return -1 + def _on_send_exception(self): + # peer stopped reading + self.state = 8 # end connection + self.disconnect() + self.file_props.error = -1 + return -1 + def get_file_contents(self, timeout): """ Read file contents from socket and write them to file ===================================== gajim/gtk/tooltips.py ===================================== @@ -563,8 +563,7 @@ class FileTransfersTooltip(): self.sid = sid return False, self.widget - @staticmethod - def _create_tooltip(file_props, _sid): + def _create_tooltip(self, file_props, _sid): ft_table = Gtk.Table(2, 1) ft_table.set_property('column-spacing', 2) current_row = 1 @@ -596,26 +595,7 @@ class FileTransfersTooltip(): if not transfered_len: transfered_len = 0 properties.append((_('Transferred: '), helpers.convert_bytes(transfered_len))) - status = '' - if file_props.started: - status = _('Not started') - if file_props.stopped: - status = _('Stopped') - elif file_props.completed: - status = _('Completed') - elif not file_props.connected: - if file_props.completed: - status = _('Completed') - else: - if file_props.paused: - status = Q_('?transfer status:Paused') - elif file_props.stalled: - # stalled is not paused. it is like 'frozen' it stopped alone - status = _('Stalled') - else: - status = _('Transferring') - else: - status = _('Not started') + status = self._get_current_status(file_props) properties.append((_('Status: '), status)) file_desc = file_props.desc or '' properties.append((_('Description: '), GLib.markup_escape_text( @@ -643,6 +623,24 @@ class FileTransfersTooltip(): ft_table.show_all() return ft_table + @staticmethod + def _get_current_status(file_props): + if file_props.stopped: + return _('Aborted') + if file_props.completed: + return _('Completed') + if file_props.paused: + return Q_('?transfer status:Paused') + if file_props.stalled: + # stalled is not paused. it is like 'frozen' it stopped alone + return _('Stalled') + + if file_props.connected: + if file_props.started: + return _('Transferring') + return _('Not started') + return _('Not started') + def colorize_status(status): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1f5be6cb0ff20c90f14caca72867ff39a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/1f5be6cb0ff20c90f14caca72867ff39a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix hash namespace
by Philipp Hörist 15 Feb '19

15 Feb '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 8d4f759d by Philipp Hörist at 2019-02-15T13:26:56Z Fix hash namespace - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -1518,7 +1518,7 @@ class Hashes2(Node): supported = ('sha-256', 'sha-512', 'sha3-256', 'sha3-512', 'blake2b-256', 'blake2b-512') - def __init__(self, nsp=NS_HASHES): + def __init__(self, nsp=NS_HASHES_2): Node.__init__(self, None, {}, [], None, None, False, None) self.setNamespace(nsp) self.setName('hash') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/8d4f759d525a308f35e4585c43… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/8d4f759d525a308f35e4585c43… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Windows: Add pygments to build
by Philipp Hörist 15 Feb '19

15 Feb '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: bf9aed69 by Philipp Hörist at 2019-02-15T10:38:59Z Windows: Add pygments to build (cherry picked from commit 5059f72373a1109216178cb7593fd26ea56ed372) - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -97,7 +97,8 @@ function install_deps { mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pyopenssl \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-docutils \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-certifi \ - mingw-w64-"${ARCH}"-"${PYTHON_ID}"-six + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-six \ + mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pygments PIP_REQUIREMENTS="\ git+https://dev.gajim.org/gajim/python-nbxmpp.git@nbxmpp_0.6 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bf9aed69fe6384772ea4ab849a54881b44… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bf9aed69fe6384772ea4ab849a54881b44… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][nbxmpp_0.6] Raise version to 0.6.10
by Philipp Hörist 12 Feb '19

12 Feb '19

Philipp Hörist pushed to branch nbxmpp_0.6 at gajim / python-nbxmpp Commits: d4f25b90 by Philipp Hörist at 2019-02-12T20:47:54Z Raise version to 0.6.10 - - - - - 3 changed files: - ChangeLog - nbxmpp/__init__.py - setup.py Changes: ===================================== ChangeLog ===================================== @@ -1,4 +1,4 @@ -python-nbxmpp 0.6.10 (TBA) +python-nbxmpp 0.6.10 (13 February 2019) * Add support for domain based name in features for GSSAPI * Fix usage of BOSH ===================================== nbxmpp/__init__.py ===================================== @@ -17,4 +17,4 @@ from .client_nb import NonBlockingClient from .plugin import PlugIn from .smacks import Smacks -__version__ = "0.6.9" +__version__ = "0.6.10" ===================================== setup.py ===================================== @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='nbxmpp', - version='0.6.9', + version='0.6.10', description='Non blocking Jabber/XMPP module', author='Yann Leboulanger', author_email='asterix(a)lagaule.org', View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/d4f25b901f1fa754832a60f453… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/d4f25b901f1fa754832a60f453… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add mobile phone indicator
by Philipp Hörist 12 Feb '19

12 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1f5be6cb by Philipp Hörist at 2019-02-12T20:40:43Z Add mobile phone indicator Shows a mobile phone icon if the last message was received by a client which identifies as phone - - - - - 5 changed files: - gajim/chat_control.py - gajim/common/caps_cache.py - gajim/common/contacts.py - gajim/common/modules/message.py - gajim/data/gui/chat_control.ui Changes: ===================================== gajim/chat_control.py ===================================== @@ -235,6 +235,8 @@ class ChatControl(ChatControlBase): self._on_tune_received) app.ged.register_event_handler('location-received', ged.GUI1, self._on_location_received) + app.ged.register_event_handler('update-client-info', ged.GUI1, + self._on_update_client_info) if self.TYPE_ID == message_control.TYPE_CHAT: # Dont connect this when PrivateChatControl is used app.ged.register_event_handler('update-roster-avatar', ged.GUI1, @@ -476,6 +478,14 @@ class ChatControl(ChatControlBase): self.parent_win.redraw_tab(self) self.parent_win.show_title() + @ensure_proper_control + def _on_update_client_info(self, event): + contact = app.contacts.get_contact( + self.account, event.jid, event.resource) + if contact is None: + return + self.xml.get_object('phone_image').set_visible(contact.uses_phone) + def _update_jingle(self, jingle_type): if jingle_type not in ('audio', 'video'): return @@ -1093,6 +1103,8 @@ class ChatControl(ChatControlBase): self._on_tune_received) app.ged.remove_event_handler('location-received', ged.GUI1, self._on_location_received) + app.ged.remove_event_handler('update-client-info', ged.GUI1, + self._on_update_client_info) if self.TYPE_ID == message_control.TYPE_CHAT: app.ged.remove_event_handler('update-roster-avatar', ged.GUI1, self._nec_update_avatar) ===================================== gajim/common/caps_cache.py ===================================== @@ -78,6 +78,14 @@ def client_supports(client_caps, requested_feature): return requested_feature not in FEATURE_BLACKLIST return False +def get_client_identity(client_caps): + lookup_item = client_caps.get_cache_lookup_strategy() + cache_item = lookup_item(capscache) + + for identity in cache_item.identities: + if identity.get('category') == 'client': + return identity.get('type') + def create_suitable_client_caps(node, caps_hash, hash_method, fjid=None): """ Create and return a suitable ClientCaps object for the given node, ===================================== gajim/common/contacts.py ===================================== @@ -127,6 +127,10 @@ class CommonContact(XMPPEntity): return False return caps_cache.client_supports(self.client_caps, requested_feature) + @property + def uses_phone(self): + return caps_cache.get_client_identity(self.client_caps) == 'phone' + class Contact(CommonContact): """ ===================================== gajim/common/modules/message.py ===================================== @@ -172,6 +172,11 @@ class Message: 'gc_control': gc_control } + app.nec.push_incoming_event(NetworkEvent('update-client-info', + account=self._account, + jid=jid, + resource=resource)) + event = MessageReceivedEvent(None, **event_attr) app.nec.push_incoming_event(event) ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -407,12 +407,13 @@ </packing> </child> <child> - <object class="GtkBox" id="banner_vbox"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="border_width">5</property> - <property name="orientation">vertical</property> + <property name="valign">center</property> + <property name="margin_left">5</property> + <property name="hexpand">True</property> + <property name="row_spacing">2</property> <child> <object class="GtkLabel" id="banner_name_label"> <property name="name">ChatControl-BannerNameLabel</property> @@ -423,9 +424,9 @@ <property name="xalign">0</property> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> </packing> </child> <child> @@ -433,6 +434,7 @@ <property name="name">ChatControl-BannerLabel</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="label">label</property> <property name="use_markup">True</property> <property name="selectable">True</property> @@ -440,14 +442,27 @@ <signal name="populate-popup" handler="on_banner_label_populate_popup" swapped="no"/> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkImage" id="phone_image"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">The last message was written on a mobile client</property> + <property name="halign">start</property> + <property name="margin_right">4</property> + <property name="icon_name">phone-apple-iphone-symbolic</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1f5be6cb0ff20c90f14caca72867ff39a2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1f5be6cb0ff20c90f14caca72867ff39a2… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2019