Commits April 2018

commits@gajim.org

1 participants
95 discussions

[Git][gajim/gajim][master] Get version from package instead of config
by Philipp Hörist 30 Apr '18

30 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 779a4d4c by Philipp Hörist at 2018-05-01T00:37:13+02:00 Get version from package instead of config - - - - - 1 changed file: - gajim/plugins/pluginmanager.py Changes: ===================================== gajim/plugins/pluginmanager.py ===================================== --- a/gajim/plugins/pluginmanager.py +++ b/gajim/plugins/pluginmanager.py @@ -34,6 +34,7 @@ from shutil import rmtree import configparser from pkg_resources import parse_version +import gajim from gajim.common import app from gajim.common import nec from gajim.common import configpaths @@ -536,7 +537,7 @@ class PluginManager(metaclass=Singleton): min_v = conf.get('info', 'min_gajim_version', fallback=None) max_v = conf.get('info', 'max_gajim_version', fallback=None) - gajim_v = app.config.get('version').split('+', 1)[0] + gajim_v = gajim.__version__.split('+', 1)[0] gajim_v_cmp = parse_version(gajim_v) if min_v and gajim_v_cmp < parse_version(min_v): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/779a4d4ce3bf7bb4af5badf02589a13dbe… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/779a4d4ce3bf7bb4af5badf02589a13dbe… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] servers.xml: re-add lightwitch.org as IBR was re-enabled.
by Philipp Hörist 30 Apr '18

30 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a937b0a5 by Marco Cirillo at 2018-04-30T20:35:28+02:00 servers.xml: re-add lightwitch.org as IBR was re-enabled. - - - - - 1 changed file: - gajim/data/other/servers.xml Changes: ===================================== gajim/data/other/servers.xml ===================================== --- a/gajim/data/other/servers.xml +++ b/gajim/data/other/servers.xml @@ -51,6 +51,7 @@ <item jid="jabbim.sk" /> <item jid="jabster.pl" /> <item jid="jaim.at" /> + <item jid="lightwitch.org" /> <item jid="linuxlovers.at" /> <item jid="lsd-25.ru" /> <item jid="njs.netlab.cz" /> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a937b0a5e2e6b1c6d21acade41b91b3d87… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a937b0a5e2e6b1c6d21acade41b91b3d87… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] Convert font weight from pango to css values
by Philipp Hörist 30 Apr '18

30 Apr '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: f99ec91f by Philipp Hörist at 2018-04-30T17:48:14+02:00 Convert font weight from pango to css values Fixes #9106 - - - - - 1 changed file: - gajim/gtkgui_helpers.py Changes: ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -37,6 +37,7 @@ from gi.repository import Pango import cairo import os import sys +import math try: from PIL import Image except: @@ -885,7 +886,7 @@ def add_css_font(): family=font.get_family(), size=int(round(font.get_size() / Pango.SCALE)), unit=unit, - weight=int(font.get_weight())) + weight=pango_to_css_weight(font.get_weight())) css = css.replace("font-size: 0{unit};".format(unit=unit), "") css = css.replace("font-weight: 0;", "") css = "\n".join(filter(lambda x: x.strip(), css.splitlines())) @@ -910,3 +911,13 @@ def get_image_from_icon_name(icon_name, scale): icon = get_iconset_name_for(icon_name) surface = gtk_icon_theme.load_surface(icon, 16, scale, None, 0) return Gtk.Image.new_from_surface(surface) + +def pango_to_css_weight(number): + # Pango allows for weight values between 100 and 1000 + # CSS allows only full hundred numbers like 100, 200 .. + number = int(number) + if number < 100: + return 100 + if number > 900: + return 900 + return int(math.ceil(number / 100.0)) * 100 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f99ec91fc29c7ae822856b318537e565ef… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f99ec91fc29c7ae822856b318537e565ef… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Convert font weight from pango to css values
by Philipp Hörist 30 Apr '18

30 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 81952f6a by Philipp Hörist at 2018-04-30T17:43:32+02:00 Convert font weight from pango to css values Fixes #9106 - - - - - 1 changed file: - gajim/gtkgui_helpers.py Changes: ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -37,6 +37,7 @@ from gi.repository import Pango import cairo import os import sys +import math try: from PIL import Image except: @@ -885,7 +886,7 @@ def add_css_font(): family=font.get_family(), size=int(round(font.get_size() / Pango.SCALE)), unit=unit, - weight=int(font.get_weight())) + weight=pango_to_css_weight(font.get_weight())) css = css.replace("font-size: 0{unit};".format(unit=unit), "") css = css.replace("font-weight: 0;", "") css = "\n".join(filter(lambda x: x.strip(), css.splitlines())) @@ -910,3 +911,13 @@ def get_image_from_icon_name(icon_name, scale): icon = get_iconset_name_for(icon_name) surface = gtk_icon_theme.load_surface(icon, 16, scale, None, 0) return Gtk.Image.new_from_surface(surface) + +def pango_to_css_weight(number): + # Pango allows for weight values between 100 and 1000 + # CSS allows only full hundred numbers like 100, 200 .. + number = int(number) + if number < 100: + return 100 + if number > 900: + return 900 + return int(math.ceil(number / 100.0)) * 100 View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/81952f6a7c194e967ff4cbf8d2385e9c96… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/81952f6a7c194e967ff4cbf8d2385e9c96… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] Appveyor exe are now name 1.0.2
by Yann Leboulanger 30 Apr '18

30 Apr '18

Yann Leboulanger pushed to branch gajim_1.0 at gajim / gajim Commits: 170063ff by Yann Leboulanger at 2018-04-30T17:40:42+02:00 Appveyor exe are now name 1.0.2 - - - - - 1 changed file: - appveyor.yml Changes: ===================================== appveyor.yml ===================================== --- a/appveyor.yml +++ b/appveyor.yml @@ -30,8 +30,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-1.0.1-$($env:ARCH)-$($env:TIME_STRING).exe" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.0.1-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.0.2-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.0.2-$($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/170063ff2ae205763db767f149ffa7f7d0… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/170063ff2ae205763db767f149ffa7f7d0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.0.2
by Yann Leboulanger 30 Apr '18

30 Apr '18

Yann Leboulanger pushed new tag gajim-1.0.2 at gajim / gajim --- View it on GitLab: https://dev.gajim.org/gajim/gajim/tree/gajim-1.0.2 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] update version to 1.0.2
by Yann Leboulanger 30 Apr '18

30 Apr '18

Yann Leboulanger pushed to branch master at gajim / gajim Commits: b5c51932 by Yann Leboulanger at 2018-04-30T17:04:58+02:00 update version to 1.0.2 - - - - - 1 changed file: - gajim/__init__.py Changes: ===================================== gajim/__init__.py ===================================== --- a/gajim/__init__.py +++ b/gajim/__init__.py @@ -1,6 +1,6 @@ import subprocess -__version__ = "1.0.1" +__version__ = "1.0.2" try: p = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b5c51932f49110a96e9244a65d8d8b37d8… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b5c51932f49110a96e9244a65d8d8b37d8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] update version to 1.0.2
by Yann Leboulanger 30 Apr '18

30 Apr '18

Yann Leboulanger pushed to branch gajim_1.0 at gajim / gajim Commits: 6cdcbf11 by Yann Leboulanger at 2018-04-30T17:03:48+02:00 update version to 1.0.2 - - - - - 1 changed file: - gajim/__init__.py Changes: ===================================== gajim/__init__.py ===================================== --- a/gajim/__init__.py +++ b/gajim/__init__.py @@ -1,6 +1,6 @@ import subprocess -__version__ = "1.0.1" +__version__ = "1.0.2" try: p = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6cdcbf1154c61b9576924f82d4c20fd87d… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6cdcbf1154c61b9576924f82d4c20fd87d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.0] Depend on nbxmpp 0.6.5
by Philipp Hörist 30 Apr '18

30 Apr '18

Philipp Hörist pushed to branch gajim_1.0 at gajim / gajim Commits: 9d94cd36 by Philipp Hörist at 2018-04-30T16:58:31+02:00 Depend on nbxmpp 0.6.5 - - - - - 3 changed files: - gajim/gajim.py - org.gajim.Gajim.json - setup.py Changes: ===================================== gajim/gajim.py ===================================== --- a/gajim/gajim.py +++ b/gajim/gajim.py @@ -56,7 +56,7 @@ from gajim.common import i18n from gajim.common import logging_helpers from gajim.common import crypto -MIN_NBXMPP_VER = "0.6.4" +MIN_NBXMPP_VER = "0.6.5" MIN_GTK_VER = "3.22.0" ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -341,7 +341,7 @@ { "type": "git", "url": "https://dev.gajim.org/gajim/python-nbxmpp.git", - "branch": "nbxmpp-0.6.4" + "branch": "nbxmpp-0.6.5" } ] }, ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -285,7 +285,7 @@ setup( package_data={'gajim': package_data}, data_files=data_files, install_requires=[ - 'nbxmpp>=0.6.4', + 'nbxmpp>=0.6.5', 'pyOpenSSL>=0.12', 'pyasn1', ], View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9d94cd36c322102ffe229fea98ce479c59… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9d94cd36c322102ffe229fea98ce479c59… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Depend on nbxmpp 0.6.5
by Philipp Hörist 30 Apr '18

30 Apr '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9aea8eea by Philipp Hörist at 2018-04-30T16:57:19+02:00 Depend on nbxmpp 0.6.5 - - - - - 3 changed files: - gajim/gajim.py - org.gajim.Gajim.json - setup.py Changes: ===================================== 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.4" +_MIN_NBXMPP_VER = "0.6.5" _MIN_GTK_VER = "3.22.0" ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -343,7 +343,7 @@ { "type": "git", "url": "https://dev.gajim.org/gajim/python-nbxmpp.git", - "branch": "nbxmpp-0.6.4" + "branch": "nbxmpp-0.6.5" } ] }, ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -285,7 +285,7 @@ setup( package_data={'gajim': package_data}, data_files=data_files, install_requires=[ - 'nbxmpp>=0.6.4', + 'nbxmpp>=0.6.5', 'pyOpenSSL>=0.12', 'pyasn1', ], View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9aea8eea38590c91037c7633d5cd67c79e… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9aea8eea38590c91037c7633d5cd67c79e… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2018