Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Windows: Fix translation
by Philipp Hörist 08 Sep '18

08 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 52e09cf5 by Philipp Hörist at 2018-09-08T06:40:42Z Windows: Fix translation Fixes #9324 - - - - - 3 changed files: - gajim/application.py - gajim/gtk/util.py - gajim/gtkgui_helpers.py Changes: ===================================== gajim/application.py ===================================== --- a/gajim/application.py +++ b/gajim/application.py @@ -182,8 +182,8 @@ class GajimApplication(Gtk.Application): # Set Application Menu app.app = self - from gajim import gtkgui_helpers - builder = gtkgui_helpers.get_gtk_builder('application_menu.ui') + from gajim.gtk.util import get_builder + builder = get_builder('application_menu.ui') menubar = builder.get_object("menubar") appmenu = builder.get_object("appmenu") if app.prefers_app_menu(): ===================================== gajim/gtk/util.py ===================================== --- a/gajim/gtk/util.py +++ b/gajim/gtk/util.py @@ -68,7 +68,10 @@ def get_builder(file_name, widget=None): if widget is not None: builder.add_objects_from_string(xml_text, [widget]) else: - builder.add_from_string(xml_text) + # Workaround + # https://gitlab.gnome.org/GNOME/pygobject/issues/255 + Gtk.Builder.__mro__[1].add_from_string( + builder, xml_text, len(xml_text.encode("utf-8"))) else: if widget is not None: builder.add_objects_from_file(file_path, [widget]) ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -140,7 +140,10 @@ def get_gtk_builder(file_name, widget=None): if widget is not None: builder.add_objects_from_string(xml_text, [widget]) else: - builder.add_from_string(xml_text) + # Workaround + # https://gitlab.gnome.org/GNOME/pygobject/issues/255 + Gtk.Builder.__mro__[1].add_from_string( + builder, xml_text, len(xml_text.encode("utf-8"))) else: if widget is not None: builder.add_objects_from_file(file_path, [widget]) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/52e09cf5265b6fd1bfeaeda8a8e7b4db26… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/52e09cf5265b6fd1bfeaeda8a8e7b4db26… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove verbose logging of idle time
by Philipp Hörist 06 Sep '18

06 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c8b31dff by Philipp Hörist at 2018-09-06T19:44:31Z Remove verbose logging of idle time - - - - - 1 changed file: - gajim/common/idle.py Changes: ===================================== gajim/common/idle.py ===================================== --- a/gajim/common/idle.py +++ b/gajim/common/idle.py @@ -257,7 +257,6 @@ class IdleMonitor: return True idle_time = self.get_idle_sec() - log.info('Idle time: %s', idle_time) # xa is stronger than away so check for xa first if idle_time > self._xa_interval: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c8b31dffbbc4ebe716ded2a47d01102089… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c8b31dffbbc4ebe716ded2a47d01102089… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Improve locked screen detection
by Philipp Hörist 06 Sep '18

06 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: bba88cf6 by Philipp Hörist at 2018-09-06T19:41:38Z Windows: Improve locked screen detection UAC prompts count as locked screens, so only trigger extended away when the screen is more than 10 seconds locked Fixes #9117 - - - - - 1 changed file: - gajim/common/idle.py Changes: ===================================== gajim/common/idle.py ===================================== --- a/gajim/common/idle.py +++ b/gajim/common/idle.py @@ -20,6 +20,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import sys +import time import ctypes import ctypes.util import logging @@ -151,6 +152,8 @@ class WindowsIdleMonitor: self.GetTickCount = ctypes.windll.kernel32.GetTickCount self.GetLastInputInfo = ctypes.windll.user32.GetLastInputInfo + self._locked_time = None + class LASTINPUTINFO(ctypes.Structure): _fields_ = [('cbSize', ctypes.c_uint), ('dwTime', ctypes.c_uint)] @@ -165,17 +168,29 @@ class WindowsIdleMonitor: # Check if Screen Saver is running # 0x72 is SPI_GETSCREENSAVERRUNNING saver_runing = ctypes.c_int(0) - info = self.SystemParametersInfo(0x72, 0, ctypes.byref(saver_runing), 0) + info = self.SystemParametersInfo( + 0x72, 0, ctypes.byref(saver_runing), 0) if info and saver_runing.value: return True # Check if Screen is locked + # Also a UAC prompt counts as locked + # So just return True if we are more than 10 seconds locked desk = self.OpenInputDesktop(0, False, 0) - if not desk: - return True + unlocked = bool(desk) self.CloseDesktop(desk) - return False + if unlocked: + self._locked_time = None + return False + + if self._locked_time is None: + self._locked_time = time.time() + return False + + threshold = time.time() - 10 + if threshold > self._locked_time: + return True class IdleMonitor: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bba88cf60918e17f5b3a93d904ec2fd612… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/bba88cf60918e17f5b3a93d904ec2fd612… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Revert "Windows: Remove locked screen detection"
by Philipp Hörist 06 Sep '18

06 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3a16ccb4 by Philipp Hörist at 2018-09-06T19:38:41Z Revert "Windows: Remove locked screen detection" This reverts commit 05307bd6098343993b6b57544ee5fccd2a3ce7ac - - - - - 1 changed file: - gajim/common/idle.py Changes: ===================================== gajim/common/idle.py ===================================== --- a/gajim/common/idle.py +++ b/gajim/common/idle.py @@ -168,6 +168,13 @@ class WindowsIdleMonitor: info = self.SystemParametersInfo(0x72, 0, ctypes.byref(saver_runing), 0) if info and saver_runing.value: return True + + # Check if Screen is locked + desk = self.OpenInputDesktop(0, False, 0) + if not desk: + return True + self.CloseDesktop(desk) + return False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3a16ccb4d453f399482f81fc35326edce8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3a16ccb4d453f399482f81fc35326edce8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Remove locked screen detection
by Philipp Hörist 06 Sep '18

06 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 05307bd6 by Philipp Hörist at 2018-09-06T19:17:05Z Windows: Remove locked screen detection This does not reliably tell us when the screen is locked. For example this triggers when a UAC prompt is active. >From the Windows documentation there is no way to determine if a workstation is locked Fixes #9117 - - - - - 1 changed file: - gajim/common/idle.py Changes: ===================================== gajim/common/idle.py ===================================== --- a/gajim/common/idle.py +++ b/gajim/common/idle.py @@ -168,13 +168,6 @@ class WindowsIdleMonitor: info = self.SystemParametersInfo(0x72, 0, ctypes.byref(saver_runing), 0) if info and saver_runing.value: return True - - # Check if Screen is locked - desk = self.OpenInputDesktop(0, False, 0) - if not desk: - return True - self.CloseDesktop(desk) - return False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/05307bd6098343993b6b57544ee5fccd2a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/05307bd6098343993b6b57544ee5fccd2a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix license comment format
by Philipp Hörist 05 Sep '18

05 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a4a13656 by Philipp Hörist at 2018-09-05T00:59:34Z Fix license comment format every linter flags this as an error - - - - - 30 changed files: - gajim/adhoc_commands.py - gajim/advanced_configuration_window.py - gajim/app_actions.py - gajim/atom_window.py - gajim/cell_renderer_image.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/account.py - gajim/common/app.py - gajim/common/caps_cache.py - gajim/common/config.py - gajim/common/configpaths.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/contacts.py - gajim/common/dbus_support.py - gajim/common/dh.py - gajim/common/events.py - gajim/common/exceptions.py - gajim/common/fuzzyclock.py - gajim/common/ged.py - gajim/common/gpg.py - gajim/common/helpers.py - gajim/common/i18n.py - gajim/common/idle.py - gajim/common/jingle.py - gajim/common/jingle_content.py - gajim/common/jingle_ft.py - gajim/common/jingle_ftstates.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a4a136566f7477e589215efac19eb48d0d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a4a136566f7477e589215efac19eb48d0d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix pyflakes/pycodestyle errors
by Philipp Hörist 05 Sep '18

05 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 856a874d by Philipp Hörist at 2018-09-05T00:34:36Z Fix pyflakes/pycodestyle errors - - - - - 1 changed file: - gajim/gtkexcepthook.py Changes: ===================================== gajim/gtkexcepthook.py ===================================== --- a/gajim/gtkexcepthook.py +++ b/gajim/gtkexcepthook.py @@ -1,25 +1,21 @@ -# -*- coding:utf-8 -*- -## gajim/gtkexcepthook.py -## -## Copyright (C) 2016-2018 Philipp Hörist <philipp AT hoerist.com> -## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2005-2014 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2008 Stephan Erb <steve-e AT h3c.de> -## -## 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/>. -## +# Copyright (C) 2016-2018 Philipp Hörist <philipp AT hoerist.com> +# Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> +# Copyright (C) 2005-2014 Yann Leboulanger <asterix AT lagaule.org> +# Copyright (C) 2008 Stephan Erb <steve-e AT h3c.de> +# +# 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 sys import os @@ -31,8 +27,6 @@ from io import StringIO from urllib.parse import urlencode import nbxmpp -import gi -gi.require_version('Gtk', '3.0') from gi.repository import Gtk, GObject try: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/856a874dd5aac864098f37f0fa950bf49b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/856a874dd5aac864098f37f0fa950bf49b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Bugfix: list index out of range when opening service discovery
by Philipp Hörist 05 Sep '18

05 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: f91408fb by pitchum at 2018-09-05T00:29:04Z Bugfix: list index out of range when opening service discovery Fixes #9301 - - - - - 1 changed file: - gajim/disco.py Changes: ===================================== gajim/disco.py ===================================== --- a/gajim/disco.py +++ b/gajim/disco.py @@ -1569,11 +1569,14 @@ class ToplevelAgentBrowser(AgentBrowser): def _update_info(self, iter_, jid, node, identities, features, data): addr = get_agent_address(jid, node) - name = identities[0].get('name', '') - if name: - descr = "%s\n%s" % (name, addr) - else: + if not identities: descr = "%s" % addr + else: + name = identities[0].get('name', '') + if name: + descr = "%s\n%s" % (name, addr) + else: + descr = "%s" % addr # Update progress self._progress += 1 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f91408fbaf9e77ea63c53a6126d49ee20d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f91408fbaf9e77ea63c53a6126d49ee20d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Fix IPV6 for Windows 10+
by Philipp Hörist 05 Sep '18

05 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9dd747df by Philipp Hörist at 2018-09-05T00:14:51Z Windows: Fix IPV6 for Windows 10+ Fixes #9326 - - - - - 2 changed files: - gajim/common/socks5.py - gajim/common/zeroconf/client_zeroconf.py Changes: ===================================== gajim/common/socks5.py ===================================== --- a/gajim/common/socks5.py +++ b/gajim/common/socks5.py @@ -27,6 +27,7 @@ import struct import hashlib import os import time +import platform from errno import EWOULDBLOCK from errno import ENOBUFS from errno import EINTR @@ -1424,8 +1425,7 @@ class Socks5Listener(IdleObject): # Under windows Vista, we need that to listen on ipv6 AND ipv4 # Doesn't work under windows XP if os.name == 'nt': - ver = os.sys.getwindowsversion() - if (ver[3], ver[0]) == (2, 6): # Win Vista + + if int(platform.win32_ver()[0]) >= 6: # Win Vista + # 47 is socket.IPPROTO_IPV6 # 27 is socket.IPV6_V6ONLY under windows, but not defined ... self._serv.setsockopt(41, 27, 0) ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== --- a/gajim/common/zeroconf/client_zeroconf.py +++ b/gajim/common/zeroconf/client_zeroconf.py @@ -27,6 +27,7 @@ from gajim.common.zeroconf import zeroconf from nbxmpp.protocol import * import socket +import platform import ssl import errno import sys @@ -73,8 +74,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': - ver = os.sys.getwindowsversion() - if (ver[3], ver[0]) == (2, 6): # Win Vista + + if int(platform.win32_ver()[0]) >= 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/9dd747dfe52aa3967c437597c1018d4d5d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9dd747dfe52aa3967c437597c1018d4d5d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix pyflakes/pycodestyle errors
by Philipp Hörist 04 Sep '18

04 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a6631398 by Philipp Hörist at 2018-09-04T22:33:08Z Fix pyflakes/pycodestyle errors - - - - - 1 changed file: - gajim/application.py Changes: ===================================== gajim/application.py ===================================== --- a/gajim/application.py +++ b/gajim/application.py @@ -1,50 +1,44 @@ -# -*- coding:utf-8 -*- -## src/gajim.py -## -## Copyright (C) 2003-2017 Yann Leboulanger <asterix AT lagaule.org> -## Copyright (C) 2004-2005 Vincent Hanquez <tab AT snarc.org> -## Copyright (C) 2005 Alex Podaras <bigpod AT gmail.com> -## Norman Rasmussen <norman AT rasmussen.co.za> -## Stéphan Kochen <stephan AT kochen.nl> -## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> -## Alex Mauer <hawke AT hawkesnest.net> -## Copyright (C) 2005-2007 Travis Shirk <travis AT pobox.com> -## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006 Junglecow J <junglecow AT gmail.com> -## Stefan Bethge <stefan AT lanpartei.de> -## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> -## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> -## James Newton <redshodan AT gmail.com> -## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> -## Julien Pivotto <roidelapluie AT gmail.com> -## Stephan Erb <steve-e AT h3c.de> -## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -## Copyright (C) 2016-2017 Emmanuel Gil Peyrot <linkmauve AT linkmauve.fr> -## Philipp Hörist <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/>. -## +# Copyright (C) 2003-2017 Yann Leboulanger <asterix AT lagaule.org> +# Copyright (C) 2004-2005 Vincent Hanquez <tab AT snarc.org> +# Copyright (C) 2005 Alex Podaras <bigpod AT gmail.com> +# Norman Rasmussen <norman AT rasmussen.co.za> +# Stéphan Kochen <stephan AT kochen.nl> +# Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> +# Alex Mauer <hawke AT hawkesnest.net> +# Copyright (C) 2005-2007 Travis Shirk <travis AT pobox.com> +# Nikos Kouremenos <kourem AT gmail.com> +# Copyright (C) 2006 Junglecow J <junglecow AT gmail.com> +# Stefan Bethge <stefan AT lanpartei.de> +# Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +# Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> +# James Newton <redshodan AT gmail.com> +# Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> +# Julien Pivotto <roidelapluie AT gmail.com> +# Stephan Erb <steve-e AT h3c.de> +# Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +# Copyright (C) 2016-2017 Emmanuel Gil Peyrot <linkmauve AT linkmauve.fr> +# Philipp Hörist <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 sys -import os from urllib.parse import unquote from gi.repository import GLib, Gio, Gtk from gajim.common import app -from gajim.common import i18n from gajim.common import configpaths from gajim.common import logging_helpers from gajim.common import exceptions @@ -56,47 +50,91 @@ class GajimApplication(Gtk.Application): '''Main class handling activation and command line.''' def __init__(self): - Gtk.Application.__init__(self, application_id='org.gajim.Gajim', - flags=( - Gio.ApplicationFlags.HANDLES_COMMAND_LINE | - Gio.ApplicationFlags.HANDLES_OPEN)) - - self.add_main_option('version', ord('V'), GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Show the application\'s version')) - self.add_main_option('quiet', ord('q'), GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Show only critical errors')) - self.add_main_option('separate', ord('s'), GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Separate profile files completely (even ' - 'history database and plugins)')) - self.add_main_option('verbose', ord('v'), GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Print XML stanzas and other debug ' - 'information')) - self.add_main_option('profile', ord('p'), GLib.OptionFlags.NONE, - GLib.OptionArg.STRING, - _('Use defined profile in configuration ' - 'directory'), 'NAME') - self.add_main_option('config-path', ord('c'), GLib.OptionFlags.NONE, - GLib.OptionArg.STRING, - _('Set configuration directory'), 'PATH') - self.add_main_option('loglevel', ord('l'), GLib.OptionFlags.NONE, - GLib.OptionArg.STRING, - _('Configure logging system'), 'LEVEL') - self.add_main_option('warnings', ord('w'), GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Show all warnings')) - self.add_main_option('ipython', ord('i'), GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Open IPython shell')) - self.add_main_option('show-next-pending-event', 0, GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Pops up a window with the next pending event')) - self.add_main_option('start-chat', 0, GLib.OptionFlags.NONE, - GLib.OptionArg.NONE, - _('Start a new chat')) + flags = (Gio.ApplicationFlags.HANDLES_COMMAND_LINE | + Gio.ApplicationFlags.HANDLES_OPEN) + Gtk.Application.__init__(self, + application_id='org.gajim.Gajim', + flags=flags) + + self.add_main_option( + 'version', + ord('V'), + GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Show the application\'s version')) + + self.add_main_option( + 'quiet', + ord('q'), + GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Show only critical errors')) + + self.add_main_option( + 'separate', + ord('s'), + GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Separate profile files completely ' + '(even history database and plugins)')) + + self.add_main_option( + 'verbose', + ord('v'), + GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Print XML stanzas and other debug information')) + + self.add_main_option( + 'profile', + ord('p'), + GLib.OptionFlags.NONE, + GLib.OptionArg.STRING, + _('Use defined profile in configuration directory'), + 'NAME') + + self.add_main_option( + 'config-path', + ord('c'), + GLib.OptionFlags.NONE, + GLib.OptionArg.STRING, + _('Set configuration directory'), + 'PATH') + + self.add_main_option( + 'loglevel', + ord('l'), + GLib.OptionFlags.NONE, + GLib.OptionArg.STRING, + _('Configure logging system'), + 'LEVEL') + + self.add_main_option( + 'warnings', + ord('w'), + GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Show all warnings')) + + self.add_main_option( + 'ipython', + ord('i'), + GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Open IPython shell')) + + self.add_main_option( + 'show-next-pending-event', + 0, + GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Pops up a window with the next pending event')) + + self.add_main_option( + 'start-chat', 0, + GLib.OptionFlags.NONE, + GLib.OptionArg.NONE, + _('Start a new chat')) self.add_main_option_entries(self._get_remaining_entry()) @@ -186,11 +224,12 @@ class GajimApplication(Gtk.Application): attributes = cmd.split(';') message = None for key in attributes: - if key.startswith('body'): - try: - message = unquote(key.split('=')[1]) - except Exception: - app.log('uri_handler').error('Invalid URI: %s', cmd) + if not key.startswith('body'): + continue + try: + message = unquote(key.split('=')[1]) + except Exception: + app.log('uri_handler').error('Invalid URI: %s', cmd) accounts = list(app.connections.keys()) if not accounts: continue @@ -339,33 +378,31 @@ class GajimApplication(Gtk.Application): self.add_account_actions(accounts_list[0]) def _get_account_actions(self, account): - from gajim import app_actions + from gajim import app_actions as a if account == 'Local': return [ - ('-xml-console', app_actions.on_xml_console, 'always', 's') + ('-xml-console', a.on_xml_console, 'always', 's') ] return [ - ('-start-single-chat', app_actions.on_single_message, 'online', 's'), - ('-join-groupchat', app_actions.on_join_gc, 'online', 's'), - ('-add-contact', app_actions.on_add_contact, 'online', 's'), - ('-services', app_actions.on_service_disco, 'online', 's'), - ('-profile', app_actions.on_profile, 'feature', 's'), - ('-xml-console', app_actions.on_xml_console, 'always', 's'), - ('-server-info', app_actions.on_server_info, 'online', 's'), - ('-archive', app_actions.on_mam_preferences, 'feature', 's'), - ('-sync-history', app_actions.on_history_sync, 'online', 's'), - ('-privacylists', app_actions.on_privacy_lists, 'feature', 's'), - ('-send-server-message', - app_actions.on_send_server_message, 'online', 's'), - ('-set-motd', app_actions.on_set_motd, 'online', 's'), - ('-update-motd', app_actions.on_update_motd, 'online', 's'), - ('-delete-motd', app_actions.on_delete_motd, 'online', 's'), - ('-activate-bookmark', - app_actions.on_activate_bookmark, 'online', 'a{sv}'), - ('-open-event', app_actions.on_open_event, 'always', 'a{sv}'), - ('-import-contacts', app_actions.on_import_contacts, 'online', 's'), + ('-start-single-chat', a.on_single_message, 'online', 's'), + ('-join-groupchat', a.on_join_gc, 'online', 's'), + ('-add-contact', a.on_add_contact, 'online', 's'), + ('-services', a.on_service_disco, 'online', 's'), + ('-profile', a.on_profile, 'feature', 's'), + ('-xml-console', a.on_xml_console, 'always', 's'), + ('-server-info', a.on_server_info, 'online', 's'), + ('-archive', a.on_mam_preferences, 'feature', 's'), + ('-sync-history', a.on_history_sync, 'online', 's'), + ('-privacylists', a.on_privacy_lists, 'feature', 's'), + ('-send-server-message', a.on_send_server_message, 'online', 's'), + ('-set-motd', a.on_set_motd, 'online', 's'), + ('-update-motd', a.on_update_motd, 'online', 's'), + ('-delete-motd', a.on_delete_motd, 'online', 's'), + ('-activate-bookmark', a.on_activate_bookmark, 'online', 'a{sv}'), + ('-open-event', a.on_open_event, 'always', 'a{sv}'), + ('-import-contacts', a.on_import_contacts, 'online', 's'), ] def add_account_actions(self, account): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a6631398f7a7214861f8d5b9f64132bdc0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a6631398f7a7214861f8d5b9f64132bdc0… 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