Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Windows: Remove old ssl fix
by Philipp Hörist 11 Nov '18

11 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5ecdfbee by Philipp Hörist at 2018-11-11T15:40:08Z Windows: Remove old ssl fix - - - - - 2 changed files: - win/_base.sh - win/build.sh Changes: ===================================== win/_base.sh ===================================== @@ -302,19 +302,6 @@ function cleanup_install { } -function download_ssl_libs { - # Python needs these ssl libs but msys does not provide them - curl -o "${BUILD_ROOT}"/ssl.zip https://gajim.org/downloads/snap/win/build/ssl.zip - 7z x -o"${MINGW_ROOT}"/bin "${BUILD_ROOT}"/ssl.zip -} - -function move_ssl_libs { - # Pythons ssl module searches in that path for these dlls, if they are not there - # C:/Windows/system32 is searcherd and potentially wrong versioned dlls are found there - cp "${MINGW_ROOT}"/bin/libeay32.dll "${MINGW_ROOT}"/lib/python3.7/lib-dynload/libeay32.dll - cp "${MINGW_ROOT}"/bin/ssleay32.dll "${MINGW_ROOT}"/lib/python3.7/lib-dynload/ssleay32.dll -} - function build_installer { (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim.nsi) (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim-portable.nsi) ===================================== win/build.sh ===================================== @@ -17,8 +17,6 @@ function main { install_deps install_gajim cleanup_install - download_ssl_libs - move_ssl_libs build_installer } View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5ecdfbee5c4ba4e084df4dc6b291c5a6ad… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5ecdfbee5c4ba4e084df4dc6b291c5a6ad… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Windows: Fix build
by Philipp Hörist 11 Nov '18

11 Nov '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 335c3e2d by Philipp Hörist at 2018-11-11T14:41:12Z Windows: Fix build Fixes #9438 - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -71,9 +71,14 @@ function create_root { function install_deps { # Downgrade GLIB, resolver is broken on Windows 7 - curl -o "${BUILD_ROOT}"/mingw-w64-x86_64-glib2-2.56.2-1-any.pkg.tar.xz \ - https://gajim.org/downloads/snap/win/build/mingw-w64-x86_64-glib2-2.56.2-1-… - build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-x86_64-glib2-2.56.2-1-any.pkg.tar.xz + curl -o "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz \ + https://gajim.org/downloads/snap/win/build/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz + build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz + + # Fix broken cryptography package + curl -o "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-python3-cryptography-2.3.1-1-any.pkg.tar.xz \ + https://gajim.org/downloads/snap/win/build/mingw-w64-"${ARCH}"-python3-cryptography-2.3.1-1-any.pkg.tar.xz + build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-python3-cryptography-2.3.1-1-any.pkg.tar.xz build_pacman --noconfirm -S mingw-w64-"${ARCH}"-gtk3 mingw-w64-"${ARCH}"-"${PYTHON_ID}" \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-gobject \ @@ -87,7 +92,6 @@ function install_deps { mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pillow \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools-scm \ - mingw-w64-"${ARCH}"-"${PYTHON_ID}"-cryptography \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pyopenssl \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-docutils \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-certifi \ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/335c3e2d3df71fb07a6d96e9c0b6ae3db0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/335c3e2d3df71fb07a6d96e9c0b6ae3db0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Determine absolut path for custom config folder
by Philipp Hörist 11 Nov '18

11 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: e509a681 by Philipp Hörist at 2018-11-11T14:15:10Z Determine absolut path for custom config folder When a relative custom config path is passed via commandline, the logic which decides if a plugin can be deleted from the plugin manager fails - - - - - ac5bfe2d by Philipp Hörist at 2018-11-11T14:37:30Z Windows: Fix build Fixes #9438 - - - - - 2 changed files: - gajim/common/configpaths.py - win/_base.sh Changes: ===================================== gajim/common/configpaths.py ===================================== @@ -69,7 +69,7 @@ def set_profile(profile: str) -> None: def set_config_root(config_root: str) -> None: - _paths.custom_config_root = config_root + _paths.custom_config_root = str(Path(config_root).resolve()) def init() -> None: ===================================== win/_base.sh ===================================== @@ -71,9 +71,14 @@ function create_root { function install_deps { # Downgrade GLIB, resolver is broken on Windows 7 - curl -o "${BUILD_ROOT}"/mingw-w64-x86_64-glib2-2.56.2-1-any.pkg.tar.xz \ - https://gajim.org/downloads/snap/win/build/mingw-w64-x86_64-glib2-2.56.2-1-… - build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-x86_64-glib2-2.56.2-1-any.pkg.tar.xz + curl -o "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz \ + https://gajim.org/downloads/snap/win/build/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz + build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-glib2-2.56.2-1-any.pkg.tar.xz + + # Fix broken cryptography package + curl -o "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-python3-cryptography-2.3.1-1-any.pkg.tar.xz \ + https://gajim.org/downloads/snap/win/build/mingw-w64-"${ARCH}"-python3-cryptography-2.3.1-1-any.pkg.tar.xz + build_pacman --noconfirm -U "${BUILD_ROOT}"/mingw-w64-"${ARCH}"-python3-cryptography-2.3.1-1-any.pkg.tar.xz build_pacman --noconfirm -S mingw-w64-"${ARCH}"-gtk3 mingw-w64-"${ARCH}"-"${PYTHON_ID}" \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-gobject \ @@ -87,7 +92,6 @@ function install_deps { mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pillow \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-setuptools-scm \ - mingw-w64-"${ARCH}"-"${PYTHON_ID}"-cryptography \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-pyopenssl \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-docutils \ mingw-w64-"${ARCH}"-"${PYTHON_ID}"-certifi \ View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/62b210a9e5db79413ca1eef90b74698d3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/62b210a9e5db79413ca1eef90b74698d3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Pass account to plugins when encrypting a file
by Philipp Hörist 11 Nov '18

11 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 62b210a9 by Philipp Hörist at 2018-11-11T09:40:48Z Pass account to plugins when encrypting a file - - - - - 2 changed files: - gajim/common/modules/httpupload.py - gajim/gui_interface.py Changes: ===================================== gajim/common/modules/httpupload.py ===================================== @@ -167,7 +167,7 @@ class HTTPUpload: return if encryption is not None: - app.interface.encrypt_file(file, self._request_slot) + app.interface.encrypt_file(file, self._account, self._request_slot) else: self._request_slot(file) ===================================== gajim/gui_interface.py ===================================== @@ -1136,13 +1136,13 @@ class Interface: chat_control.session, groupchat) - def encrypt_file(self, file, callback): + def encrypt_file(self, file, account, callback): app.nec.push_incoming_event(HTTPUploadProgressEvent( None, status='encrypt', file=file)) encryption = file.encryption plugin = app.plugin_manager.encryption_plugins[encryption] if hasattr(plugin, 'encrypt_file'): - plugin.encrypt_file(file, None, callback) + plugin.encrypt_file(file, account, callback) else: app.nec.push_incoming_event(HTTPUploadProgressEvent( None, status='close', file=file)) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/62b210a9e5db79413ca1eef90b74698d33… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/62b210a9e5db79413ca1eef90b74698d33… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Enforce min and max version for plugin manifest
by Philipp Hörist 11 Nov '18

11 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 30a20e16 by Philipp Hörist at 2018-11-11T09:21:46Z Enforce min and max version for plugin manifest This reduces problems with old plugins without max version - - - - - 1 changed file: - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -650,6 +650,10 @@ class PluginManager(metaclass=Singleton): min_v = conf.get('info', 'min_gajim_version', fallback=None) max_v = conf.get('info', 'max_gajim_version', fallback=None) + if min_v is None or max_v is None: + log.warning('Plugin without min/max version: %s', elem_name) + continue + gajim_v = gajim.__version__.split('+', 1)[0] gajim_v_cmp = parse_version(gajim_v) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/30a20e16d25b285b5148cd1e5b518a545f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/30a20e16d25b285b5148cd1e5b518a545f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 7 commits: Better determine soundplayer on unix systems
by Philipp Hörist 10 Nov '18

10 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8d95eb9b by Philipp Hörist at 2018-11-10T18:30:12Z Better determine soundplayer on unix systems - sys.platform == 'linux', excludes many other unix systems - use shutil.which() to test if a command is available - - - - - 1f31ab04 by Philipp Hörist at 2018-11-10T18:30:13Z Remove unused code Code is also not cross-platform compatible - - - - - 0d703524 by Philipp Hörist at 2018-11-10T18:30:13Z Dont test if winsound is available Its a standard library which will be always available in our builds - - - - - 5152611a by Philipp Hörist at 2018-11-10T18:30:18Z Try to play sound on all unix systems sys.platform == 'linux' excludeds other unix systems, for example FreeBSD - - - - - a7cc815c by Philipp Hörist at 2018-11-10T18:30:18Z Move imports into function - - - - - 02a9615b by Philipp Hörist at 2018-11-10T18:30:19Z Dont test if precis_i18n is available Its listed as dependency - - - - - e4a9ffe1 by Philipp Hörist at 2018-11-10T18:30:19Z Dont test for sys.platform == 'linux' This excludes other unix systems which was not intended - - - - - 5 changed files: - gajim/common/dbus_support.py - gajim/common/helpers.py - gajim/gui_interface.py - gajim/notify.py - gajim/roster_window.py Changes: ===================================== gajim/common/dbus_support.py ===================================== @@ -36,7 +36,7 @@ try: DBusGMainLoop(set_as_default=True) except ImportError: supported = False - if sys.platform == 'linux': # windows and mac have no dbus + if sys.platform not in ('win32', 'darwin'): print(_('D-Bus python bindings are missing in this computer')) print(_('D-Bus capabilities of Gajim cannot be used')) else: @@ -47,7 +47,7 @@ else: supported = True # does user have D-Bus bindings? except dbus.DBusException: supported = False - if sys.platform == 'linux': # windows and mac have no dbus + if sys.platform not in ('win32', 'darwin'): print(_('D-Bus does not run correctly on this machine')) print(_('D-Bus capabilities of Gajim cannot be used')) except exceptions.SystemBusNotPresent: ===================================== gajim/common/helpers.py ===================================== @@ -40,12 +40,15 @@ import socket import time import logging import json +import shutil from datetime import datetime, timedelta from distutils.version import LooseVersion as V from encodings.punycode import punycode_encode from string import Template import nbxmpp +from nbxmpp.stringprepare import nameprep +import precis_i18n.codec # pylint: disable=unused-import from gajim.common import caps_cache from gajim.common import configpaths @@ -54,35 +57,6 @@ from gajim.common.i18n import _ from gajim.common.i18n import ngettext from gajim.common.caps_cache import muc_caps_cache -try: - import precis_i18n.codec # pylint: disable=unused-import - HAS_PRECIS_I18N = True -except ImportError: - HAS_PRECIS_I18N = False - -HAS_SOUND = True -if sys.platform == 'win32': - try: - import winsound # windows-only built-in module for playing wav - except ImportError: - HAS_SOUND = False - print('Gajim is not able to playback sound because' - 'pywin32 is missing', file=sys.stderr) - -elif sys.platform == 'darwin': - try: - from AppKit import NSSound - except ImportError: - HAS_SOUND = False - print('Gajim is not able to playback sound because' - 'pyobjc is missing', file=sys.stderr) - -try: - import wave # posix-only fallback wav playback - import ossaudiodev as oss -except Exception: - pass - log = logging.getLogger('gajim.c.helpers') special_groups = (_('Transports'), _('Not in Roster'), _('Observers'), _('Groupchats')) @@ -180,10 +154,7 @@ def parse_resource(resource): """ if resource: try: - if HAS_PRECIS_I18N: - return resource.encode('Nickname').decode('utf-8') - from nbxmpp.stringprepare import resourceprep - return resourceprep.prepare(resource) + return resource.encode('Nickname').decode('utf-8') except UnicodeError: raise InvalidFormat('Invalid character in resource.') @@ -217,7 +188,6 @@ def prep(user, server, resource): if not server or len(server.encode('utf-8')) > 1023: raise InvalidFormat(_('Server must be between 1 and 1023 bytes')) try: - from nbxmpp.stringprepare import nameprep server = nameprep.prepare(server) except UnicodeError: raise InvalidFormat(_('Invalid character in hostname.')) @@ -228,11 +198,7 @@ def prep(user, server, resource): if not user or len(user.encode('utf-8')) > 1023: raise InvalidFormat(_('Username must be between 1 and 1023 bytes')) try: - if HAS_PRECIS_I18N: - user = user.encode('UsernameCaseMapped').decode('utf-8') - else: - from nbxmpp.stringprepare import nodeprep - user = nodeprep.prepare(user) + user = user.encode('UsernameCaseMapped').decode('utf-8') except UnicodeError: raise InvalidFormat(_('Invalid character in username.')) else: @@ -242,11 +208,7 @@ def prep(user, server, resource): if not resource or len(resource.encode('utf-8')) > 1023: raise InvalidFormat(_('Resource must be between 1 and 1023 bytes')) try: - if HAS_PRECIS_I18N: - resource = resource.encode('OpaqueString').decode('utf-8') - else: - from nbxmpp.stringprepare import resourceprep - resource = resourceprep.prepare(resource) + resource = resource.encode('OpaqueString').decode('utf-8') except UnicodeError: raise InvalidFormat(_('Invalid character in resource.')) else: @@ -444,22 +406,26 @@ def get_uf_chatstate(chatstate): return _('has closed the chat window or tab') return '' -def is_in_path(command, return_abs_path=False): - """ - Return True if 'command' is found in one of the directories in the user's - path. If 'return_abs_path' is True, return the absolute path of the first - found command instead. Return False otherwise and on errors - """ - for directory in os.getenv('PATH').split(os.pathsep): - try: - if command in os.listdir(directory): - if return_abs_path: - return os.path.join(directory, command) - return True - except OSError: - # If the user has non directories in his path - pass - return False +def find_soundplayer(): + if sys.platform in ('win32', 'darwin'): + return + + if app.config.get('soundplayer') != '': + return + + commands = ('aucat', 'paplay', 'aplay', 'play', 'ossplay') + for command in commands: + if shutil.which(command) is not None: + if command == 'paplay': + command += ' -n gajim --property=media.role=event' + elif command in ('aplay', 'play'): + command += ' -q' + elif command == 'ossplay': + command += ' -qq' + elif command == 'aucat': + command += ' -i' + app.config.set('soundplayer', command) + break def exec_command(command, use_shell=False, posix=True): """ @@ -758,38 +724,52 @@ def strip_soundfile_path(file_, dirs=None, abs_=True): return file_ def play_sound_file(path_to_soundfile): - if path_to_soundfile == 'beep': - exec_command('beep') - return path_to_soundfile = check_soundfile_path(path_to_soundfile) if path_to_soundfile is None: return - if sys.platform == 'win32' and HAS_SOUND: + + if sys.platform == 'win32': + import winsound try: winsound.PlaySound(path_to_soundfile, - winsound.SND_FILENAME|winsound.SND_ASYNC) + winsound.SND_FILENAME|winsound.SND_ASYNC) except Exception: log.exception('Sound Playback Error') - elif sys.platform == 'linux': - if app.config.get('soundplayer') == '': - def _oss_play(): - sndfile = wave.open(path_to_soundfile, 'rb') - nc, sw, fr, nf, _comptype, _compname = sndfile.getparams() - dev = oss.open('/dev/dsp', 'w') - dev.setparameters(sw * 8, nc, fr) - dev.write(sndfile.readframes(nf)) - sndfile.close() - dev.close() - app.thread_interface(_oss_play) + + elif sys.platform == 'darwin': + try: + from AppKit import NSSound + except ImportError: + log.exception('Sound Playback Error') return - player = app.config.get('soundplayer') - command = build_command(player, path_to_soundfile) - exec_command(command) - elif sys.platform == 'darwin' and HAS_SOUND: + sound = NSSound.alloc() sound.initWithContentsOfFile_byReference_(path_to_soundfile, True) sound.play() + elif app.config.get('soundplayer') == '': + try: + import wave + import ossaudiodev + except Exception: + log.exception('Sound Playback Error') + return + + def _oss_play(): + sndfile = wave.open(path_to_soundfile, 'rb') + nc, sw, fr, nf, _comptype, _compname = sndfile.getparams() + dev = ossaudiodev.open('/dev/dsp', 'w') + dev.setparameters(sw * 8, nc, fr) + dev.write(sndfile.readframes(nf)) + sndfile.close() + dev.close() + app.thread_interface(_oss_play) + + else: + player = app.config.get('soundplayer') + command = build_command(player, path_to_soundfile) + exec_command(command) + def get_global_show(): maxi = 0 for account in app.connections: ===================================== gajim/gui_interface.py ===================================== @@ -1106,7 +1106,7 @@ class Interface: if connected == invisible_show: return # send currently played music - if (pep_supported and sys.platform == 'linux' and + if (pep_supported and sys.platform not in ('win32', 'darwin') and app.config.get_per('accounts', account, 'publish_tune')): self.enable_music_listener() # enable location listener @@ -2683,7 +2683,7 @@ class Interface: self.remote_ctrl = None # Handle screensaver - if sys.platform == 'linux': + if sys.platform not in ('win32', 'darwin'): logind.enable() screensaver.enable() @@ -2707,19 +2707,7 @@ class Interface: # get transports type from DB app.transport_type = app.logger.get_transports_type() - if app.config.get('soundplayer') == '': - # only on first time Gajim starts - commands = ('paplay', 'aplay', 'play', 'ossplay') - for command in commands: - if helpers.is_in_path(command): - if command == 'paplay': - command += ' -n gajim --property=media.role=event' - if command in ('aplay', 'play'): - command += ' -q' - elif command == 'ossplay': - command += ' -qq' - app.config.set('soundplayer', command) - break + helpers.find_soundplayer() self.last_ftwindow_update = 0 ===================================== gajim/notify.py ===================================== @@ -82,7 +82,7 @@ class Notification: self.daemon_capabilities = ['actions'] # Detect if actions are supported by the notification daemon - if sys.platform == 'linux': + if sys.platform not in ('win32', 'darwin'): def on_proxy_ready(source, res, data=None): try: proxy = Gio.DBusProxy.new_finish(res) ===================================== gajim/roster_window.py ===================================== @@ -4962,7 +4962,7 @@ class RosterWindow: item = Gtk.CheckMenuItem(_('Publish Tune')) pep_submenu.append(item) - if sys.platform != 'linux': + if sys.platform in ('win32', 'darwin'): item.set_sensitive(False) else: activ = app.config.get_per('accounts', account, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ac2a75db489d0812a1dbf0dffd4b3359b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ac2a75db489d0812a1dbf0dffd4b3359b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Flatpak: update dependencies and use pip to install modules
by André 09 Nov '18

09 Nov '18

André pushed to branch master at gajim / gajim Commits: 09cded2f by André Apitzsch at 2018-11-09T22:16:31Z Flatpak: update dependencies and use pip to install modules - - - - - ac2a75db by André Apitzsch at 2018-11-09T22:21:57Z Flatpak: use X11 access only if a X11 session is running Requires flatpak 1.0 or newer - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -8,7 +8,7 @@ desktop-file-name-prefix: '(Nightly) ' finish-args: - --share=ipc - --share=network - - --socket=x11 + - --socket=fallback-x11 - --socket=wayland - --socket=pulseaudio - --system-talk-name=org.freedesktop.GeoClue2 @@ -33,10 +33,6 @@ add-extensions: no-autodownload: true autodelete: true -build-options: - cflags: -O2 -g - cxxflags: -O2 -g - cleanup: - '/bin/easy*' - /include @@ -54,7 +50,7 @@ modules: - name: python3-pycparser buildsystem: simple build-commands: - - python3 setup.py install --prefix=/app + - pip3 install --prefix=/app . sources: - type: archive url: https://files.pythonhosted.org/packages/68/9e/49196946aee219aead1290e00d1e7… @@ -63,7 +59,7 @@ modules: - name: python3-cffi buildsystem: simple build-commands: - - python3 setup.py install --prefix=/app + - pip3 install --prefix=/app . sources: - type: archive url: https://files.pythonhosted.org/packages/e7/a7/4cd50e57cc6f436f1cc3a7e8fa700… @@ -88,11 +84,9 @@ modules: sha256: 156a6814fb5ac1fc6850fb002e0852d56c0c8d2531923a51032d1b70760e186e - name: python3-cryptography - ensure-writable: - - easy-install.pth buildsystem: simple build-commands: - - python3 setup.py install --prefix=/app + - pip3 install --prefix=/app . sources: - type: archive url: https://files.pythonhosted.org/packages/22/21/233e38f74188db94e8451ef638575… @@ -146,13 +140,13 @@ modules: - name: python3-keyring buildsystem: simple build-commands: - - pip3 install --prefix=/app keyring-15.1.0-py2.py3-none-any.whl + - pip3 install --prefix=/app keyring-16.0.2-py2.py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/6c/3f/7a3f780dfa9ee5708507090ce15d6… - sha256: 16dddc3edaeb2703aaf5588a0b488b62f162e26f1877b6faf3a3db4b7712df61 + url: https://files.pythonhosted.org/packages/5f/cb/dc7b2215cd82b77e7b8b48abd8989… + sha256: 2a5cf5e596cbf8b66b98b8df2c214adfe21e6e18baa82006b2c482bd0c4be94c - name: python3-cssutils buildsystem: simple @@ -185,7 +179,7 @@ modules: - name: python3-nbxmpp buildsystem: simple build-commands: - - python3 setup.py install --prefix=/app + - pip3 install --prefix=/app . sources: - type: archive url: https://files.pythonhosted.org/packages/24/54/23a475a0d7d3664ea21b14ce90724… View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/62cfd7293a5bfe06e2d564acf2a4e192f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/62cfd7293a5bfe06e2d564acf2a4e192f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused import
by Philipp Hörist 07 Nov '18

07 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 62cfd729 by Philipp Hörist at 2018-11-07T22:49:29Z Remove unused import - - - - - 1 changed file: - gajim/gtk/tooltips.py Changes: ===================================== gajim/gtk/tooltips.py ===================================== @@ -30,7 +30,6 @@ import logging from datetime import datetime from gi.repository import Gtk -from gi.repository import Gdk from gi.repository import GLib from gi.repository import Pango View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/62cfd7293a5bfe06e2d564acf2a4e192f4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/62cfd7293a5bfe06e2d564acf2a4e192f4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Do not use own window for RosterTooltip
by Philipp Hörist 07 Nov '18

07 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4534f3db by Philipp Hörist at 2018-11-07T22:44:16Z Do not use own window for RosterTooltip - - - - - 2 changed files: - gajim/gtk/tooltips.py - gajim/roster_window.py Changes: ===================================== gajim/gtk/tooltips.py ===================================== @@ -258,9 +258,8 @@ class GCTooltip(): affiliation = formatted % (color, affiliation) return affiliation -class RosterTooltip(Gtk.Window, StatusTable): - def __init__(self, parent): - Gtk.Window.__init__(self, type=Gtk.WindowType.POPUP, transient_for=parent) +class RosterTooltip(StatusTable): + def __init__(self): StatusTable.__init__(self) self.create_table() self.account = None @@ -269,17 +268,9 @@ class RosterTooltip(Gtk.Window, StatusTable): self.prim_contact = None self.last_widget = None self.num_resources = 0 - self.set_title('tooltip') - self.set_border_width(3) - self.set_resizable(False) - self.set_name('gtk-tooltips') - self.set_type_hint(Gdk.WindowTypeHint.TOOLTIP) self._ui = get_builder('tooltip_roster_contact.ui') - self.add(self._ui.tooltip_grid) - self._ui.tooltip_grid.show() - def clear_tooltip(self): """ Hide all Elements of the Tooltip Grid @@ -290,8 +281,17 @@ class RosterTooltip(Gtk.Window, StatusTable): if status_table: status_table.destroy() self.create_table() + self.row = None + + def get_tooltip(self, row, connected_contacts, account, typ): + if self.row == row: + return True, self._ui.tooltip_grid + + self._populate_grid(connected_contacts, account, typ) + self.row = row + return False, self._ui.tooltip_grid - def populate(self, contacts, account, typ): + def _populate_grid(self, contacts, account, typ): """ Populate the Tooltip Grid with data of from the contact """ @@ -447,7 +447,7 @@ class RosterTooltip(Gtk.Window, StatusTable): self._set_idle_time(contact) # Avatar - scale = self.get_scale_factor() + scale = self._ui.tooltip_grid.get_scale_factor() surface = app.contacts.get_avatar( account, self.prim_contact.jid, AvatarSize.TOOLTIP, scale) if surface is None: ===================================== gajim/roster_window.py ===================================== @@ -5563,12 +5563,14 @@ class RosterWindow: renderer.set_property(self.renderers_propertys[renderer][0], self.renderers_propertys[renderer][1]) - def query_tooltip(self, widget, x_pos, y_pos, keyboard_mode, tooltip): + def query_tooltip(self, widget, x_pos, y_pos, _keyboard_mode, tooltip): try: row = widget.get_path_at_pos(x_pos, y_pos)[0] except TypeError: + self._roster_tooltip.clear_tooltip() return False if not row: + self._roster_tooltip.clear_tooltip() return False iter_ = None @@ -5576,6 +5578,7 @@ class RosterWindow: model = widget.get_model() iter_ = model.get_iter(row) except Exception: + self._roster_tooltip.clear_tooltip() return False typ = model[iter_][Column.TYPE] @@ -5586,9 +5589,9 @@ class RosterWindow: if typ in ('contact', 'self_contact'): contacts = app.contacts.get_contacts(account, jid) - for c in contacts: - if c.show not in ('offline', 'error'): - connected_contacts.append(c) + for contact in contacts: + if contact.show not in ('offline', 'error'): + connected_contacts.append(contact) if not connected_contacts: # no connected contacts, show the offline one connected_contacts = contacts @@ -5597,19 +5600,10 @@ class RosterWindow: elif typ != 'account': return False - if self.current_tooltip != row: - # If the row changes we hide the current tooltip - self.current_tooltip = row - return False - - tooltip = widget.get_tooltip_window() - - if tooltip.row == row: - # We already populated the window with the row data - return True - tooltip.row = row - tooltip.populate(connected_contacts, account, typ) - return True + value, widget = self._roster_tooltip.get_tooltip( + row, connected_contacts, account, typ) + tooltip.set_custom(widget) + return value def add_actions(self): action = Gio.SimpleAction.new_stateful( @@ -5842,8 +5836,7 @@ class RosterWindow: self.collapsed_rows = app.config.get('collapsed_rows').split('\t') self.tree.set_has_tooltip(True) - self.tree.set_tooltip_window(RosterTooltip(self.window)) - self.current_tooltip = None + self._roster_tooltip = RosterTooltip() self.tree.connect('query-tooltip', self.query_tooltip) # Workaround: For strange reasons signal is behaving like row-changed self._toggeling_row = False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4534f3dbac3bb4bcfa54f8b19d5c3fde18… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4534f3dbac3bb4bcfa54f8b19d5c3fde18… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update look on GCTooltip and RosterTooltip
by Philipp Hörist 07 Nov '18

07 Nov '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 13c82ae7 by Daniel Brötzmann at 2018-11-07T22:07:26Z Update look on GCTooltip and RosterTooltip - - - - - 3 changed files: - gajim/data/gui/tooltip_gc_contact.ui - gajim/data/gui/tooltip_roster_contact.ui - gajim/gtk/tooltips.py Changes: ===================================== gajim/data/gui/tooltip_gc_contact.ui ===================================== @@ -1,95 +1,55 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkGrid" id="tooltip_grid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="column_spacing">5</property> + <property name="column_spacing">6</property> <child> - <object class="GtkLabel" id="nick"> + <object class="GtkImage" id="avatar"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <property name="stock">gtk-missing-image</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">2</property> + <property name="height">6</property> </packing> </child> <child> - <object class="GtkLabel" id="status"> + <object class="GtkLabel" id="jid"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="valign">start</property> - <property name="wrap">True</property> - <property name="wrap_mode">word-char</property> - <property name="max_width_chars">40</property> + <property name="hexpand">True</property> <attributes> - <attribute name="style" value="italic"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> - <property name="left_attach">0</property> + <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">2</property> </packing> </child> <child> - <object class="GtkLabel" id="jid_label"> + <object class="GtkLabel" id="nick"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> <property name="valign">start</property> - <property name="label" translatable="yes">Jabber ID:</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkImage" id="avatar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> + <property name="ellipsize">end</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + <style> + <class name="large-header"/> + </style> </object> <packing> - <property name="left_attach">2</property> + <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="height">7</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="resource_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="label" translatable="yes">Resource:</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="affiliation"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - <property name="width">2</property> </packing> </child> <child> @@ -100,9 +60,8 @@ <property name="valign">start</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - <property name="width">2</property> + <property name="left_attach">1</property> + <property name="top_attach">3</property> </packing> </child> <child> @@ -113,17 +72,23 @@ <property name="vexpand">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - <property name="width">2</property> + <property name="left_attach">1</property> + <property name="top_attach">5</property> </packing> </child> <child> - <object class="GtkLabel" id="resource"> + <object class="GtkLabel" id="status"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="hexpand">True</property> + <property name="valign">start</property> + <property name="wrap">True</property> + <property name="wrap_mode">word-char</property> + <property name="max_width_chars">25</property> + <property name="xalign">0</property> + <attributes> + <attribute name="style" value="italic"/> + </attributes> </object> <packing> <property name="left_attach">1</property> @@ -131,18 +96,15 @@ </packing> </child> <child> - <object class="GtkLabel" id="jid"> + <object class="GtkLabel" id="affiliation"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="hexpand">True</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <property name="valign">start</property> </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="top_attach">2</property> </packing> </child> </object> ===================================== gajim/data/gui/tooltip_roster_contact.ui ===================================== @@ -1,56 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkGrid" id="tooltip_grid"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="column_spacing">5</property> - <child> - <object class="GtkLabel" id="name"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="jid_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="label" translatable="yes">Jabber ID:</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkImage" id="avatar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> - <property name="height">13</property> - </packing> - </child> + <property name="border_width">6</property> + <property name="row_spacing">3</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="resource_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Resource:</property> </object> @@ -59,19 +22,6 @@ <property name="top_attach">5</property> </packing> </child> - <child> - <object class="GtkLabel" id="user_show"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> <child> <object class="GtkLabel" id="resource"> <property name="visible">True</property> @@ -98,29 +48,14 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="status_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - <property name="label" translatable="yes">Status:</property> - <property name="wrap">True</property> - <property name="max_width_chars">40</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="idle_since_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Idle since:</property> </object> @@ -146,7 +81,7 @@ <object class="GtkLabel" id="mood_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Mood:</property> </object> @@ -159,7 +94,7 @@ <object class="GtkLabel" id="activity_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Activity:</property> <property name="lines">2</property> @@ -173,7 +108,7 @@ <object class="GtkLabel" id="tune_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Tune:</property> </object> @@ -186,7 +121,7 @@ <object class="GtkLabel" id="location_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Location:</property> </object> @@ -212,6 +147,7 @@ <object class="GtkLabel" id="activity"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="valign">start</property> <property name="hexpand">True</property> </object> @@ -250,7 +186,7 @@ <object class="GtkLabel" id="pgp_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">OpenPGP:</property> </object> @@ -276,7 +212,7 @@ <object class="GtkLabel" id="sub_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> + <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Subscription:</property> </object> @@ -304,20 +240,62 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="valign">start</property> - <property name="hexpand">True</property> <property name="wrap">True</property> - <property name="max_width_chars">30</property> + <property name="wrap_mode">word-char</property> + <property name="max_width_chars">25</property> + <property name="xalign">0</property> <attributes> <attribute name="style" value="italic"/> </attributes> </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="name"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="use_markup">True</property> + <property name="ellipsize">end</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="user_show"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="vexpand">True</property> + </object> <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> </packing> </child> <child> - <placeholder/> + <object class="GtkImage" id="avatar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="valign">start</property> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="height">5</property> + </packing> </child> <child> <placeholder/> ===================================== gajim/gtk/tooltips.py ===================================== @@ -61,14 +61,14 @@ class StatusTable: def create_table(self): self.table = Gtk.Grid() self.table.insert_column(0) - self.table.set_property('column-spacing', 2) + self.table.set_property('column-spacing', 3) def add_text_row(self, text, col_inc=0): self.table.insert_row(self.current_row) self.text_label = Gtk.Label() self.text_label.set_line_wrap(True) self.text_label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) - self.text_label.set_max_width_chars(35) + self.text_label.set_max_width_chars(25) self.text_label.set_halign(Gtk.Align.START) self.text_label.set_valign(Gtk.Align.START) self.text_label.set_selectable(False) @@ -212,12 +212,6 @@ class GCTooltip(): if contact.jid.strip(): self._ui.jid.set_text(contact.jid) self._ui.jid.show() - self._ui.jid_label.show() - # Resource - if hasattr(contact, 'resource') and contact.resource.strip(): - self._ui.resource.set_text(contact.resource) - self._ui.resource.show() - self._ui.resource_label.show() # Affiliation if contact.affiliation != 'none': @@ -292,7 +286,7 @@ class RosterTooltip(Gtk.Window, StatusTable): """ for child in self._ui.tooltip_grid.get_children(): child.hide() - status_table = self._ui.tooltip_grid.get_child_at(0, 3) + status_table = self._ui.tooltip_grid.get_child_at(1, 3) if status_table: status_table.destroy() self.create_table() @@ -313,7 +307,7 @@ class RosterTooltip(Gtk.Window, StatusTable): accounts = helpers.get_notification_icon_tooltip_dict() self.spacer_label = '' self.fill_table_with_accounts(accounts) - self._ui.tooltip_grid.attach(self.table, 0, 3, 2, 1) + self._ui.tooltip_grid.attach(self.table, 1, 3, 2, 1) self.table.show_all() return @@ -381,7 +375,6 @@ class RosterTooltip(Gtk.Window, StatusTable): else: contacts_dict[priority] = [contact] if self.num_resources > 1: - self._ui.status_label.show() transport = app.get_transport_name_from_jid(self.prim_contact.jid) if transport == 'jabber': transport = None @@ -406,7 +399,7 @@ class RosterTooltip(Gtk.Window, StatusTable): if add_text: self.add_text_row(acontact.status, 2) - self._ui.tooltip_grid.attach(self.table, 0, 3, 2, 1) + self._ui.tooltip_grid.attach(self.table, 1, 3, 2, 1) self.table.show_all() else: # only one resource @@ -415,7 +408,6 @@ class RosterTooltip(Gtk.Window, StatusTable): if status: self._ui.status.set_text(status) self._ui.status.show() - self._ui.status_label.show() # PEP Info self._append_pep_info(contact) @@ -423,7 +415,6 @@ class RosterTooltip(Gtk.Window, StatusTable): # JID self._ui.jid.set_text(self.prim_contact.jid) self._ui.jid.show() - self._ui.jid_label.show() # contact has only one resource if self.num_resources == 1 and contact.resource: @@ -468,12 +459,12 @@ class RosterTooltip(Gtk.Window, StatusTable): 'roster_tooltip_populate', self, contacts, self._ui.tooltip_grid) # Sets the Widget that is at the bottom to expand. - # This is needed in case the Picture takes more Space then the Labels + # This is needed in case the Picture takes more Space than the Labels i = 1 while i < 15: - if self._ui.tooltip_grid.get_child_at(0, i): - if self._ui.tooltip_grid.get_child_at(0, i).get_visible(): - self.last_widget = self._ui.tooltip_grid.get_child_at(0, i) + if self._ui.tooltip_grid.get_child_at(1, i): + if self._ui.tooltip_grid.get_child_at(1, i).get_visible(): + self.last_widget = self._ui.tooltip_grid.get_child_at(1, i) i += 1 self.last_widget.set_vexpand(True) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/13c82ae777a2ce8bd20543fa04b9d061c2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/13c82ae777a2ce8bd20543fa04b9d061c2… 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