[Git][gajim/python-nbxmpp][master] fix Gitlab CI
Yann Leboulanger pushed to branch master at gajim / python-nbxmpp Commits: 56848a8e by Yann Leboulanger at 2018-04-08T14:26:46+02:00 fix Gitlab CI - - - - - 1 changed file: - .gitlab-ci.yml Changes: = .gitlab-ci.yml = --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ before_script: - - sudo apt-get update -qq && sudo apt-get build-dep -y -qq python-nbxmpp-nightly + - sudo apt-get update -qq && sudo apt-get build-dep -y -qq python3-nbxmpp-nightly stages: - test @@ -15,7 +15,7 @@ run-build: script: - rm -rf dist - export FN="nbxmpp-"$(date +%F) -- python setup.py sdist +- python3 setup.py sdist - scp dist/nbxmpp-*.tar.gz panoramix:/var/www/gajim/downloads/snap/ci/$FN-$CI_COMMIT_SHA.tar.gz artifacts: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/56848a8e0ab6fd13a2d73f22c3ea9bddb37f4de7 --- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/56848a8e0ab6fd13a2d73f22c3ea9bddb37f4de7 You're receiving this email because of your account on dev.gajim.org. ___ Commits mailing list Commits@gajim.org https://lists.gajim.org/cgi-bin/listinfo/commits
[Git][gajim/gajim][master] 2 commits: save encoded avatar when receiving vCard from server
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
36b31259 by Bronko at 2018-04-08T20:58:24+02:00
save encoded avatar when receiving vCard from server
- - - - -
fcad0f08 by Bronko at 2018-04-08T23:45:32+02:00
save hash and mime_type of avatar when receiving vCard from server
in case the avatar is not changed by the user we must resend the still valid
hash.
if we do not save the hash here, gajim advertises an empty photo element after
publishing the vCard,
which removes the avatar for all receiving clients of the photo element update
- - - - -
1 changed file:
- gajim/profile_window.py
Changes:
=
gajim/profile_window.py
=
--- a/gajim/profile_window.py
+++ b/gajim/profile_window.py
@@ -29,6 +29,7 @@ from gi.repository import GdkPixbuf
import base64
import time
import logging
+import hashlib
from gajim import gtkgui_helpers
from gajim import dialogs
@@ -227,7 +228,11 @@ class ProfileWindow:
photo_encoded = vcard_[i]['BINVAL']
if photo_encoded == '':
continue
+self.avatar_encoded = photo_encoded
photo_decoded = base64.b64decode(photo_encoded.encode('utf-8'))
+self.avatar_sha = hashlib.sha1(photo_decoded).hexdigest()
+if 'TYPE' in vcard_[i]:
+self.avatar_mime_type = vcard_[i]['TYPE']
pixbuf = gtkgui_helpers.get_pixbuf_from_data(photo_decoded)
if pixbuf is None:
continue
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/879e03449cb362d16fc16a9537f5c81a52a7...fcad0f088ad3c9399ff7d63806841ec2bb3ec20c
---
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/879e03449cb362d16fc16a9537f5c81a52a7...fcad0f088ad3c9399ff7d63806841ec2bb3ec20c
You're receiving this email because of your account on dev.gajim.org.
___
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
[Git][gajim/gajim][master] Make code better understandable
Philipp Hörist pushed to branch master at gajim / gajim
Commits:
6baed38d by Philipp Hörist at 2018-04-09T00:35:27+02:00
Make code better understandable
- - - - -
1 changed file:
- gajim/options_dialog.py
Changes:
=
gajim/options_dialog.py
=
--- a/gajim/options_dialog.py
+++ b/gajim/options_dialog.py
@@ -210,11 +210,11 @@ class GenericOption(Gtk.Grid):
self.set_property('option-value', state)
@staticmethod
-def set_no_log_for(account, jid):
+def set_no_log_for(account, state):
no_log = app.config.get_per('accounts', account, 'no_log_for').split()
-if jid and account in no_log:
+if state and account in no_log:
no_log.remove(account)
-elif not jid and account not in no_log:
+elif not state and account not in no_log:
no_log.append(account)
app.config.set_per('accounts', account, 'no_log_for', ' '.join(no_log))
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/6baed38d4ce7005c2f82b1ff2cb32141d7faf2eb
---
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/6baed38d4ce7005c2f82b1ff2cb32141d7faf2eb
You're receiving this email because of your account on dev.gajim.org.
___
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
