Commits April 2017

commits@gajim.org

1 participants
34 discussions

[Git][gajim/gajim][master] Update dependency in features window
by Philipp Hörist 30 Apr '17

30 Apr '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: d06ba96a by Philipp Hörist at 2017-04-30T18:45:50+02:00 Update dependency in features window gir1.2-gupnpigd-1.0 is the correct python3/GTK3 dependency on Debian - - - - - 1 changed file: - src/features_window.py Changes: ===================================== src/features_window.py ===================================== --- a/src/features_window.py +++ b/src/features_window.py @@ -95,7 +95,7 @@ class FeaturesWindow: _('Feature not available under Windows.')), _('UPnP-IGD'): (self.gupnp_igd_available, _('Ability to request your router to forward port for file transfer.'), - _('Requires python-gupnp-igd.'), + _('Requires gir1.2-gupnpigd-1.0.'), _('Feature not available under Windows.')), _('UPower'): (self.upower_available, _('Ability to disconnect properly just before suspending the machine.'), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d06ba96a89c18f93cd983f06280c50dc5f…

1 0

[Git][gajim/gajim][master] 3 commits: Make some methods public
by Philipp Hörist 29 Apr '17

29 Apr '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: fe3a5a4a by Philipp Hörist at 2017-04-25T14:44:38+02:00 Make some methods public - - - - - 1840ff23 by Philipp Hörist at 2017-04-25T14:51:35+02:00 Port Network Watcher to Gio API - - - - - 89f1e982 by Philipp Hörist at 2017-04-29T23:37:55+02:00 Merge branch 'dbus' into 'master' Port Network Watcher to Gio API See merge request !88 - - - - - 7 changed files: - src/common/config.py - src/common/connection.py - src/common/zeroconf/connection_zeroconf.py - src/features_window.py - src/gui_interface.py - − src/network_manager_listener.py - + src/network_watcher.py Changes: ===================================== src/common/config.py ===================================== --- a/src/common/config.py +++ b/src/common/config.py @@ -193,7 +193,6 @@ class Config: 'always_english_wikipedia': [opt_bool, False], 'always_english_wiktionary': [opt_bool, True], 'remote_control': [opt_bool, False, _('If checked, Gajim can be controlled remotely using gajim-remote.'), True], - 'networkmanager_support': [opt_bool, True, _('If True, listen to D-Bus signals from NetworkManager and change the status of accounts (provided they do not have listen_to_network_manager set to False and they sync with global status) based upon the status of the network connection.'), True], 'outgoing_chat_state_notifications': [opt_str, 'all', _('Sent chat state notifications. Can be one of all, composing_only, disabled.')], 'displayed_chat_state_notifications': [opt_str, 'all', _('Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled.')], 'autodetect_browser_mailer': [opt_bool, True, '', True], @@ -387,7 +386,6 @@ class Config: 'msgwin-y-position': [opt_int, -1], # Default is to let the wm decide 'msgwin-width': [opt_int, 480], 'msgwin-height': [opt_int, 440], - 'listen_to_network_manager': [opt_bool, True], 'is_zeroconf': [opt_bool, False], 'last_status': [opt_str, 'online'], 'last_status_msg': [opt_str, ''], ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -198,7 +198,7 @@ class CommonConnection: """ gajim.ged.raise_event(event, self.name, data) - def _reconnect(self): + def reconnect(self): """ To be implemented by derivated classes """ @@ -849,7 +849,7 @@ class Connection(CommonConnection, ConnectionHandlers): def check_jid(self, jid): return helpers.parse_jid(jid) - def _reconnect(self): + def reconnect(self): # Do not try to reco while we are already trying self.time_to_reconnect = None if self.connected < 2: # connection failed @@ -894,7 +894,7 @@ class Connection(CommonConnection, ConnectionHandlers): gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, show=gajim.SHOW_LIST[self.connected])) - def _disconnectedReconnCB(self): + def disconnectedReconnCB(self): """ Called when we are disconnected """ @@ -914,7 +914,7 @@ class Connection(CommonConnection, ConnectionHandlers): show='error')) if self.connection: self.connection.UnregisterDisconnectHandler( - self._disconnectedReconnCB) + self.disconnectedReconnCB) self.disconnect() if gajim.config.get_per('accounts', self.name, 'autoreconnect'): self.connected = -1 @@ -925,7 +925,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.status = gajim.status_before_autoaway[self.name] gajim.status_before_autoaway[self.name] = '' self.old_show = 'online' - # this check has moved from _reconnect method + # this check has moved from reconnect method # do exponential backoff until less than 5 minutes if self.retrycount < 2 or self.last_time_to_reconnect is None: self.last_time_to_reconnect = 5 @@ -1242,7 +1242,7 @@ class Connection(CommonConnection, ConnectionHandlers): self._connection_lost() else: # try reconnect if connection has failed before auth to server - self._disconnectedReconnCB() + self.disconnectedReconnCB() def connect_to_next_type(self, retry=False): if self.redirected: @@ -1409,7 +1409,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.connected_hostname = self._current_host['host'] self.on_connect_failure = None con.UnregisterDisconnectHandler(self._on_disconnected) - con.RegisterDisconnectHandler(self._disconnectedReconnCB) + con.RegisterDisconnectHandler(self.disconnectedReconnCB) log.debug('Connected to server %s:%s with %s' % ( self._current_host['host'], self._current_host['port'], con_type)) @@ -3038,7 +3038,7 @@ class Connection(CommonConnection, ConnectionHandlers): if self.awaiting_xmpp_ping_id: # We haven't got the pong in time, disco and reconnect log.warning("No reply received for keepalive ping. Reconnecting.") - self._disconnectedReconnCB() + self.disconnectedReconnCB() def _reconnect_alarm(self): if not gajim.config.get_per('accounts', self.name, 'active'): @@ -3046,7 +3046,7 @@ class Connection(CommonConnection, ConnectionHandlers): return if self.time_to_reconnect: if self.connected < 2: - self._reconnect() + self.reconnect() else: self.time_to_reconnect = None ===================================== src/common/zeroconf/connection_zeroconf.py ===================================== --- a/src/common/zeroconf/connection_zeroconf.py +++ b/src/common/zeroconf/connection_zeroconf.py @@ -120,7 +120,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): def check_jid(self, jid): return jid - def _reconnect(self): + def reconnect(self): # Do not try to reco while we are already trying self.time_to_reconnect = None gajim.log.debug('reconnect') @@ -163,7 +163,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): gajim.nec.push_incoming_event(ZeroconfPresenceReceivedEvent( None, conn=self, fjid=jid, show='offline', status='')) - def _disconnectedReconnCB(self): + def disconnectedReconnCB(self): """ Called when we are disconnected. Comes from network manager for example we don't try to reconnect, network manager will tell us when we can ===================================== src/features_window.py ===================================== --- a/src/features_window.py +++ b/src/features_window.py @@ -61,9 +61,9 @@ class FeaturesWindow: _('Ability to encrypting chat messages with OpenPGP.'), _('Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/).'), _('Requires gpg.exe in PATH.')), - _('Network-manager'): (self.network_manager_available, + _('Network-Watcher'): (self.network_watcher_available, _('Autodetection of network status.'), - _('Requires gnome-network-manager and python-dbus.'), + _('Requires gnome-network-manager'), _('Feature not available under Windows.')), _('Password encryption'): (self.some_keyring_available, _('Passwords can be stored securely and not just in plaintext.'), @@ -178,11 +178,9 @@ class FeaturesWindow: def gpg_available(self): return gajim.HAVE_GPG - def network_manager_available(self): - if os.name == 'nt': - return False - import network_manager_listener - return network_manager_listener.supported + def network_watcher_available(self): + import network_watcher + return network_watcher.supported def some_keyring_available(self): if os.name == 'nt': ===================================== src/gui_interface.py ===================================== --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -2973,9 +2973,7 @@ class Interface: self.remote_ctrl = None - if gajim.config.get('networkmanager_support') and \ - dbus_support.supported: - import network_manager_listener + import network_watcher if dbus_support.supported: import upower_listener ===================================== src/network_manager_listener.py deleted ===================================== --- a/src/network_manager_listener.py +++ /dev/null @@ -1,100 +0,0 @@ -# -*- coding: utf-8 -*- -## src/network_manager_listener.py -## -## Copyright (C) 2006 Jeffrey C. Ollie <jeff AT ocjtech.us> -## Nikos Kouremenos <kourem AT gmail.com> -## Stefan Bethge <stefan AT lanpartei.de> -## Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> -## -## 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 common import gajim - - -def device_now_active(self, *args): - """ - For Network Manager 0.6 - """ - for connection in gajim.connections.values(): - if gajim.config.get_per('accounts', connection.name, - 'listen_to_network_manager') and connection.time_to_reconnect: - connection._reconnect() - -def device_no_longer_active(self, *args): - """ - For Network Manager 0.6 - """ - for connection in gajim.connections.values(): - if gajim.config.get_per('accounts', connection.name, - 'listen_to_network_manager') and connection.connected > 1: - connection._disconnectedReconnCB() - -def state_changed(state): - """ - For Network Manager 0.7 - 0.9 - """ - if state == 70: - for connection in gajim.connections.values(): - if gajim.config.get_per('accounts', connection.name, - 'listen_to_network_manager') and connection.time_to_reconnect: - connection._reconnect() - else: - for connection in gajim.connections.values(): - if gajim.config.get_per('accounts', connection.name, - 'listen_to_network_manager') and connection.connected > 1: - connection._disconnectedReconnCB() - -supported = False - -from common import dbus_support - -if dbus_support.supported: - import dbus - - try: - from common.dbus_support import system_bus - - bus = system_bus.bus() - - if 'org.freedesktop.NetworkManager' in bus.list_names(): - nm_object = bus.get_object('org.freedesktop.NetworkManager', - '/org/freedesktop/NetworkManager') - props = dbus.Interface(nm_object, "org.freedesktop.DBus.Properties") - bus.add_signal_receiver(state_changed, - 'StateChanged', - 'org.freedesktop.NetworkManager', - 'org.freedesktop.NetworkManager', - '/org/freedesktop/NetworkManager') - supported = True - - except dbus.DBusException: - try: - if 'org.freedesktop.NetworkManager' in bus.list_names(): - supported = True - - bus.add_signal_receiver(device_no_longer_active, - 'DeviceNoLongerActive', - 'org.freedesktop.NetworkManager', - 'org.freedesktop.NetworkManager', - '/org/freedesktop/NetworkManager') - - bus.add_signal_receiver(device_now_active, - 'DeviceNowActive', - 'org.freedesktop.NetworkManager', - 'org.freedesktop.NetworkManager', - '/org/freedesktop/NetworkManager') - except Exception: - pass ===================================== src/network_watcher.py ===================================== --- /dev/null +++ b/src/network_watcher.py @@ -0,0 +1,84 @@ +# -*- coding: utf-8 -*- +## src/network_watcher.py +## +## Copyright (C) 2017 Philipp Hoerist <philipp AT hoerist.com> +## +## 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/>. +## + + +import logging + +from gi.repository import Gio, GLib + +from common import gajim + +log = logging.getLogger('gajim.network_watcher') + + +supported = False + + +def watch_name(name): + Gio.bus_watch_name( + Gio.BusType.SYSTEM, + name, + Gio.BusNameWatcherFlags.NONE, + appeared, + None) + + +def signal_received(connection, sender_name, object_path, + interface_name, signal_name, parameters, *user_data): + connected = None + log.info('Signal received: %s - %s', interface_name, parameters) + if interface_name == 'org.freedesktop.NetworkManager': + # https://people.freedesktop.org/~lkundrak/nm-docs/nm-dbus-types.html + connected = parameters[0] == 70 + if connected is not None: + GLib.timeout_add_seconds( + 2, update_connection_state, + connected) + + +def appeared(connection, name, name_owner, *user_data): + global supported + supported = True + log.info('%s appeared', name) + if name == 'org.freedesktop.NetworkManager': + connection.signal_subscribe( + 'org.freedesktop.NetworkManager', + None, + 'StateChanged', + '/org/freedesktop/NetworkManager', + None, + Gio.DBusSignalFlags.NONE, + signal_received, + None) + + +def update_connection_state(connected): + if connected: + for connection in gajim.connections.values(): + log.info('Connect %s', connection.name) + connection.reconnect() + else: + for connection in gajim.connections.values(): + if connection.connected > 1: + log.info('Disconnect %s', connection.name) + connection.disconnectedReconnCB() + + +watch_name('org.freedesktop.NetworkManager') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d0357eaa2944ddfd2e4532a958a613c81…

1 0

[Git][gajim/gajim][master] Use different mnemonic
by Philipp Hörist 29 Apr '17

29 Apr '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: d0357eaa by Philipp Hörist at 2017-04-29T21:09:58+02:00 Use different mnemonic O is already used for the OK button - - - - - 2 changed files: - src/chat_control.py - src/filetransfers_window.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -1874,7 +1874,7 @@ class ChatControl(ChatControlBase): file_props.name) if file_props.desc: markup += ' (%s)' % file_props.desc - b1 = Gtk.Button.new_with_mnemonic(_('_Open Containing Folder')) + b1 = Gtk.Button.new_with_mnemonic(_('Open _Containing Folder')) b1.connect('clicked', self._on_open_ft_folder, file_props) b2 = Gtk.Button(stock=Gtk.STOCK_OK) b2.connect('clicked', self._on_ok, file_props, 'file-completed') ===================================== src/filetransfers_window.py ===================================== --- a/src/filetransfers_window.py +++ b/src/filetransfers_window.py @@ -214,7 +214,7 @@ class FileTransfersWindow: dialog = dialogs.HigDialog(None, Gtk.MessageType.INFO, Gtk.ButtonsType.NONE, _('File transfer completed'), sectext) if file_props.type_ == 'r': - button = Gtk.Button.new_with_mnemonic(_('_Open Containing Folder')) + button = Gtk.Button.new_with_mnemonic(_('Open _Containing Folder')) button.connect('clicked', on_open, file_props) dialog.action_area.pack_start(button, True, True, 0) ok_button = dialog.add_button(Gtk.STOCK_OK, Gtk.ResponseType.OK) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d0357eaa2944ddfd2e4532a958a613c81d…

1 0

[Git][gajim/gajim][master] Fix Button labels
by Philipp Hörist 29 Apr '17

29 Apr '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6a4cbf06 by Philipp Hörist at 2017-04-29T20:58:35+02:00 Fix Button labels - - - - - 2 changed files: - src/chat_control.py - src/filetransfers_window.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -1874,7 +1874,7 @@ class ChatControl(ChatControlBase): file_props.name) if file_props.desc: markup += ' (%s)' % file_props.desc - b1 = Gtk.Button(_('_Open Containing Folder')) + b1 = Gtk.Button.new_with_mnemonic(_('_Open Containing Folder')) b1.connect('clicked', self._on_open_ft_folder, file_props) b2 = Gtk.Button(stock=Gtk.STOCK_OK) b2.connect('clicked', self._on_ok, file_props, 'file-completed') ===================================== src/filetransfers_window.py ===================================== --- a/src/filetransfers_window.py +++ b/src/filetransfers_window.py @@ -214,7 +214,7 @@ class FileTransfersWindow: dialog = dialogs.HigDialog(None, Gtk.MessageType.INFO, Gtk.ButtonsType.NONE, _('File transfer completed'), sectext) if file_props.type_ == 'r': - button = Gtk.Button(_('_Open Containing Folder')) + button = Gtk.Button.new_with_mnemonic(_('_Open Containing Folder')) button.connect('clicked', on_open, file_props) dialog.action_area.pack_start(button, True, True, 0) ok_button = dialog.add_button(Gtk.STOCK_OK, Gtk.ResponseType.OK) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6a4cbf06ec1be16a8ac8173b6db704035c…

1 0

[Git][gajim/gajim][master] Fix typo
by Philipp Hörist 29 Apr '17

29 Apr '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: b6db6026 by Philipp Hörist at 2017-04-29T20:39:58+02:00 Fix typo - - - - - 1 changed file: - src/common/jingle.py Changes: ===================================== src/common/jingle.py ===================================== --- a/src/common/jingle.py +++ b/src/common/jingle.py @@ -156,7 +156,7 @@ class ConnectionJingle(object): use_security = contact.supports(nbxmpp.NS_JINGLE_XTLS) jingle = JingleSession(self, weinitiate=True, jid=jid, werequest=request) # this is a file transfer - jingle.session_type_FT = True + jingle.session_type_ft = True self._sessions[jingle.sid] = jingle file_props.sid = jingle.sid if contact.supports(nbxmpp.NS_JINGLE_BYTESTREAM): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b6db6026be43c15a1184478e8ef504f90e…

1 0

[Git][gajim/gajim][master] 12 commits: check for errors when adding a transport contact. Fixes #8196
by Philipp Hörist 29 Apr '17

29 Apr '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1a3d60c6 by Yann Leboulanger at 2017-04-29T16:01:31+02:00 check for errors when adding a transport contact. Fixes #8196 - - - - - 3bc6173a by Yann Leboulanger at 2017-04-29T16:01:59+02:00 Close IBB stream with correct SID. See #8555 - - - - - fde2ac73 by Philipp Hörist at 2017-04-29T16:07:48+02:00 Close IBB Stream correctly - - - - - 21700051 by Philipp Hörist at 2017-04-29T16:12:41+02:00 Read/Write file in binary mode - - - - - 8c51eb72 by Andrey Gursky at 2017-04-29T16:58:31+02:00 finish jingle file transfer session for files without hash - - - - - 2ede0224 by Philipp Hörist at 2017-04-29T16:58:39+02:00 Dont hash file on filetransfer error - - - - - 0d8c0087 by Philipp Hörist at 2017-04-29T16:58:40+02:00 Fix typo in event type - - - - - 3e592c98 by Philipp Hörist at 2017-04-29T16:58:40+02:00 Only make pause button active on pause-able transfers - - - - - 385d6c30 by Philipp Hörist at 2017-04-29T16:58:41+02:00 On IBB cancel set correct 'to' attr - - - - - 7cb7bcaa by Philipp Hörist at 2017-04-29T17:22:18+02:00 Refactor IBB Handlers - Move handling of Data IQs into IBBIqHandler - Call SendHandler with file_props - Save last sent id in file_props.syn_id - Remove some useless checks, now that we call SendHandler with file_props - Send item-not-found error on invalid session id - - - - - 3fb12148 by Philipp Hörist at 2017-04-29T17:22:26+02:00 Remove not working proxys - - - - - b94c8274 by Philipp Hörist at 2017-04-29T18:49:17+02:00 Merge branch 'fixibb' into 'master' Fix IBB Closes #8196 See merge request !90 - - - - - 7 changed files: - src/common/config.py - src/common/events.py - src/common/jingle_ftstates.py - src/common/protocol/bytestream.py - src/dialogs.py - src/filetransfers_window.py - src/gui_interface.py Changes: ===================================== src/common/config.py ===================================== --- a/src/common/config.py +++ b/src/common/config.py @@ -380,7 +380,7 @@ class Config: 'http_auth': [opt_str, 'ask'], # yes, no, ask 'dont_ack_subscription': [opt_bool, False, _('Jabberd2 workaround')], # proxy65 for FT - 'file_transfer_proxies': [opt_str, 'proxy.eu.jabber.org, proxy.jabber.ru, proxy.jabbim.cz'], + 'file_transfer_proxies': [opt_str, ''], 'use_ft_proxies': [opt_bool, False, _('If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer.'), True], 'test_ft_proxies_on_startup': [opt_bool, False, _('If True, Gajim will test file transfer proxies on startup to be sure it works. Openfire\'s proxies are known to fail this test even if they work.')], 'msgwin-x-position': [opt_int, -1], # Default is to let the wm decide ===================================== src/common/events.py ===================================== --- a/src/common/events.py +++ b/src/common/events.py @@ -163,7 +163,7 @@ class FileStoppedEvent(FileRequestEvent): type_ = 'file-stopped' class FileHashErrorEvent(FileRequestEvent): - type_ = 'file-hash-rror' + type_ = 'file-hash-error' class JingleIncomingEvent(Event): type_ = 'jingle-incoming' ===================================== src/common/jingle_ftstates.py ===================================== --- a/src/common/jingle_ftstates.py +++ b/src/common/jingle_ftstates.py @@ -146,7 +146,7 @@ class StateTransfering(JingleFileTransferStates): def _start_ibb_transfer(self, con): self.jft.file_props.transport_sid = self.jft.transport.sid - fp = open(self.jft.file_props.file_name, 'r') + fp = open(self.jft.file_props.file_name, 'rb') con.OpenStream(self.jft.file_props.sid, self.jft.session.peerjid, fp, blocksize=4096) ===================================== src/common/protocol/bytestream.py ===================================== --- a/src/common/protocol/bytestream.py +++ b/src/common/protocol/bytestream.py @@ -251,7 +251,7 @@ class ConnectionBytestream: if field.getValue() == nbxmpp.NS_IBB: sid = file_props.sid file_props.transport_sid = sid - fp = open(file_props.file_name, 'r') + fp = open(file_props.file_name, 'rb') self.OpenStream(sid, file_props.receiver, fp) raise nbxmpp.NodeProcessed @@ -759,7 +759,6 @@ class ConnectionIBBytestream(ConnectionBytestream): def __init__(self): ConnectionBytestream.__init__(self) self._streams = {} - self.last_sent_ibb_id = None def IBBIqHandler(self, conn, stanza): """ @@ -767,12 +766,22 @@ class ConnectionIBBytestream(ConnectionBytestream): """ typ = stanza.getType() log.debug('IBBIqHandler called typ->%s' % typ) - if typ == 'set' and stanza.getTag('open', namespace=nbxmpp.NS_IBB): + if typ == 'set' and stanza.getTag('open'): self.StreamOpenHandler(conn, stanza) - elif typ == 'set' and stanza.getTag('close', namespace=nbxmpp.NS_IBB): + elif typ == 'set' and stanza.getTag('close'): self.StreamCloseHandler(conn, stanza) - elif typ == 'result': - self.SendHandler() + elif typ == 'set' and stanza.getTag('data'): + sid = stanza.getTagAttr('data', 'sid') + file_props = FilesProp.getFilePropByTransportSid(self.name, sid) + if not file_props: + conn.send(nbxmpp.Error(stanza, nbxmpp.ERR_ITEM_NOT_FOUND)) + elif file_props.connected and self.IBBMessageHandler(conn, + stanza): + reply = stanza.buildReply('result') + reply.delChild('data') + conn.send(reply) + elif not file_props.connected: + log.debug('Received IQ for closed filetransfer, IQ dropped') elif typ == 'error': gajim.socks5queue.error_cb() else: @@ -815,18 +824,23 @@ class ConnectionIBBytestream(ConnectionBytestream): file_props.disconnect_cb = None file_props.continue_cb = None file_props.syn_id = stanza.getID() - file_props.fp = open(file_props.file_name, 'w') + file_props.fp = open(file_props.file_name, 'wb') conn.send(rep) def CloseIBBStream(self, file_props): file_props.connected = False file_props.fp.close() file_props.stopped = True - self.connection.send(nbxmpp.Protocol('iq', - file_props.direction[1:], 'set', + to = file_props.receiver + if file_props.direction == '<': + to = file_props.sender + self.connection.send( + nbxmpp.Protocol('iq', to, 'set', payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close', - {'sid':file_props.sid})])) - if file_props.session_type == 'jingle': + {'sid':file_props.transport_sid})])) + if file_props.completed: + gajim.socks5queue.complete_transfer_cb(self.name, file_props) + elif file_props.session_type == 'jingle': peerjid = \ file_props.receiver if file_props.type_ == 's' else file_props.sender session = self.get_jingle_session(peerjid, file_props.sid, 'file') @@ -844,7 +858,7 @@ class ConnectionIBBytestream(ConnectionBytestream): base64 encoding that increases size of data by 1/3. """ file_props = FilesProp.getFilePropBySid(sid) - file_props.direction = '|>' + to + file_props.direction = '>' file_props.block_size = blocksize file_props.fp = fp file_props.seq = 0 @@ -863,53 +877,41 @@ class ConnectionIBBytestream(ConnectionBytestream): file_props.syn_id = syn.getID() return file_props - def SendHandler(self): + def SendHandler(self, file_props): """ Send next portion of data if it is time to do it. Used internally. """ log.debug('SendHandler called') - for file_props in FilesProp.getAllFileProp(): - if not file_props.direction: - # it's socks5 bytestream - continue - sid = file_props.sid - if file_props.direction[:2] == '|>': - # We waitthat other part accept stream - continue - if file_props.direction[0] == '>': - if file_props.paused: - continue - if not file_props.connected: - #TODO: Reply with out of order error - continue - chunk = file_props.fp.read(file_props.block_size) - if chunk: - datanode = nbxmpp.Node(nbxmpp.NS_IBB + ' data', { - 'sid': file_props.transport_sid, - 'seq': file_props.seq}, base64.b64encode(chunk.encode( - 'utf-8')).decode('utf-8')) - file_props.seq += 1 - file_props.started = True - if file_props.seq == 65536: - file_props.seq = 0 - self.last_sent_ibb_id = self.connection.send( - nbxmpp.Protocol(name='iq', to=file_props.direction[1:], - typ='set', payload=[datanode])) - current_time = time.time() - file_props.elapsed_time += current_time - file_props.last_time - file_props.last_time = current_time - file_props.received_len += len(chunk) - gajim.socks5queue.progress_transfer_cb(self.name, - file_props) - else: - # notify the other side about stream closing - # notify the local user about sucessfull send - # delete the local stream - self.connection.send(nbxmpp.Protocol('iq', - file_props.direction[1:], 'set', - payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close', - {'sid': file_props.transport_sid})])) - file_props.completed = True + if file_props.completed: + self.CloseIBBStream(file_props) + if file_props.paused: + return + if not file_props.connected: + #TODO: Reply with out of order error + return + chunk = file_props.fp.read(file_props.block_size) + if chunk: + datanode = nbxmpp.Node(nbxmpp.NS_IBB + ' data', { + 'sid': file_props.transport_sid, + 'seq': file_props.seq}, + base64.b64encode(chunk).decode('ascii')) + file_props.seq += 1 + file_props.started = True + if file_props.seq == 65536: + file_props.seq = 0 + file_props.syn_id = self.connection.send( + nbxmpp.Protocol(name='iq', to=file_props.receiver, + typ='set', payload=[datanode])) + current_time = time.time() + file_props.elapsed_time += current_time - file_props.last_time + file_props.last_time = current_time + file_props.received_len += len(chunk) + if file_props.size == file_props.received_len: + file_props.completed = True + gajim.socks5queue.progress_transfer_cb(self.name, + file_props) + else: + log.debug('Nothing to read, but file not completed') def IBBMessageHandler(self, conn, stanza): """ @@ -978,6 +980,7 @@ class ConnectionIBBytestream(ConnectionBytestream): else: conn.send(nbxmpp.Error(stanza, nbxmpp.ERR_ITEM_NOT_FOUND)) + def IBBAllIqHandler(self, conn, stanza): """ Handle remote side reply about if it agree or not to receive our @@ -999,25 +1002,9 @@ class ConnectionIBBytestream(ConnectionBytestream): else: conn.Event('IBB', 'ERROR ON SEND', file_props) elif stanza.getType() == 'result': - if file_props.direction[0] == '|': - file_props.direction = file_props.direction[1:] - self.SendHandler() - else: - conn.send(nbxmpp.Error(stanza, - nbxmpp.ERR_UNEXPECTED_REQUEST)) + self.SendHandler(file_props) break - else: - if stanza.getTag('data'): - sid = stanza.getTagAttr('data', 'sid') - file_props = FilesProp.getFilePropByTransportSid(self.name, sid) - if file_props.connected and self.IBBMessageHandler(conn, - stanza): - reply = stanza.buildReply('result') - reply.delChild('data') - conn.send(reply) - raise nbxmpp.NodeProcessed - elif syn_id == self.last_sent_ibb_id: - self.SendHandler() + class ConnectionSocks5BytestreamZeroconf(ConnectionSocks5Bytestream): ===================================== src/dialogs.py ===================================== --- a/src/dialogs.py +++ b/src/dialogs.py @@ -1271,6 +1271,11 @@ class AddNewContactWindow: def _nec_gateway_prompt_received(self, obj): if self.adding_jid: jid, transport, type_ = self.adding_jid + if obj.stanza.getError(): + ErrorDialog(_('Error while adding transport contact'), + _('This error occured while adding a contact for transport ' + '%s:\n\n%s') % (transport, obj.stanza.getErrorMsg())) + return if obj.prompt_jid: self._add_jid(obj.prompt_jid, type_) else: ===================================== src/filetransfers_window.py ===================================== --- a/src/filetransfers_window.py +++ b/src/filetransfers_window.py @@ -70,8 +70,7 @@ class FileTransfersWindow: 'notify_ft_complete_checkbox') shall_notify = gajim.config.get('notify_on_file_complete') - self.notify_ft_checkbox.set_active(shall_notify - ) + self.notify_ft_checkbox.set_active(shall_notify) self.model = Gtk.ListStore(GdkPixbuf.Pixbuf, str, str, str, str, int, int, str) self.tree.set_model(self.model) @@ -841,7 +840,7 @@ class FileTransfersWindow: if not is_row_selected: # no selection, disable the buttons self.set_all_insensitive() - elif not is_stopped: + elif not is_stopped and file_props.continue_cb: if is_transfer_active(file_props): # file transfer is active self.toggle_pause_continue(True) ===================================== src/gui_interface.py ===================================== --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -988,11 +988,6 @@ class Interface: session = gajim.connections[account].get_jingle_session(jid=None, sid=file_props.sid) ft_win = self.instances['file_transfers'] - if not file_props.hash_: - # We disn't get the hash, sender probably don't support that - jid = file_props.sender - self.popup_ft_result(account, jid, file_props) - ft_win.set_status(file_props, 'ok') h = Hashes() try: file_ = open(file_props.file_name, 'rb') @@ -1027,14 +1022,26 @@ class Interface: if file_props.stalled or file_props.paused: return - if file_props.type_ == 'r' and file_props.hash_: # we receive a file + if file_props.type_ == 'r': # we receive a file gajim.socks5queue.remove_receiver(file_props.sid, True, True) - # we compare hashes if file_props.session_type == 'jingle': - # Compare hashes in a new thread - self.hashThread = Thread(target=self.__compare_hashes, - args=(account, file_props)) - self.hashThread.start() + if file_props.hash_ and file_props.error == 0: + # We compare hashes in a new thread + self.hashThread = Thread(target=self.__compare_hashes, + args=(account, file_props)) + self.hashThread.start() + else: + # We disn't get the hash, sender probably don't support that + jid = file_props.sender + self.popup_ft_result(account, jid, file_props) + if file_props.error == 0: + ft.set_status(file_props, 'ok') + session = gajim.connections[account].get_jingle_session(jid=None, + sid=file_props.sid) + # End jingle session + # TODO: only if there are no other parallel downloads in this session + if session: + session.end_session() else: # we send a file jid = file_props.receiver gajim.socks5queue.remove_sender(file_props.sid, True, True) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0f1d04e48808e8df20efbebcf2c49e41b…

1 0

[Git][gajim/python-nbxmpp][master] 3 commits: Dont deepcopy stanza for smack queue
by Philipp Hörist 26 Apr '17

26 Apr '17

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: caa63371 by Philipp Hörist at 2017-04-26T16:52:36+02:00 Dont deepcopy stanza for smack queue the Node Object is not deepcopy-able in all cases. Specifically the ESession negotiation does not work. Sending the stanza first and adding the delay tag for the queue afterwards makes it so we dont have to copy the object - - - - - c9ca5e48 by Philipp Hörist at 2017-04-26T17:11:17+02:00 Simplify code and satisfy pylint - - - - - 9cfe6015 by Philipp Hörist at 2017-04-26T21:02:41+02:00 Merge branch 'master' into 'master' Fix problems with deepcopy See merge request !6 - - - - - 1 changed file: - nbxmpp/dispatcher_nb.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== --- a/nbxmpp/dispatcher_nb.py +++ b/nbxmpp/dispatcher_nb.py @@ -571,23 +571,23 @@ class XMPPDispatcher(PlugIn): if self._owner._registered_name and not stanza.getAttr('from'): stanza.setAttr('from', self._owner._registered_name) + self._owner.Connection.send(stanza, now) + # If no ID then it is a whitespace if self.sm and self.sm.enabled and ID: - stanza_copy = copy.deepcopy(stanza) # add timestamp to message stanza in queue - if stanza_copy.getName() == 'message' and \ - (stanza_copy.getType() == 'chat' or stanza_copy.getType() == 'groupchat'): - our_jid = stanza_copy.getAttr('from') - timestamp = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(None)) - stanza_copy.addChild('delay', namespace=NS_DELAY2, - attrs={'from': our_jid or "Gajim", 'stamp': timestamp}) - self.sm.uqueue.append(stanza_copy) + if (stanza.getName() == 'message' and + stanza.getType() in ('chat', 'groupchat')): + our_jid = stanza.getAttr('from') + timestamp = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime()) + stanza.addChild('delay', namespace=NS_DELAY2, + attrs={'from': our_jid or 'Gajim', + 'stamp': timestamp}) + self.sm.uqueue.append(stanza) self.sm.out_h += 1 - self._owner.Connection.send(stanza, now) - - if self.sm and self.sm.enabled and ID and len(self.sm.uqueue) > self.sm.max_queue: - self.sm.request_ack() + if len(self.sm.uqueue) > self.sm.max_queue: + self.sm.request_ack() return ID View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/23a410277ac89e5cd69030c2f…

1 0

[Git][gajim/gajim][gajim_0.16] 4 commits: Rename network_manager_listener to network_watcher
by Philipp Hörist 25 Apr '17

25 Apr '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 8f8fde67 by Jörg Sommer at 2017-04-19T12:01:54+02:00 Rename network_manager_listener to network_watcher For better abstraction, because this module should handle more then Network Manager. - - - - - 77e19784 by Jörg Sommer at 2017-04-19T23:43:28+02:00 network_watcher: Refactor account connection update Put the common code for connection update in one function, what makes it more reusable. - - - - - 3c430920 by Jörg Sommer at 2017-04-19T23:49:28+02:00 network_watcher: Add support for systemd-networkd The systemd-networkd uses another D-Bus interface and different messages than Network Manager. - - - - - abf62abf by Philipp Hörist at 2017-04-25T12:43:35+02:00 Merge branch 'master' into 'gajim_0.16' Network link status detection with systemd-networkd See merge request !86 - - - - - 3 changed files: - src/features_window.py - src/gui_interface.py - src/network_manager_listener.py → src/network_watcher.py Changes: ===================================== src/features_window.py ===================================== --- a/src/features_window.py +++ b/src/features_window.py @@ -188,8 +188,8 @@ class FeaturesWindow: def network_manager_available(self): if os.name == 'nt': return False - import network_manager_listener - return network_manager_listener.supported + import network_watcher + return network_watcher.supported def session_management_available(self): if os.name == 'nt': ===================================== src/gui_interface.py ===================================== --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -2972,7 +2972,7 @@ class Interface: if gajim.config.get('networkmanager_support') and \ dbus_support.supported: - import network_manager_listener + import network_watcher if dbus_support.supported: import upower_listener ===================================== src/network_manager_listener.py → src/network_watcher.py ===================================== --- a/src/network_manager_listener.py +++ b/src/network_watcher.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- -## src/network_manager_listener.py +## src/network_watcher.py ## ## Copyright (C) 2006 Jeffrey C. Ollie <jeff AT ocjtech.us> ## Nikos Kouremenos <kourem AT gmail.com> ## Stefan Bethge <stefan AT lanpartei.de> ## Copyright (C) 2006-2017 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2017 Jörg Sommer <joerg(a)alea.gnuu.de> ## ## This file is part of Gajim. ## @@ -23,30 +24,8 @@ from common import gajim - -def device_now_active(self, *args): - """ - For Network Manager 0.6 - """ - for connection in gajim.connections.itervalues(): - if gajim.config.get_per('accounts', connection.name, - 'listen_to_network_manager') and connection.time_to_reconnect: - connection._reconnect() - -def device_no_longer_active(self, *args): - """ - For Network Manager 0.6 - """ - for connection in gajim.connections.itervalues(): - if gajim.config.get_per('accounts', connection.name, - 'listen_to_network_manager') and connection.connected > 1: - connection._disconnectedReconnCB() - -def state_changed(state): - """ - For Network Manager 0.7 - 0.9 - """ - if state == 70: +def update_accounts(connection_is_up): + if connection_is_up: for connection in gajim.connections.itervalues(): if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and connection.time_to_reconnect: @@ -64,37 +43,54 @@ from common import dbus_support if dbus_support.supported: import dbus - try: - from common.dbus_support import system_bus + from common.dbus_support import system_bus - bus = system_bus.bus() + bus = system_bus.bus() - if 'org.freedesktop.NetworkManager' in bus.list_names(): + if 'org.freedesktop.NetworkManager' in bus.list_names(): + try: + """ + For Network Manager 0.7 - 0.9 + """ nm_object = bus.get_object('org.freedesktop.NetworkManager', - '/org/freedesktop/NetworkManager') + '/org/freedesktop/NetworkManager') props = dbus.Interface(nm_object, "org.freedesktop.DBus.Properties") - bus.add_signal_receiver(state_changed, + + bus.add_signal_receiver(lambda state: update_accounts(connection_is_up = state == 70), 'StateChanged', 'org.freedesktop.NetworkManager', 'org.freedesktop.NetworkManager', '/org/freedesktop/NetworkManager') supported = True - except dbus.DBusException: - try: - if 'org.freedesktop.NetworkManager' in bus.list_names(): + except dbus.DBusException: + try: + """ + For Network Manager 0.6 + """ supported = True - bus.add_signal_receiver(device_no_longer_active, + bus.add_signal_receiver(lambda *args: update_accounts(connection_is_up = False), 'DeviceNoLongerActive', 'org.freedesktop.NetworkManager', 'org.freedesktop.NetworkManager', '/org/freedesktop/NetworkManager') - bus.add_signal_receiver(device_now_active, + bus.add_signal_receiver(lambda *args: update_accounts(connection_is_up = True), 'DeviceNowActive', 'org.freedesktop.NetworkManager', 'org.freedesktop.NetworkManager', '/org/freedesktop/NetworkManager') - except Exception: - pass + except Exception: + pass + elif 'org.freedesktop.network1' in bus.list_names(): + """ + For systemd-networkd + """ + def state_changed(sender, data, junk): + if 'OperationalState' in data: + update_accounts(connection_is_up = data['OperationalState'] == 'routable') + + bus.add_signal_receiver(state_changed, 'PropertiesChanged', + path = '/org/freedesktop/network1') + supported = True View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ffc762b6578f87d8b08039e18dfb4f842…

1 0

[Git][gajim/gajim][master] Fix path to logs.db in history manager
by Philipp Hörist 24 Apr '17

24 Apr '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0f1d04e4 by Philipp Hörist at 2017-04-25T01:36:10+02:00 Fix path to logs.db in history manager Logs.db is always at data_root, even if we set another config directory with -c - - - - - 1 changed file: - src/app_actions.py Changes: ===================================== src/app_actions.py ===================================== --- a/src/app_actions.py +++ b/src/app_actions.py @@ -60,7 +60,7 @@ class AppActions(): gajim.interface.instances['accounts'] = config.AccountsWindow() def on_history_manager(self, action, param): - config_path = '-c %s' % gajim.gajimpaths.config_root + config_path = '-c %s' % gajim.gajimpaths.data_root posix = os.name != 'nt' if os.path.exists('history_manager.exe'): # Windows helpers.exec_command('history_manager.exe %s' % config_path, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0f1d04e48808e8df20efbebcf2c49e41b2…

1 0

[Git][gajim/gajim][gajim_0.16] Fix path to logs.db in history manager
by Philipp Hörist 24 Apr '17

24 Apr '17

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: ffc762b6 by Philipp Hörist at 2017-04-25T01:30:47+02:00 Fix path to logs.db in history manager Logs.db is always at data_root, even if we set another config directory with -c - - - - - 1 changed file: - src/roster_window.py Changes: ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -2856,7 +2856,7 @@ class RosterWindow: gajim.connections[account].send_motd(server) def on_history_manager_menuitem_activate(self, widget): - config_path = '-c %s' % gajim.gajimpaths.config_root + config_path = '-c %s' % gajim.gajimpaths.data_root posix = os.name != 'nt' if os.path.exists('history_manager.exe'): # Windows helpers.exec_command('history_manager.exe %s' % config_path, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ffc762b6578f87d8b08039e18dfb4f8423…

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2017