Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Chat Markers: Improve checkmark icons
by Daniel Brötzmann 01 Dec '20

01 Dec '20

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 59315c3f by wurstsalat at 2020-12-01T22:26:34+01:00 Chat Markers: Improve checkmark icons - - - - - 4 changed files: - gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.png - gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.png - gajim/data/icons/hicolor/scalable/devices/feather-check-double-symbolic.svg - gajim/data/icons/hicolor/scalable/devices/feather-check-symbolic.svg Changes: ===================================== gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.png ===================================== Binary files a/gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.png and b/gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.png ===================================== Binary files a/gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.png and b/gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.png differ ===================================== gajim/data/icons/hicolor/scalable/devices/feather-check-double-symbolic.svg ===================================== @@ -46,9 +46,9 @@ inkscape:window-height="998" id="namedview6" showgrid="true" - inkscape:zoom="17.99838" - inkscape:cx="13.260509" - inkscape:cy="12.846139" + inkscape:zoom="25.551229" + inkscape:cx="14.018107" + inkscape:cy="12.565821" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" @@ -59,14 +59,12 @@ id="grid831" /> </sodipodi:namedview> <path - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" - d="M 20.029297 5 A 1 1 0 0 0 19.292969 5.2929688 L 9 15.585938 L 4.7070312 11.292969 A 1 1 0 0 0 3.2929688 11.292969 A 1 1 0 0 0 3.2929688 12.707031 L 8.2929688 17.707031 A 1.0001 1.0001 0 0 0 9.7070312 17.707031 L 20.707031 6.7070312 A 1 1 0 0 0 20.707031 5.2929688 A 1 1 0 0 0 20.029297 5 z " - id="path834" - transform="translate(-2.6)" /> - <path - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1" - d="m 5.611218,15.02528 2.6817508,2.681751 c 0.3905299,0.390368 1.0235325,0.390368 1.4140624,0 L 20.707031,6.7070312 c 0.390424,-0.390507 0.390424,-1.0235554 0,-1.4140624 C 20.526763,5.1124342 20.284309,5.007627 20.029297,5 19.753982,4.99209 19.487592,5.098077 19.292969,5.2929688 L 9,15.585938 7.0277631,13.613701 Z m 0.065743,-2.762384 -0.9699297,-0.96993 c -0.390507,-0.390424 -1.0235554,-0.390424 -1.4140624,0 -0.3904233,0.390507 -0.3904233,1.023555 0,1.414062 l 0.9465733,0.946573 z" + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1" + d="m 10.634,16.30175 2.738673,2.037249 c 0.398798,0.296528 0.962453,0.213745 1.259149,-0.184929 L 22.988189,6.9205888 C 23.284772,6.5218039 23.201983,5.9581074 22.803262,5.6614401 22.619131,5.5242586 22.389532,5.4626408 22.161461,5.4891994 21.915273,5.518161 21.691927,5.6473747 21.544112,5.846368 l -7.819257,10.511444 -2.014098,-1.498249 z" id="path839" - transform="translate(2.7)" - sodipodi:nodetypes="cccccccccccccccc" /> + sodipodi:nodetypes="cccccccccc" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.80037;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1" + d="m 15.028001,5.4881049 a 0.90018349,0.90018349 0 0 0 -0.617492,0.35721 L 6.589123,16.358505 2.2043051,13.096378 A 0.90018349,0.90018349 0 0 0 0.94489027,13.28128 0.90018349,0.90018349 0 0 0 1.129792,14.540694 l 5.1069762,3.799383 A 0.90027351,0.90027351 0 0 0 7.496183,18.155176 L 15.854826,6.9198279 a 0.90018349,0.90018349 0 0 0 -0.184902,-1.259415 0.90018349,0.90018349 0 0 0 -0.641923,-0.172308 z" + id="path833" /> </svg> ===================================== gajim/data/icons/hicolor/scalable/devices/feather-check-symbolic.svg ===================================== @@ -46,9 +46,9 @@ inkscape:window-height="998" id="namedview6" showgrid="true" - inkscape:zoom="34.291667" - inkscape:cx="13.094205" - inkscape:cy="9.0224468" + inkscape:zoom="21.745518" + inkscape:cx="5.8226692" + inkscape:cy="8.7678296" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="1" @@ -59,7 +59,7 @@ id="grid836" /> </sodipodi:namedview> <path - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" - d="M 20.029297 5 A 1 1 0 0 0 19.292969 5.2929688 L 9 15.585938 L 4.7070312 11.292969 A 1 1 0 0 0 3.2929688 11.292969 A 1 1 0 0 0 3.2929688 12.707031 L 8.2929688 17.707031 A 1.0001 1.0001 0 0 0 9.7070312 17.707031 L 20.707031 6.7070312 A 1 1 0 0 0 20.707031 5.2929688 A 1 1 0 0 0 20.029297 5 z " + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.80037;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1" + d="M 18.628143,5.4881046 A 0.90018349,0.90018349 0 0 0 18.010651,5.8453149 L 10.189265,16.358505 5.8044469,13.096378 a 0.90018349,0.90018349 0 0 0 -1.2594148,0.184902 0.90018349,0.90018349 0 0 0 0.1849017,1.259414 l 5.1069758,3.799383 A 0.90027351,0.90027351 0 0 0 11.096325,18.155176 L 19.454968,6.9198279 A 0.90018349,0.90018349 0 0 0 19.270066,5.6604132 0.90018349,0.90018349 0 0 0 18.628143,5.4881046 Z" id="path833" /> </svg> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/59315c3fef11755e53dde756b9699933… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/59315c3fef11755e53dde756b9699933… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Disable pylint error
by Philipp Hörist 28 Nov '20

28 Nov '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 408cb93c by lovetox at 2020-11-28T10:14:36+01:00 Disable pylint error - - - - - 1 changed file: - nbxmpp/modules/vcard4.py Changes: ===================================== nbxmpp/modules/vcard4.py ===================================== @@ -679,6 +679,7 @@ class AdrProperty: @property def is_empty(self): + # pylint: disable=too-many-boolean-expressions if (self.pobox or self.ext or self.street or View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/408cb93c31f8a971c1159918… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/408cb93c31f8a971c1159918… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: VCard: Raise error on empty text elements
by Philipp Hörist 28 Nov '20

28 Nov '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: b3a81423 by lovetox at 2020-11-28T09:00:38+01:00 VCard: Raise error on empty text elements - - - - - 7c4f7f58 by lovetox at 2020-11-28T09:22:59+01:00 VCard: Add is_empty() for properties - - - - - 1 changed file: - nbxmpp/modules/vcard4.py Changes: ===================================== nbxmpp/modules/vcard4.py ===================================== @@ -373,6 +373,10 @@ class UriProperty: node.addChild('uri', payload=self.value) return node + @property + def is_empty(self): + return not self.value + @dataclass class TextProperty: @@ -402,6 +406,10 @@ class TextProperty: node.addChild('text', payload=self.value) return node + @property + def is_empty(self): + return not self.value + @dataclass class TextListProperty: @@ -421,6 +429,8 @@ class TextListProperty: raise ValueError('no value found') values = get_data_from_children(node, 'text') + if not values: + raise ValueError('no values found') parameters = get_parameters(node) @@ -433,6 +443,10 @@ class TextListProperty: add_children(node, 'text', self.values) return node + @property + def is_empty(self): + return not self.values + @dataclass class MultipleValueProperty: @@ -462,6 +476,10 @@ class MultipleValueProperty: node.addChild(self.value_type, payload=self.value) return node + @property + def is_empty(self): + return not self.value + @dataclass class SourceProperty(UriProperty): @@ -536,6 +554,16 @@ class NProperty: add_children(node, 'suffix', self.suffix) return node + @property + def is_empty(self): + if (self.surname or + self.given or + self.additional or + self.suffix or + self.prefix): + return False + return True + @dataclass class NicknameProperty(TextListProperty): @@ -597,6 +625,12 @@ class GenderProperty: node.addChild('identity', payload=self.sex) return node + @property + def is_empty(self): + if self.sex or self.identity: + return False + return True + @dataclass class AdrProperty: @@ -643,6 +677,18 @@ class AdrProperty: add_children(node, 'country', self.country) return node + @property + def is_empty(self): + if (self.pobox or + self.ext or + self.street or + self.locality or + self.region or + self.code or + self.country): + return False + return True + @dataclass class TelProperty(MultipleValueProperty): @@ -690,6 +736,10 @@ class LangProperty: node.addChild('language-tag', payload=self.value) return node + @property + def is_empty(self): + return not self.value + @dataclass class TzProperty(MultipleValueProperty): @@ -830,6 +880,10 @@ class ClientpidmapProperty: node.addChild('uri', payload=self.uri) return node + @property + def is_empty(self): + return not self.uri + @dataclass class UrlProperty(UriProperty): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/ce7fc5350858adf553a74cd… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/ce7fc5350858adf553a74cd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix typo
by Philipp Hörist 27 Nov '20

27 Nov '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 866fb9c1 by lovetox at 2020-11-27T16:33:11+01:00 Fix typo - - - - - 1 changed file: - gajim/gtk/pep_config.py Changes: ===================================== gajim/gtk/pep_config.py ===================================== @@ -147,7 +147,7 @@ def _nec_pep_config_received(self, task): try: result = task.finish() except Exception: - log.exception('Failed to retrive config') + log.exception('Failed to retrieve config') return DataFormDialog(_('Configure %s') % result.node, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/866fb9c1fd792932d8b095bf5255b46c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/866fb9c1fd792932d8b095bf5255b46c… 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 27 Nov '20

27 Nov '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e6fc5bc2 by lovetox at 2020-11-27T06:58:26+01:00 Remove unused import - - - - - 1 changed file: - gajim/gtk/discovery.py Changes: ===================================== gajim/gtk/discovery.py ===================================== @@ -43,7 +43,6 @@ import types import weakref -import uuid import nbxmpp from nbxmpp.structs import DiscoIdentity View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e6fc5bc2d2cbd07966059e3e9b526a6b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e6fc5bc2d2cbd07966059e3e9b526a6b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: PubSub: Remove unused methods
by Philipp Hörist 26 Nov '20

26 Nov '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9dc44a6f by lovetox at 2020-11-26T22:00:06+01:00 PubSub: Remove unused methods - - - - - 9971a49d by lovetox at 2020-11-26T22:38:00+01:00 PubSub: Use nbxmpp methods - - - - - 3 changed files: - gajim/common/modules/pubsub.py - gajim/gtk/discovery.py - gajim/gtk/pep_config.py Changes: ===================================== gajim/common/modules/pubsub.py ===================================== @@ -22,14 +22,21 @@ import nbxmpp from nbxmpp.namespaces import Namespace -from nbxmpp.modules import dataforms from gajim.common import app -from gajim.common.nec import NetworkIncomingEvent from gajim.common.modules.base import BaseModule class PubSub(BaseModule): + + _nbxmpp_extends = 'PubSub' + _nbxmpp_methods = [ + 'publish', + 'delete', + 'set_node_configuration', + 'get_node_configuration', + ] + def __init__(self, con): BaseModule.__init__(self, con) @@ -71,190 +78,6 @@ def send_pb_unsubscribe(self, jid, node, cb, **kwargs): self._con.connection.SendAndCallForResponse(query, cb, kwargs) - def send_pb_publish(self, jid, node, item, - id_=None, options=None, cb=None, **kwargs): - if not app.account_is_available(self._account): - return - - if cb is None: - cb = self._default_callback - - query = nbxmpp.Iq('set', to=jid) - pubsub = query.addChild('pubsub', namespace=Namespace.PUBSUB) - publish = pubsub.addChild('publish', {'node': node}) - attrs = {} - if id_: - attrs = {'id': id_} - publish.addChild('item', attrs, [item]) - if options: - publish = pubsub.addChild('publish-options') - publish.addChild(node=options) - - self._con.connection.SendAndCallForResponse(query, cb, kwargs) - - @staticmethod - def get_pb_retrieve_iq(jid, node, item_id=None): - """ - Get IQ to query items from a node - """ - query = nbxmpp.Iq('get', to=jid) - pubsub = query.addChild('pubsub', namespace=Namespace.PUBSUB) - items = pubsub.addChild('items', {'node': node}) - if item_id is not None: - items.addChild('item', {'id': item_id}) - return query - - def send_pb_retrieve(self, jid, node, item_id=None, cb=None, **kwargs): - """ - Get items from a node - """ - if not app.account_is_available(self._account): - return - - if cb is None: - cb = self._default_callback - - query = self.get_pb_retrieve_iq(jid, node, item_id) - - self._con.connection.SendAndCallForResponse(query, cb, kwargs) - - def send_pb_retract(self, jid, node, id_, cb=None, **kwargs): - """ - Delete item from a node - """ - if not app.account_is_available(self._account): - return - - if cb is None: - cb = self._default_callback - - query = nbxmpp.Iq('set', to=jid) - pubsub = query.addChild('pubsub', namespace=Namespace.PUBSUB) - retract = pubsub.addChild('retract', {'node': node, 'notify': '1'}) - retract.addChild('item', {'id': id_}) - - self._con.connection.SendAndCallForResponse(query, cb, kwargs) - - def send_pb_purge(self, jid, node, cb=None, **kwargs): - """ - Purge node: Remove all items - """ - if not app.account_is_available(self._account): - return - - if cb is None: - cb = self._default_callback - - query = nbxmpp.Iq('set', to=jid) - pubsub = query.addChild('pubsub', namespace=Namespace.PUBSUB_OWNER) - pubsub.addChild('purge', {'node': node}) - - self._con.connection.SendAndCallForResponse(query, cb, kwargs) - - def send_pb_delete(self, jid, node, on_ok=None, on_fail=None): - """ - Delete node - """ - if not app.account_is_available(self._account): - return - query = nbxmpp.Iq('set', to=jid) - pubsub = query.addChild('pubsub', namespace=Namespace.PUBSUB_OWNER) - pubsub.addChild('delete', {'node': node}) - - def response(_nbxmpp_client, resp, jid, node): - if resp.getType() == 'result' and on_ok: - on_ok(jid, node) - elif on_fail: - msg = resp.getErrorMsg() - on_fail(jid, node, msg) - - self._con.connection.SendAndCallForResponse( - query, response, {'jid': jid, 'node': node}) - - def send_pb_create(self, jid, node, cb, - configure=False, configure_form=None): - """ - Create a new node - """ - if not app.account_is_available(self._account): - return - query = nbxmpp.Iq('set', to=jid) - pubsub = query.addChild('pubsub', namespace=Namespace.PUBSUB) - create = pubsub.addChild('create', {'node': node}) - if configure: - conf = create.addChild('configure') - if configure_form is not None: - conf.addChild(node=configure_form) - - self._con.connection.SendAndCallForResponse(query, cb) - - def send_pb_configure(self, jid, node, form, cb=None, **kwargs): - if not app.account_is_available(self._account): - return - - if cb is None: - cb = self._default_callback - - query = nbxmpp.Iq('set', to=jid) - pubsub = query.addChild('pubsub', namespace=Namespace.PUBSUB_OWNER) - configure = pubsub.addChild('configure', {'node': node}) - configure.addChild(node=form) - - self._log.info('Send node config for %s', node) - self._con.connection.SendAndCallForResponse(query, cb, kwargs) - - def request_pb_configuration(self, jid, node): - if not app.account_is_available(self._account): - return - - query = nbxmpp.Iq('get', to=jid) - pubsub = query.addChild('pubsub', namespace=Namespace.PUBSUB_OWNER) - pubsub.addChild('configure', {'node': node}) - - self._log.info('Request node config for %s', node) - self._con.connection.SendAndCallForResponse( - query, self._received_pb_configuration, {'node': node}) - - def _received_pb_configuration(self, _nbxmpp_client, stanza, node): - if not nbxmpp.isResultNode(stanza): - self._log.warning('Error: %s', stanza.getError()) - return - - pubsub = stanza.getTag('pubsub', namespace=Namespace.PUBSUB_OWNER) - if pubsub is None: - self._log.warning('Malformed PubSub configure ' - 'stanza (no pubsub node): %s', stanza) - return - - configure = pubsub.getTag('configure') - if configure is None: - self._log.warning('Malformed PubSub configure ' - 'stanza (no configure node): %s', stanza) - return - - if configure.getAttr('node') != node: - self._log.warning('Malformed PubSub configure ' - 'stanza (wrong node): %s', stanza) - return - - form = configure.getTag('x', namespace=Namespace.DATA) - if form is None: - self._log.warning('Malformed PubSub configure ' - 'stanza (no form): %s', stanza) - return - - app.nec.push_incoming_event(PubSubConfigReceivedEvent( - None, conn=self._con, node=node, - form=dataforms.extend_form(node=form))) - - def _default_callback(self, _con, stanza, *args, **kwargs): - if not nbxmpp.isResultNode(stanza): - self._log.warning('Error: %s', stanza.getError()) - - -class PubSubConfigReceivedEvent(NetworkIncomingEvent): - name = 'pubsub-config-received' - def get_instance(*args, **kwargs): return PubSub(*args, **kwargs), 'PubSub' ===================================== gajim/gtk/discovery.py ===================================== @@ -2190,8 +2190,9 @@ def _on_send_button_clicked(self, w): # Publish it to node con = app.connections[self.account] - con.get_module('PubSub').send_pb_publish( - self.servicejid, self.groupid, item, str(uuid.uuid4())) + con.get_module('PubSub').publish(self.groupid, + item, + jid=self.servicejid) # Close the window self.window.destroy() ===================================== gajim/gtk/pep_config.py ===================================== @@ -12,12 +12,13 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +import logging + from gi.repository import Gdk from gi.repository import Gtk from nbxmpp.errors import StanzaError from gajim.common import app -from gajim.common import ged from gajim.common.i18n import _ from gajim.common.helpers import to_user_string @@ -25,13 +26,14 @@ from gajim.gtk.dialogs import WarningDialog from gajim.gtk.dataform import DataFormDialog from gajim.gtk.util import get_builder -from gajim.gtk.util import EventHelper -class PEPConfig(Gtk.ApplicationWindow, EventHelper): +log = logging.getLogger('gajim.gtk.pep') + + +class PEPConfig(Gtk.ApplicationWindow): def __init__(self, account): Gtk.ApplicationWindow.__init__(self) - EventHelper.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) @@ -51,10 +53,6 @@ def __init__(self, account): self._ui.services_treeview.get_selection().connect( 'changed', self._on_services_selection_changed) - self.register_events([ - ('pubsub-config-received', ged.GUI1, self._nec_pep_config_received), - ]) - self.show_all() self.connect('key-press-event', self._on_key_press_event) self._ui.connect_signals(self) @@ -97,9 +95,18 @@ def _items_received(self, task): if item.jid == jid and item.node is not None: self.treestore.append([item.node]) - def _node_removed(self, jid, node): - if jid != app.get_jid_from_account(self.account): + def _on_node_delete(self, task): + node = task.get_user_data() + + try: + task.finish() + except StanzaError as error: + WarningDialog( + _('PEP node was not removed'), + _('PEP node %(node)s was not removed:\n%(message)s') % { + 'node': node, 'message': error}) return + model = self._ui.services_treeview.get_model() iter_ = model.get_iter_first() while iter_: @@ -108,25 +115,17 @@ def _node_removed(self, jid, node): break iter_ = model.iter_next(iter_) - def _node_not_removed(self, jid, node, msg): - if jid != app.get_jid_from_account(self.account): - return - WarningDialog( - _('PEP node was not removed'), - _('PEP node %(node)s was not removed:\n%(message)s') % { - 'node': node, 'message': msg}) - def _on_delete_button_clicked(self, _widget): selection = self._ui.services_treeview.get_selection() if not selection: return model, iter_ = selection.get_selected() node = model[iter_][0] - our_jid = app.get_jid_from_account(self.account) + con = app.connections[self.account] - con.get_module('PubSub').send_pb_delete(our_jid, node, - on_ok=self._node_removed, - on_fail=self._node_not_removed) + con.get_module('PubSub').delete(node, + callback=self._on_node_delete, + user_data=node) def _on_configure_button_clicked(self, _widget): selection = self._ui.services_treeview.get_selection() @@ -134,18 +133,25 @@ def _on_configure_button_clicked(self, _widget): return model, iter_ = selection.get_selected() node = model[iter_][0] - our_jid = app.get_jid_from_account(self.account) + con = app.connections[self.account] - con.get_module('PubSub').request_pb_configuration(our_jid, node) + con.get_module('PubSub').get_node_configuration( + node, + callback=self._nec_pep_config_received) def _on_config_submit(self, form, node): - our_jid = app.get_jid_from_account(self.account) con = app.connections[self.account] - con.get_module('PubSub').send_pb_configure(our_jid, node, form) + con.get_module('PubSub').set_node_configuration(node, form) + + def _nec_pep_config_received(self, task): + try: + result = task.finish() + except Exception: + log.exception('Failed to retrive config') + return - def _nec_pep_config_received(self, obj): - DataFormDialog(_('Configure %s') % obj.node, + DataFormDialog(_('Configure %s') % result.node, self, - obj.form, - obj.node, + result.form, + result.node, self._on_config_submit) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f4e4596da634758ca84fc6b9b1e18c4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f4e4596da634758ca84fc6b9b1e18c4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] PubSub: Add delete() method
by Philipp Hörist 26 Nov '20

26 Nov '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ce7fc535 by lovetox at 2020-11-26T22:36:54+01:00 PubSub: Add delete() method - - - - - 1 changed file: - nbxmpp/modules/pubsub.py Changes: ===================================== nbxmpp/modules/pubsub.py ===================================== @@ -192,6 +192,13 @@ class PubSub(BaseModule): response = yield _make_retract_request(node, id_, jid, notify) yield process_response(response) + @iq_request_task + def delete(self, node, jid=None): + _task = yield + + response = yield _make_delete_request(node, jid) + yield process_response(response) + @iq_request_task def reconfigure_node(self, node, options, jid=None): _task = yield @@ -397,6 +404,14 @@ def _make_retract_request(node, id_, jid, notify): return query +def _make_delete_request(node, jid): + query = Iq('set', to=jid) + pubsub = query.addChild('pubsub', namespace=Namespace.PUBSUB_OWNER) + + pubsub.addChild('delete', attrs={'node': node}) + return query + + def _make_node_configuration(node, form, jid): query = Iq('set', to=jid) pubsub = query.addChild('pubsub', namespace=Namespace.PUBSUB_OWNER) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ce7fc5350858adf553a74cd6… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ce7fc5350858adf553a74cd6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: Chat Markers: Use double check icon
by Philipp Hörist 25 Nov '20

25 Nov '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1a8d724f by wurstsalat at 2020-11-25T22:18:19+01:00 Chat Markers: Use double check icon - - - - - e643a25d by wurstsalat at 2020-11-25T22:18:20+01:00 Chat Markers: Store marker in archive - - - - - b4c9587a by wurstsalat at 2020-11-25T22:18:20+01:00 Chat Markers: Correctly load displayed marker when restoring conversation - - - - - f4e4596d by wurstsalat at 2020-11-25T22:18:20+01:00 Chat Markers: Send marker if the chat is actively followed - - - - - 9 changed files: - gajim/chat_control_base.py - gajim/common/modules/chat_markers.py - gajim/common/storage/base.py - gajim/conversation_textview.py - + gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.png - + gajim/data/icons/hicolor/scalable/devices/feather-check-double-symbolic.svg - + gajim/data/icons/hicolor/scalable/devices/feather-check-symbolic.svg - gajim/data/style/gajim.css Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -1186,6 +1186,17 @@ def add_message(self, # Record the history of received messages self.save_message(text, 'received') + # Send chat marker if we’re actively following the chat + if self.parent_win and self.contact.settings.get('send_marker'): + if (self.parent_win.get_active_control() == self and + self.parent_win.is_active() and + self.has_focus() and end): + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + if kind in ('incoming', 'incoming_queue', 'error'): gc_message = False if self._type.is_groupchat: ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -76,6 +76,12 @@ def _raise_event(self, name, properties): if not properties.is_muc_pm and not properties.type.is_groupchat: jid = properties.jid.bare + app.storage.archive.set_marker( + app.get_jid_from_account(self._account), + jid, + properties.marker.id, + 'displayed') + app.nec.push_outgoing_event( NetworkEvent(name, account=self._account, ===================================== gajim/common/storage/base.py ===================================== @@ -49,8 +49,10 @@ def _adapt_common_error(common_error): sqlite3.register_converter('common_error', _convert_common_error) sqlite3.register_adapter(CommonError, _adapt_common_error) + def _convert_marker(marker): - return 'received' if marker == 0 else 'displayed' + return 'received' if int(marker) == 0 else 'displayed' + sqlite3.register_converter('marker', _convert_marker) ===================================== gajim/conversation_textview.py ===================================== @@ -964,7 +964,10 @@ def print_conversation_line(self, text, kind, name, tim, message_line.set_error(to_user_string(error)) if marker is not None: - message_line.set_receipt() + if marker == 'received': + message_line.set_receipt() + elif marker == 'displayed': + message_line.set_displayed() if index is None: # New Message @@ -1241,7 +1244,7 @@ def __init__(self): self._correction_image.set_no_show_all(True) self._marker_image = Gtk.Image.new_from_icon_name( - 'emblem-ok-symbolic', Gtk.IconSize.MENU) + 'feather-check-symbolic', Gtk.IconSize.MENU) self._marker_image.get_style_context().add_class( 'receipt-received-color') self._marker_image.set_tooltip_text(_('Received')) @@ -1264,10 +1267,8 @@ def set_receipt_icon_visible(self, visible): def set_displayed_icon_visible(self, visible): self._marker_image.set_visible(visible) - self._marker_image.get_style_context().remove_class( - 'receipt-received-color') - self._marker_image.get_style_context().add_class( - 'displayed-received-color') + self._marker_image.set_from_icon_name( + 'feather-check-double-symbolic', Gtk.IconSize.MENU) self._marker_image.set_tooltip_text(Q_('?Message state:Read')) def set_correction_icon_visible(self, visible): ===================================== gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-check-double-symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-check-symbolic.png differ ===================================== gajim/data/icons/hicolor/scalable/devices/feather-check-double-symbolic.svg ===================================== @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="24" + height="24" + viewBox="0 0 24 24" + fill="none" + stroke="currentColor" + stroke-width="2" + stroke-linecap="round" + stroke-linejoin="round" + class="feather feather-check" + version="1.1" + id="svg4" + sodipodi:docname="feather-check-double-symbolic.svg" + inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"> + <metadata + id="metadata10"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs8" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="998" + id="namedview6" + showgrid="true" + inkscape:zoom="17.99838" + inkscape:cx="13.260509" + inkscape:cy="12.846139" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg4" + inkscape:document-rotation="0"> + <inkscape:grid + type="xygrid" + id="grid831" /> + </sodipodi:namedview> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 20.029297 5 A 1 1 0 0 0 19.292969 5.2929688 L 9 15.585938 L 4.7070312 11.292969 A 1 1 0 0 0 3.2929688 11.292969 A 1 1 0 0 0 3.2929688 12.707031 L 8.2929688 17.707031 A 1.0001 1.0001 0 0 0 9.7070312 17.707031 L 20.707031 6.7070312 A 1 1 0 0 0 20.707031 5.2929688 A 1 1 0 0 0 20.029297 5 z " + id="path834" + transform="translate(-2.6)" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1" + d="m 5.611218,15.02528 2.6817508,2.681751 c 0.3905299,0.390368 1.0235325,0.390368 1.4140624,0 L 20.707031,6.7070312 c 0.390424,-0.390507 0.390424,-1.0235554 0,-1.4140624 C 20.526763,5.1124342 20.284309,5.007627 20.029297,5 19.753982,4.99209 19.487592,5.098077 19.292969,5.2929688 L 9,15.585938 7.0277631,13.613701 Z m 0.065743,-2.762384 -0.9699297,-0.96993 c -0.390507,-0.390424 -1.0235554,-0.390424 -1.4140624,0 -0.3904233,0.390507 -0.3904233,1.023555 0,1.414062 l 0.9465733,0.946573 z" + id="path839" + transform="translate(2.7)" + sodipodi:nodetypes="cccccccccccccccc" /> +</svg> ===================================== gajim/data/icons/hicolor/scalable/devices/feather-check-symbolic.svg ===================================== @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="24" + height="24" + viewBox="0 0 24 24" + fill="none" + stroke="currentColor" + stroke-width="2" + stroke-linecap="round" + stroke-linejoin="round" + class="feather feather-check" + version="1.1" + id="svg4" + sodipodi:docname="feather-check-symbolic.svg" + inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"> + <metadata + id="metadata10"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs8" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="998" + id="namedview6" + showgrid="true" + inkscape:zoom="34.291667" + inkscape:cx="13.094205" + inkscape:cy="9.0224468" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg4" + inkscape:document-rotation="0"> + <inkscape:grid + type="xygrid" + id="grid836" /> + </sodipodi:namedview> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 20.029297 5 A 1 1 0 0 0 19.292969 5.2929688 L 9 15.585938 L 4.7070312 11.292969 A 1 1 0 0 0 3.2929688 11.292969 A 1 1 0 0 0 3.2929688 12.707031 L 8.2929688 17.707031 A 1.0001 1.0001 0 0 0 9.7070312 17.707031 L 20.707031 6.7070312 A 1 1 0 0 0 20.707031 5.2929688 A 1 1 0 0 0 20.029297 5 z " + id="path833" /> +</svg> ===================================== gajim/data/style/gajim.css ===================================== @@ -295,7 +295,6 @@ button.flat.link { padding: 0; border: 0; } /*Receipts*/ .receipt-received-color { color: rgb(75, 181, 67); } -.displayed-received-color { color: rgb(0, 141, 242); } /*Dataforms*/ .field-fixed { font-size: 16px; font-weight: bold; padding-top:5px;} View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/02cca30da43bdb5d33e3e89cc1def16… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/02cca30da43bdb5d33e3e89cc1def16… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Support idle time from org.freedesktop.ScreenSaver
by Philipp Hörist 25 Nov '20

25 Nov '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 02cca30d by André at 2020-11-25T20:16:14+01:00 Support idle time from org.freedesktop.ScreenSaver - - - - - 2 changed files: - flatpak/org.gajim.Gajim.yaml - gajim/common/idle.py Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -21,6 +21,7 @@ finish-args: - --talk-name=org.mpris.MediaPlayer2.* - --talk-name=org.freedesktop.portal.Fcitx # Automatic status + - --talk-name=org.freedesktop.ScreenSaver - --talk-name=org.gnome.Mutter.IdleMonitor # Keyring - --talk-name=org.freedesktop.secrets ===================================== gajim/common/idle.py ===================================== @@ -33,6 +33,57 @@ log = logging.getLogger('gajim.c.idle') +class DBusFreedesktopIdleMonitor: + + def __init__(self): + self.last_idle_time = 0 + self._extended_away = False + + log.debug('Connecting to D-Bus') + self.dbus_proxy = Gio.DBusProxy.new_for_bus_sync( + Gio.BusType.SESSION, + Gio.DBusProxyFlags.NONE, + None, + 'org.freedesktop.ScreenSaver', + '/org/freedesktop/ScreenSaver', + 'org.freedesktop.ScreenSaver', + None + ) + log.debug('D-Bus connected') + + # Only the following call will trigger exceptions if the D-Bus + # interface/method/... does not exist. Using the failing method + # for class init to allow other idle monitors to be used on failure. + self._get_idle_sec_fail() + log.debug('D-Bus call test successful') + + def _get_idle_sec_fail(self): + (idle_time,) = self.dbus_proxy.call_sync( + 'GetSessionIdleTime', + None, + Gio.DBusCallFlags.NO_AUTO_START, + -1, + None + ) + return idle_time//1000 + + def get_idle_sec(self): + try: + self.last_idle_time = self._get_idle_sec_fail() + except GLib.Error as error: + log.warning( + 'org.freedesktop.ScreenSaver.GetSessionIdleTime() failed: %s', + error) + + return self.last_idle_time + + def set_extended_away(self, state): + self._extended_away = state + + def is_extended_away(self): + return self._extended_away + + class DBusGnomeIdleMonitor: def __init__(self): @@ -257,15 +308,19 @@ def _get_idle_monitor(): return WindowsIdleMonitor() try: - return DBusGnomeIdleMonitor() + return DBusFreedesktopIdleMonitor() except GLib.Error as error: log.info('Idle time via D-Bus not available: %s', error) - try: - return XssIdleMonitor() - except OSError as error: - log.info('Idle time via XScreenSaverInfo ' - 'not available: %s', error) + try: + return DBusGnomeIdleMonitor() + except GLib.Error as error: + log.info('Idle time via D-Bus (GNOME) not available: %s', error) + + try: + return XssIdleMonitor() + except OSError as error: + log.info('Idle time via XScreenSaverInfo not available: %s', error) def get_idle_sec(self): return self._idle_monitor.get_idle_sec() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/02cca30da43bdb5d33e3e89cc1def165… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/02cca30da43bdb5d33e3e89cc1def165… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Status icon set: Bruno
by Philipp Hörist 25 Nov '20

25 Nov '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: c36a2b30 by Georg Lukas at 2020-11-25T11:22:04+01:00 Status icon set: Bruno - - - - - 11 changed files: - + gajim/data/icons/hicolor/scalable/status/bruno-away.svg - + gajim/data/icons/hicolor/scalable/status/bruno-chat.svg - + gajim/data/icons/hicolor/scalable/status/bruno-closed.svg - + gajim/data/icons/hicolor/scalable/status/bruno-connecting.svg - + gajim/data/icons/hicolor/scalable/status/bruno-dnd.svg - + gajim/data/icons/hicolor/scalable/status/bruno-error.svg - + gajim/data/icons/hicolor/scalable/status/bruno-event.svg - + gajim/data/icons/hicolor/scalable/status/bruno-message.svg - + gajim/data/icons/hicolor/scalable/status/bruno-muc-active.svg - + gajim/data/icons/hicolor/scalable/status/bruno-muc-inactive.svg - + gajim/data/icons/hicolor/scalable/status/bruno-notinroster.svg The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c36a2b30ebf6b8dfe41c331239b0180a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c36a2b30ebf6b8dfe41c331239b0180a… 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