Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Fix theming option names
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 732ed0a1 by Philipp Hörist at 2018-08-19T10:15:07Z Fix theming option names - - - - - 1 changed file: - gajim/gtk/themes.py Changes: ===================================== gajim/gtk/themes.py ===================================== --- a/gajim/gtk/themes.py +++ b/gajim/gtk/themes.py @@ -74,7 +74,7 @@ CSS_STYLE_OPTIONS = [ '.gajim-account-row', StyleAttr.BACKGROUND), - StyleOption(_('Account Row Font Color'), + StyleOption(_('Account Row Font'), '.gajim-account-row', StyleAttr.FONT), @@ -86,7 +86,7 @@ CSS_STYLE_OPTIONS = [ '.gajim-group-row', StyleAttr.BACKGROUND), - StyleOption(_('Group Row Font Color'), + StyleOption(_('Group Row Font'), '.gajim-group-row', StyleAttr.FONT), @@ -98,7 +98,7 @@ CSS_STYLE_OPTIONS = [ '.gajim-contact-row', StyleAttr.BACKGROUND), - StyleOption(_('Contact Row Font Color'), + StyleOption(_('Contact Row Font'), '.gajim-contact-row', StyleAttr.FONT), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/732ed0a1622999e47a9aa5a812ebd2368c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/732ed0a1622999e47a9aa5a812ebd2368c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Prepare Windows build
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 40a81937 by Philipp Hörist at 2018-08-19T09:53:37Z Prepare Windows build - - - - - 1 changed file: - appveyor.yml Changes: ===================================== appveyor.yml ===================================== --- a/appveyor.yml +++ b/appveyor.yml @@ -31,8 +31,8 @@ build_script: bash "git clone C:/projects/gajim C:/msys64/home/appveyor/gajim" bash "C:/msys64/home/appveyor/gajim/win/build.sh $($env:MSYS_ARCH)" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-Master-$($env:ARCH)-$($env:TIME_STRING).exe" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-Master-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.1.0-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.1.0-$($env:ARCH)-$($env:TIME_STRING).exe" # on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/40a819375166901c7c30b775199ebaa7df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/40a819375166901c7c30b775199ebaa7df… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch gajim_1.1
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed new branch gajim_1.1 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/tree/gajim_1.1 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Raise min nbxmpp version to 0.6.7
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b37a42c3 by Philipp Hörist at 2018-08-19T08:50:51Z Raise min nbxmpp version to 0.6.7 - - - - - c4dfc0f8 by Philipp Hörist at 2018-08-19T08:50:51Z Caps: Lower log level - - - - - 3 changed files: - gajim/common/modules/caps.py - gajim/gajim.py - setup.py Changes: ===================================== gajim/common/modules/caps.py ===================================== --- a/gajim/common/modules/caps.py +++ b/gajim/common/modules/caps.py @@ -97,7 +97,7 @@ class Caps: if contact is not None: contact.client_caps = client_caps else: - log.warning('Received Caps from unknown contact %s' % from_) + log.info('Received Caps from unknown contact %s' % from_) def _get_contact_or_gc_contact_for_jid(self, from_): contact = app.contacts.get_contact_from_full_jid(self._account, ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -29,7 +29,7 @@ from distutils.version import LooseVersion as V # Install _() in namespace from gajim.common import i18n -_MIN_NBXMPP_VER = "0.6.6" +_MIN_NBXMPP_VER = "0.6.7" _MIN_GTK_VER = "3.22.0" ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -285,7 +285,7 @@ setup( data_files=data_files, install_requires=[ 'keyring', - 'nbxmpp>=0.6.6', + 'nbxmpp>=0.6.7', 'pyOpenSSL>=0.12', 'cssutils>=1.0.2' ] View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/cb1ff06136b60d4d0aca21e4ad974a3b2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/cb1ff06136b60d4d0aca21e4ad974a3b2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update ChangeLog
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: cb1ff061 by Sophie Herold at 2018-08-19T08:45:22Z Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ Gajim 1.0.99 (19 August 2018) * Support for setting a MUC Avatar * Support for PKIX over Secure HTTP (POSH) + * Support idle time for GNOME on Wayland * New Emoji chooser * Noto Emoji theme updated to Unicode 11 * Twitter Emoji theme added View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cb1ff06136b60d4d0aca21e4ad974a3b20… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cb1ff06136b60d4d0aca21e4ad974a3b20… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Support notification daemons with no actions once again
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 036c8679 by Alexei Sorokin at 2018-08-19T08:38:22Z Support notification daemons with no actions once again - - - - - 1 changed file: - gajim/notify.py Changes: ===================================== gajim/notify.py ===================================== --- a/gajim/notify.py +++ b/gajim/notify.py @@ -25,6 +25,7 @@ # 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 import sys from gi.repository import GLib @@ -37,6 +38,8 @@ from gajim.common import app from gajim.common import helpers from gajim.common import ged +log = logging.getLogger('gajim.notify') + def get_show_in_roster(event, account, jid, session=None): """ @@ -72,6 +75,32 @@ class Notification: Handle notifications """ def __init__(self): + self.daemon_capabilities = ['actions'] + + # Detect if actions are supported by the notification daemon + if sys.platform == 'linux': + def on_proxy_ready(source, res, data=None): + try: + proxy = Gio.DBusProxy.new_finish(res) + self.daemon_capabilities = proxy.GetCapabilities() + except GLib.Error as e: + if e.domain == 'g-dbus-error-quark': + log.info('Notifications D-Bus connection failed: %s', + e.message) + else: + raise + else: + log.debug('Notifications D-Bus connected') + + log.debug('Connecting to Notifications D-Bus') + Gio.DBusProxy.new_for_bus(Gio.BusType.SESSION, + Gio.DBusProxyFlags.DO_NOT_CONNECT_SIGNALS, + None, + 'org.freedesktop.Notifications', + '/org/freedesktop/Notifications', + 'org.freedesktop.Notifications', + None, on_proxy_ready) + app.ged.register_event_handler( 'notification', ged.GUI2, self._nec_notification) app.ged.register_event_handler( @@ -159,15 +188,18 @@ class Notification: _('File Transfer Error'), _('File Transfer Completed'), _('File Transfer Stopped'), _('Groupchat Invitation'), _('Connection Failed'), _('Subscription request'), _('Unsubscribed')): - # Create Variant Dict - dict_ = {'account': GLib.Variant('s', account), - 'jid': GLib.Variant('s', jid), - 'type_': GLib.Variant('s', type_)} - variant_dict = GLib.Variant('a{sv}', dict_) - action = 'app.{}-open-event'.format(account) - #Button in notification - notification.add_button_with_target(_('Open'), action, variant_dict) - notification.set_default_action_and_target(action, variant_dict) + if 'actions' in self.daemon_capabilities: + # Create Variant Dict + dict_ = {'account': GLib.Variant('s', account), + 'jid': GLib.Variant('s', jid), + 'type_': GLib.Variant('s', type_)} + variant_dict = GLib.Variant('a{sv}', dict_) + action = 'app.{}-open-event'.format(account) + #Button in notification + notification.add_button_with_target(_('Open'), action, + variant_dict) + notification.set_default_action_and_target(action, + variant_dict) # Only one notification per JID if event_type in (_('Contact Signed In'), _('Contact Signed Out'), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/036c867902ca0a7506628eb8ed79d01dbc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/036c867902ca0a7506628eb8ed79d01dbc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Tests: fix imports
by Philipp Hörist 19 Aug '18

19 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 38218ace by André Apitzsch at 2018-08-18T20:19:01Z Tests: fix imports - - - - - 4 changed files: - test/integration/test_resolver.py - test/lib/__init__.py - test/unit/test_jingle.py - test/unit/test_sessions.py Changes: ===================================== test/integration/test_resolver.py ===================================== --- a/test/integration/test_resolver.py +++ b/test/integration/test_resolver.py @@ -9,7 +9,6 @@ from gi.repository import GLib from gajim.common import resolver -from mock import Mock, expectParams from gajim_mocks import * from xmpp_mocks import IdleQueueThread ===================================== test/lib/__init__.py ===================================== --- a/test/lib/__init__.py +++ b/test/lib/__init__.py @@ -55,5 +55,5 @@ def setup_env(): if use_x: from gajim import gtkgui_helpers gtkgui_helpers.GUI_DIR = gajim_root + '/gajim/data/gui' - from gajim.gajim import GajimApplication + from gajim.application import GajimApplication app.app = GajimApplication() ===================================== test/unit/test_jingle.py ===================================== --- a/test/unit/test_jingle.py +++ b/test/unit/test_jingle.py @@ -9,12 +9,11 @@ lib.setup_env() from mock import Mock from gajim.common.protocol.bytestream import ConnectionIBBytestream, ConnectionSocks5Bytestream -from common.xmpp import dispatcher_nb -from common.xmpp import protocol +from nbxmpp import dispatcher_nb +from nbxmpp import protocol from gajim.common.jingle import ConnectionJingle -from gajim.common import gajim +from gajim.common import app from gajim.common.socks5 import SocksQueue -import gajim.common session_init = ''' @@ -72,17 +71,17 @@ class Connection(Mock, ConnectionJingle, ConnectionSocks5Bytestream, ConnectionIBBytestream.__init__(self) self.connected = 2 # This tells gajim we are connected - def send(self, stanza=None, when=None): # Called when gajim wants to send something print(str(stanza)) + class TestJingle(unittest.TestCase): def setUp(self): self.dispatcher = dispatcher_nb.XMPPDispatcher() - gajim.nec = Mock() - gajim.socks5queue = SocksQueue(Mock()) + app.nec = Mock() + app.socks5queue = SocksQueue(Mock()) # Setup mock client self.client = Connection() self.client.__str__ = lambda: 'Mock' # FIXME: why do I need this one? @@ -99,10 +98,10 @@ class TestJingle(unittest.TestCase): a lot of places. It is easier to just copy it in here. If the session_initiate stanza changes, this also must change. ''' - self.recieve_file = {'stream-methods': + self.receive_file = {'stream-methods': 'http://jabber.org/protocol/bytestreams', 'sender': 'jtest(a)thiessen.im/Gajim', - 'file-name': 'test_recieved_file', + 'file-name': 'test_received_file', 'request-id': '43', 'sid': '39', 'session-sid': '38', 'session-type': 'jingle', 'transfered_size': [], 'receiver': @@ -132,26 +131,23 @@ class TestJingle(unittest.TestCase): def _simulate_jingle_session(self): - self.dispatcher.RegisterHandler('iq', self.con._JingleCB, 'set' - , common.xmpp.NS_JINGLE) + self.dispatcher.RegisterHandler('iq', self.con._JingleCB, 'set', + protocol.NS_JINGLE) self.dispatcher.ProcessNonBlocking(session_init) session = list(self.con._sessions.values())[0] # The only session we have jft = list(session.contents.values())[0] # jingleFT object - jft.file_props = self.recieve_file # We plug file_props manually - # The user accepts to recieve the file + jft.file_props = self.receive_file # We plug file_props manually + # The user accepts to receive the file # we have to manually simulate this behavior session.approve_session() - self.con.send_file_approval(self.recieve_file) + self.con.send_file_approval(self.receive_file) self.dispatcher.ProcessNonBlocking(transport_info) - def test_jingle_session(self): self._simulate_connect() self._simulate_jingle_session() - - if __name__ == '__main__': unittest.main() ===================================== test/unit/test_sessions.py ===================================== --- a/test/unit/test_sessions.py +++ b/test/unit/test_sessions.py @@ -13,13 +13,12 @@ from gajim.common import nec from gajim.common import ged from gajim.common.nec import NetworkEvent from gajim.common.modules.message import MessageReceivedEvent -from gajim.common.connection_handlers_events import DecryptedMessageReceivedEvent +from gajim.common.modules.message import DecryptedMessageReceivedEvent import nbxmpp from gajim.session import ChatControlSession from gajim.roster_window import RosterWindow -from mock import Mock, expectParams from gajim_mocks import * from data import account1 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/38218aced1d8d0e773b0fd258c714236b4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/38218aced1d8d0e773b0fd258c714236b4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix jingle negotiation from an XMPP point of view
by Philipp Hörist 18 Aug '18

18 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c49f9d60 by Yann Leboulanger at 2018-08-18T14:05:33Z fix jingle negotiation from an XMPP point of view - - - - - 4 changed files: - gajim/chat_control.py - gajim/common/jingle_rtp.py - gajim/common/jingle_session.py - gajim/gui_interface.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -264,17 +264,17 @@ class ChatControl(ChatControlBase): act.connect("activate", func) self.parent_win.window.add_action(act) - act = Gio.SimpleAction.new_stateful( + self.audio_action = Gio.SimpleAction.new_stateful( 'toggle-audio-' + self.control_id, None, GLib.Variant.new_boolean(False)) - act.connect('change-state', self._on_audio) - self.parent_win.window.add_action(act) + self.audio_action.connect('change-state', self._on_audio) + self.parent_win.window.add_action(self.audio_action) - act = Gio.SimpleAction.new_stateful( + self.video_action = Gio.SimpleAction.new_stateful( 'toggle-video-' + self.control_id, None, GLib.Variant.new_boolean(False)) - act.connect('change-state', self._on_video) - self.parent_win.window.add_action(act) + self.video_action.connect('change-state', self._on_video) + self.parent_win.window.add_action(self.video_action) def update_actions(self): win = self.parent_win.window @@ -526,7 +526,8 @@ class ChatControl(ChatControlBase): if state in ('connection_received', 'connecting'): setattr(self, jingle_type + '_sid', sid) - getattr(self, '_' + jingle_type + '_button').set_active(jingle_state != self.JINGLE_STATE_NULL) + v = GLib.Variant.new_boolean(jingle_state != self.JINGLE_STATE_NULL) + getattr(self, jingle_type + '_action').change_state(v) getattr(self, 'update_' + jingle_type)() @@ -724,7 +725,8 @@ class ChatControl(ChatControlBase): content = session.get_content(jingle_type) if content: session.remove_content(content.creator, content.name) - getattr(self, '_' + jingle_type + '_button').set_active(False) + v = GLib.Variant.new_boolean(False) + getattr(self, jingle_type + '_action').change_state(v) getattr(self, 'update_' + jingle_type)() def on_jingle_button_toggled(self, state, jingle_type): @@ -768,9 +770,6 @@ class ChatControl(ChatControlBase): fixed.set_no_show_all(True) self.close_jingle_content(jingle_type) - img = getattr(self, '_' + jingle_type + '_button').get_property('image') - img.set_from_file(path_to_img) - def set_lock_image(self): loggable = self.session and self.session.is_loggable() ===================================== gajim/common/jingle_rtp.py ===================================== --- a/gajim/common/jingle_rtp.py +++ b/gajim/common/jingle_rtp.py @@ -43,7 +43,7 @@ class JingleRTPContent(JingleContent): def __init__(self, session, media, transport=None): if transport is None: transport = JingleTransportICEUDP(None) - JingleContent.__init__(self, session, transport) + JingleContent.__init__(self, session, transport, None) self.media = media self._dtmf_running = False self.farstream_media = { ===================================== gajim/common/jingle_session.py ===================================== --- a/gajim/common/jingle_session.py +++ b/gajim/common/jingle_session.py @@ -633,8 +633,7 @@ class JingleSession: if content_type: try: if transport: - content = content_type( - self, transport=transport, senders=senders) + content = content_type(self, transport=transport) self.add_content(element['name'], content, 'peer') contents.append(content) ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1238,7 +1238,7 @@ class Interface: # TODO: conditional blocking if peer is not in roster account = obj.conn.name - content_types = obj.contents.media + content_types = [obj.contents.media] # check type of jingle session if 'audio' in content_types or 'video' in content_types: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c49f9d60abbc66ac3d9e3a8a2f18d81cb6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c49f9d60abbc66ac3d9e3a8a2f18d81cb6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Simplify removing events on scroll to bottom
by Philipp Hörist 18 Aug '18

18 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: dfb7b4a0 by Philipp Hörist at 2018-08-18T13:56:23Z Simplify removing events on scroll to bottom - - - - - 1 changed file: - gajim/chat_control_base.py Changes: ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -1233,11 +1233,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if self.parent_win.get_active_control() == self and \ self.parent_win.window.is_active(): # we are at the end - if self.type_id == message_control.TYPE_GC: - if not app.events.remove_events(self.account, jid, - types=types_list): - self.redraw_after_event_removed(jid) - elif not app.events.remove_events( + if not app.events.remove_events( self.account, jid, types=types_list): # There were events to remove self.redraw_after_event_removed(jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dfb7b4a0ddceb4522917b22e4897116a36… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dfb7b4a0ddceb4522917b22e4897116a36… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix arguments in method call
by Philipp Hörist 18 Aug '18

18 Aug '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: bd8486f8 by Philipp Hörist at 2018-08-18T13:52:12Z Fix arguments in method call - - - - - 1 changed file: - gajim/chat_control_base.py Changes: ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -1237,7 +1237,8 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if not app.events.remove_events(self.account, jid, types=types_list): self.redraw_after_event_removed(jid) - elif not app.events.remove_events(types_list): + elif not app.events.remove_events( + self.account, jid, types=types_list): # There were events to remove self.redraw_after_event_removed(jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bd8486f822ef50c787e60f5c4e8cf6902a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bd8486f822ef50c787e60f5c4e8cf6902a… 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