Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Flatpak: limit dbus access
by Philipp Hörist 01 May '18

01 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8d0815c1 by André Apitzsch at 2018-05-01T19:03:06+02:00 Flatpak: limit dbus access - - - - - 1 changed file: - org.gajim.Gajim.json Changes: ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -7,25 +7,34 @@ "tags": ["nightly"], "desktop-file-name-prefix": "(Nightly) ", "finish-args": [ - /* X11 + XShm access */ "--share=ipc", + "--share=network", "--socket=x11", - /* Wayland access */ "--socket=wayland", - /* Needs to talk to the network: */ - "--share=network", - "--filesystem=home", "--socket=pulseaudio", - "--socket=system-bus" + "--filesystem=home", + "--system-talk-name=org.freedesktop.GeoClue2", + "--system-talk-name=org.freedesktop.login1", + "--talk-name=org.gnome.ScreenSaver", + "--talk-name=org.mpris.MediaPlayer2.*", + /* Keyring */ + "--talk-name=org.freedesktop.secrets", + /* dconf */ + "--filesystem=xdg-run/dconf", + "--filesystem=~/.config/dconf:ro", + "--talk-name=ca.desrt.dconf", + "--env=DCONF_USER_CONFIG_DIR=.config/dconf" ], "build-options": { "cflags": "-O2 -g", "cxxflags": "-O2 -g" }, "cleanup": [ + "/bin/easy*", "/include", "/lib/debug", "/lib/pkgconfig", + "/lib/python2.7", "/share/aclocal", "/share/doc", "/share/man", View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8d0815c17601236a04bd3a4e5b9f053d0f… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8d0815c17601236a04bd3a4e5b9f053d0f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor SSL errors
by Philipp Hörist 01 May '18

01 May '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c534d3a1 by Philipp Hörist at 2018-05-01T14:03:20+02:00 Refactor SSL errors Dont save fingerprints to config and check certs with our own methods. We should trust openssl to do all necessary checks. Self signed certs can be added to cacert.pem and will not show up as an error until the cert changes. nbxmpp now saves all ssl errors and passes them, so now we loop over all errors until all are confirmed or ignored by the user Also cacerts are now saved in utf-8 - - - - - 5 changed files: - gajim/common/config.py - gajim/common/connection.py - gajim/common/connection_handlers_events.py - gajim/dialogs.py - gajim/gui_interface.py Changes: ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -347,8 +347,6 @@ class Config: 'action_when_plaintext_connection': [ opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be \'warn\', \'connect\', \'disconnect\'') ], 'warn_when_insecure_ssl_connection': [ opt_bool, True, _('Show a warning dialog before using standard SSL library.') ], 'warn_when_insecure_password': [ opt_bool, True, _('Show a warning dialog before sending PLAIN password over a plain connection.') ], - 'ssl_fingerprint_sha1': [ opt_str, '', '', True ], - 'ssl_fingerprint_sha256': [ opt_str, '', '', True ], 'ignore_ssl_errors': [ opt_str, '', _('Space separated list of ssl errors to ignore.') ], 'use_srv': [ opt_bool, True, '', True ], 'use_custom_host': [ opt_bool, False, '', True ], ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1355,82 +1355,64 @@ class Connection(CommonConnection, ConnectionHandlers): log.debug('Connected to server %s:%s with %s' % ( self._current_host['host'], self._current_host['port'], con_type)) - if app.config.get_per('accounts', self.name, 'anonymous_auth'): - name = None + self.connection = con + + ssl_errors = con.Connection.ssl_errors + ignored_ssl_errors = self._get_ignored_ssl_errors() + self._ssl_errors = set(ssl_errors) - set(ignored_ssl_errors) + self.process_ssl_errors() + + def _get_ignored_ssl_errors(self): + ignore_ssl_errors = app.config.get_per( + 'accounts', self.name, 'ignore_ssl_errors').split() + return [int(err) for err in ignore_ssl_errors] + + def process_ssl_errors(self): + if not self._ssl_errors: + self.ssl_certificate_accepted() + return + + cert = self.connection.Connection.ssl_certificate + errnum = self._ssl_errors.pop() + hostname = app.config.get_per('accounts', self.name, 'hostname') + text = _('The authenticity of the %s ' + 'certificate could be invalid') % hostname + if errnum in ssl_error: + text += _('\nSSL Error: <b>%s</b>') % ssl_error[errnum] else: + text += _('\nUnknown SSL error: %d') % errnum + fingerprint_sha1 = cert.digest('sha1').decode('utf-8') + fingerprint_sha256 = cert.digest('sha256').decode('utf-8') + pem = OpenSSL.crypto.dump_certificate( + OpenSSL.crypto.FILETYPE_PEM, cert).decode('utf-8') + app.nec.push_incoming_event( + SSLErrorEvent(None, conn=self, + error_text=text, + error_num=errnum, + cert=pem, + fingerprint_sha1=fingerprint_sha1, + fingerprint_sha256=fingerprint_sha256, + certificate=cert)) + + def ssl_certificate_accepted(self): + if not self.connection: + self.disconnect(on_purpose=True) + app.nec.push_incoming_event( + ConnectionLostEvent( + None, conn=self, + title=_('Could not connect to account %s') % self.name, + msg=_('Connection with account %s has been lost. ' + 'Retry connecting.') % self.name)) + return + + name = None + if not app.config.get_per('accounts', self.name, 'anonymous_auth'): name = app.config.get_per('accounts', self.name, 'name') - hostname = app.config.get_per('accounts', self.name, 'hostname') - self.connection = con - try: - errnum = con.Connection.ssl_errnum - except AttributeError: - errnum = 0 - cert = con.Connection.ssl_certificate - if errnum > 0 and str(errnum) not in app.config.get_per('accounts', - self.name, 'ignore_ssl_errors').split(): - text = _('The authenticity of the %s certificate could be invalid' - ) % hostname - if errnum in ssl_error: - text += _('\nSSL Error: <b>%s</b>') % ssl_error[errnum] - else: - text += _('\nUnknown SSL error: %d') % errnum - fingerprint_sha1 = cert.digest('sha1').decode('utf-8') - fingerprint_sha256 = cert.digest('sha256').decode('utf-8') - pem = OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_PEM, - cert).decode('utf-8') - app.nec.push_incoming_event(SSLErrorEvent(None, conn=self, - error_text=text, error_num=errnum, cert=pem, - fingerprint_sha1=fingerprint_sha1, - fingerprint_sha256=fingerprint_sha256, certificate=cert)) - return True - if cert: - fingerprint_sha1 = cert.digest('sha1').decode('utf-8') - fingerprint_sha256 = cert.digest('sha256').decode('utf-8') - saved_fingerprint_sha1 = app.config.get_per('accounts', self.name, - 'ssl_fingerprint_sha1') - if saved_fingerprint_sha1: - # Check sha1 fingerprint - if fingerprint_sha1 != saved_fingerprint_sha1: - if not check_X509.check_certificate(cert, hostname): - app.nec.push_incoming_event(FingerprintErrorEvent( - None, conn=self, certificate=cert, - new_fingerprint_sha1=fingerprint_sha1, - new_fingerprint_sha256=fingerprint_sha256)) - return True - app.config.set_per('accounts', self.name, 'ssl_fingerprint_sha1', - fingerprint_sha1) - - saved_fingerprint_sha256 = app.config.get_per('accounts', self.name, - 'ssl_fingerprint_sha256') - if saved_fingerprint_sha256: - # Check sha256 fingerprint - if fingerprint_sha256 != saved_fingerprint_sha256: - if not check_X509.check_certificate(cert, hostname): - app.nec.push_incoming_event(FingerprintErrorEvent( - None, conn=self, certificate=cert, - new_fingerprint_sha1=fingerprint_sha1, - new_fingerprint_sha256=fingerprint_sha256)) - return True - app.config.set_per('accounts', self.name, - 'ssl_fingerprint_sha256', fingerprint_sha256) - - if not check_X509.check_certificate(cert, hostname) and \ - '100' not in app.config.get_per('accounts', self.name, - 'ignore_ssl_errors').split(): - pem = OpenSSL.crypto.dump_certificate( - OpenSSL.crypto.FILETYPE_PEM, cert).decode('utf-8') - txt = _('The authenticity of the %s certificate could be ' - 'invalid.\nThe certificate does not cover this domain.') %\ - hostname - app.nec.push_incoming_event(SSLErrorEvent(None, conn=self, - error_text=txt, error_num=100, cert=pem, - fingerprint_sha1=fingerprint_sha1, - fingerprint_sha256=fingerprint_sha256, certificate=cert)) - return True - self._register_handlers(con, con_type) - auth_mechs = app.config.get_per('accounts', self.name, 'authentication_mechanisms') - auth_mechs = auth_mechs.split() + self._register_handlers(self.connection, self._current_type) + + auth_mechs = app.config.get_per( + 'accounts', self.name, 'authentication_mechanisms').split() for mech in auth_mechs: if mech not in nbxmpp.auth_nb.SASL_AUTHENTICATION_MECHANISMS | set(['XEP-0078']): log.warning("Unknown authentication mechanisms %s" % mech) @@ -1438,24 +1420,12 @@ class Connection(CommonConnection, ConnectionHandlers): auth_mechs = None else: auth_mechs = set(auth_mechs) - con.auth(user=name, password=self.password, - resource=self.server_resource, sasl=True, on_auth=self.__on_auth, auth_mechs=auth_mechs) - - def ssl_certificate_accepted(self): - if not self.connection: - self.disconnect(on_purpose=True) - app.nec.push_incoming_event(ConnectionLostEvent(None, conn=self, - title=_('Could not connect to account %s') % self.name, - msg=_('Connection with account %s has been lost. Retry ' - 'connecting.') % self.name)) - return - if app.config.get_per('accounts', self.name, 'anonymous_auth'): - name = None - else: - name = app.config.get_per('accounts', self.name, 'name') - self._register_handlers(self.connection, 'ssl') - self.connection.auth(name, self.password, self.server_resource, 1, - self.__on_auth) + self.connection.auth(user=name, + password=self.password, + resource=self.server_resource, + sasl=True, + on_auth=self.__on_auth, + auth_mechs=auth_mechs) def _register_handlers(self, con, con_type): self.peerhost = con.get_peerhost() ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -2188,10 +2188,6 @@ class SSLErrorEvent(nec.NetworkIncomingEvent): name = 'ssl-error' base_network_events = [] -class FingerprintErrorEvent(nec.NetworkIncomingEvent): - name = 'fingerprint-error' - base_network_events = [] - class UniqueRoomIdSupportedEvent(nec.NetworkIncomingEvent): name = 'unique-room-id-supported' base_network_events = [] ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -5404,25 +5404,6 @@ SHA-256 Fingerprint: %(sha256)s self.set_transient_for(parent) self.set_title(_('Certificate for account %s') % account) - -class CheckFingerprintDialog(YesNoDialog): - def __init__(self, pritext='', sectext='', checktext='', - on_response_yes=None, on_response_no=None, account=None, certificate=None): - self.account = account - self.cert = certificate - YesNoDialog.__init__(self, pritext, sectext=sectext, - checktext=checktext, on_response_yes=on_response_yes, - on_response_no=on_response_no) - self.set_title(_('SSL Certificate Verification for %s') % account) - b = Gtk.Button(label=_('View cert…')) - b.connect('clicked', self.on_cert_clicked) - b.show_all() - area = self.get_action_area() - area.pack_start(b, True, True, 0) - - def on_cert_clicked(self, button): - CertificatDialog(self, self.account, self.cert) - class SSLErrorDialog(ConfirmationDialogDoubleCheck): def __init__(self, account, certificate, pritext, sectext, checktext1, checktext2, on_response_ok=None, on_response_cancel=None): ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1354,29 +1354,24 @@ class Interface: certs = '' my_ca_certs = configpaths.get('MY_CACERTS') if os.path.isfile(my_ca_certs): - f = open(my_ca_certs) - certs = f.read() - f.close() + with open(my_ca_certs, encoding='utf-8') as f: + certs = f.read() if obj.cert in certs: dialogs.ErrorDialog(_('Certificate Already in File'), _('This certificate is already in file %s, so it\'s ' 'not added again.') % my_ca_certs) else: - f = open(my_ca_certs, 'a') - f.write(server + '\n') - f.write(obj.cert + '\n\n') - f.close() - app.config.set_per('accounts', account, 'ssl_fingerprint_sha1', - obj.fingerprint_sha1) - app.config.set_per('accounts', account, 'ssl_fingerprint_sha256', - obj.fingerprint_sha256) + with open(my_ca_certs, 'a', encoding='utf-8') as f: + f.write(server + '\n') + f.write(obj.cert + '\n\n') + if is_checked[1]: ignore_ssl_errors = app.config.get_per('accounts', account, 'ignore_ssl_errors').split() ignore_ssl_errors.append(str(obj.error_num)) app.config.set_per('accounts', account, 'ignore_ssl_errors', ' '.join(ignore_ssl_errors)) - obj.conn.ssl_certificate_accepted() + obj.conn.process_ssl_errors() def on_cancel(): del self.instances[account]['online_dialog']['ssl_error'] @@ -1412,46 +1407,6 @@ class Interface: 'does not support anonymous connection' % server, transient_for=self.roster.window) - def handle_event_fingerprint_error(self, obj): - # ('FINGERPRINT_ERROR', account, (new_fingerprint_sha1,new_fingerprint_sha256,)) - account = obj.conn.name - def on_yes(is_checked): - del self.instances[account]['online_dialog']['fingerprint_error'] - app.config.set_per('accounts', account, 'ssl_fingerprint_sha1', - obj.new_fingerprint_sha1) - app.config.set_per('accounts', account, 'ssl_fingerprint_sha256', - obj.new_fingerprint_sha256) - # Reset the ignored ssl errors - app.config.set_per('accounts', account, 'ignore_ssl_errors', '') - obj.conn.ssl_certificate_accepted() - - def on_no(): - del self.instances[account]['online_dialog']['fingerprint_error'] - obj.conn.disconnect(on_purpose=True) - app.nec.push_incoming_event(OurShowEvent(None, conn=obj.conn, - show='offline')) - - pritext = _('SSL certificate error') - sectext = _('It seems the SSL certificate of account %(account)s has ' - 'changed and is not valid or your connection is being compromised.\n\n' - 'Old SHA-1 fingerprint: ' - '%(old_sha1)s\nOld SHA-256 fingerprint: %(old_sha256)s\n\n' - 'New SHA-1 fingerprint: %(new_sha1)s\nNew SHA-256 fingerprint: ' - '%(new_sha256)s\n\nDo you still want to connect ' - 'and update the fingerprint of the certificate?') % \ - {'account': account, - 'old_sha1': app.config.get_per('accounts', account, 'ssl_fingerprint_sha1'), - 'old_sha256': app.config.get_per('accounts', account, 'ssl_fingerprint_sha256'), - 'new_sha1': obj.new_fingerprint_sha1, - 'new_sha256': obj.new_fingerprint_sha256} - if 'fingerprint_error' in self.instances[account]['online_dialog']: - self.instances[account]['online_dialog']['fingerprint_error'].\ - destroy() - self.instances[account]['online_dialog']['fingerprint_error'] = \ - dialogs.CheckFingerprintDialog(pritext, sectext, on_response_yes=on_yes, - on_response_no=on_no, account=obj.conn.name, - certificate=obj.certificate) - def handle_event_plain_connection(self, obj): # ('PLAIN_CONNECTION', account, (connection)) def on_ok(is_checked): @@ -1578,7 +1533,6 @@ class Interface: 'failed-decrypt': [(self.handle_event_failed_decrypt, ged.GUI2)], 'file-request-error': [self.handle_event_file_request_error], 'file-request-received': [self.handle_event_file_request], - 'fingerprint-error': [self.handle_event_fingerprint_error], 'gc-invitation-received': [self.handle_event_gc_invitation], 'gc-decline-received': [self.handle_event_gc_decline], 'gc-presence-received': [self.handle_event_gc_presence], View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c534d3a147f9cad62612d946f9702b415a… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c534d3a147f9cad62612d946f9702b415a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Record all ssl errors that are encountered
by Philipp Hörist 01 May '18

01 May '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e471a74e by Philipp Hörist at 2018-05-01T12:14:23+02:00 Record all ssl errors that are encountered - - - - - 3 changed files: - nbxmpp/bosh.py - nbxmpp/tls_nb.py - nbxmpp/transports_nb.py Changes: ===================================== nbxmpp/bosh.py ===================================== --- a/nbxmpp/bosh.py +++ b/nbxmpp/bosh.py @@ -93,8 +93,10 @@ class NonBlockingBOSH(NonBlockingTransport): # ssl variables self.ssl_certificate = None + # first ssl error self.ssl_errnum = 0 - + # all ssl errors + self.ssl_errors = [] def connect(self, conn_5tuple, on_connect, on_connect_failure): NonBlockingTransport.connect(self, conn_5tuple, on_connect, on_connect_failure) ===================================== nbxmpp/tls_nb.py ===================================== --- a/nbxmpp/tls_nb.py +++ b/nbxmpp/tls_nb.py @@ -508,7 +508,13 @@ class NonBlockingTLS(PlugIn): def _ssl_verify_callback(self, sslconn, cert, errnum, depth, ok): # Exceptions can't propagate up through this callback, so print them here. try: + if errnum: + self._owner.ssl_errors.append(errnum) + # This stores all ssl errors that are encountered while + # the chain is verifyed if not self._owner.ssl_errnum: + # This records the first ssl error that is encountered + # we keep this because of backwards compatibility self._owner.ssl_errnum = errnum if depth == 0: self._owner.ssl_certificate = cert ===================================== nbxmpp/transports_nb.py ===================================== --- a/nbxmpp/transports_nb.py +++ b/nbxmpp/transports_nb.py @@ -339,7 +339,10 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject): # ssl variables self.ssl_certificate = None + # first ssl error self.ssl_errnum = 0 + # all ssl errors + self.ssl_errors = [] self.alpn = alpn View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/e471a74e40d378d2c27e1a045b… --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/e471a74e40d378d2c27e1a045b… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

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