Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Location: Catch all GLib errors
by Philipp Hörist 24 Apr '20

24 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 24d89658 by André Apitzsch at 2020-04-24T17:40:30+02:00 Location: Catch all GLib errors Traceback (most recent call last): File "/home/user/gajim/gajim/common/dbus/location.py", line 63, in _on_simple_ready self.simple = Geoclue.Simple.new_finish(result) gi.repository.GLib.Error: g-io-error-quark: Error calling StartServiceByName for org.freedesktop.GeoClue2: Unit geoclue.service is masked. - - - - - 1 changed file: - gajim/common/dbus/location.py Changes: ===================================== gajim/common/dbus/location.py ===================================== @@ -62,10 +62,7 @@ class LocationListener: try: self.simple = Geoclue.Simple.new_finish(result) except GLib.Error as error: - if error.domain == 'g-dbus-error-quark': - log.warning("Could not enable geolocation: %s", error.message) - else: - raise + log.warning("Could not enable geolocation: %s", error.message) else: self.simple.connect('notify::location', self._on_location_update) self._on_location_update(self.simple) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/24d89658f6e0502d0dd101ac28509fa4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/24d89658f6e0502d0dd101ac28509fa4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Logger: Make get_last_conversation_lines account-specific
by Philipp Hörist 24 Apr '20

24 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 89361f61 by Daniel Brötzmann at 2020-04-24T17:26:40+02:00 Logger: Make get_last_conversation_lines account-specific - - - - - 1 changed file: - gajim/common/logger.py Changes: ===================================== gajim/common/logger.py ===================================== @@ -776,15 +776,18 @@ class Logger: KindConstant.ERROR]) jids = self._get_family_jids(account, jid) + account_id = self.get_account_id(account) sql = ''' SELECT time, kind, message, error as "error [common_error]", subject, additional_data, marker as "marker [marker]", message_id - FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND - kind IN ({kinds}) AND time > get_timeout() + FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND account_id = {account_id} AND kind IN ({kinds}) + AND time > get_timeout() ORDER BY time DESC, log_line_id DESC LIMIT ? OFFSET ? '''.format(jids=', '.join('?' * len(jids)), + account_id=account_id, kinds=', '.join(kinds)) try: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/89361f61eb6c106009d09cdc45325be2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/89361f61eb6c106009d09cdc45325be2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Config: Simplify base directory handling
by Philipp Hörist 24 Apr '20

24 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 71a32e9f by André Apitzsch at 2020-04-24T17:22:59+02:00 Config: Simplify base directory handling - - - - - 1 changed file: - gajim/common/configpaths.py Changes: ===================================== gajim/common/configpaths.py ===================================== @@ -30,6 +30,8 @@ import sys import tempfile from pathlib import Path +from gi.repository import GLib + import gajim from gajim.common.i18n import _ from gajim.common.const import PathType, PathLocation @@ -114,19 +116,10 @@ class ConfigPaths: # win9x, in cwd self.config_root = self.cache_root = self.data_root = '.' else: - expand = os.path.expanduser - base = os.getenv('XDG_CONFIG_HOME') - if base is None or base[0] != '/': - base = expand('~/.config') - self.config_root = os.path.join(base, 'gajim') - base = os.getenv('XDG_CACHE_HOME') - if base is None or base[0] != '/': - base = expand('~/.cache') - self.cache_root = os.path.join(base, 'gajim') - base = os.getenv('XDG_DATA_HOME') - if base is None or base[0] != '/': - base = expand('~/.local/share') - self.data_root = os.path.join(base, 'gajim') + self.config_root = os.path.join(GLib.get_user_config_dir(), + 'gajim') + self.cache_root = os.path.join(GLib.get_user_cache_dir(), 'gajim') + self.data_root = os.path.join(GLib.get_user_data_dir(), 'gajim') import pkg_resources basedir = pkg_resources.resource_filename("gajim", ".") View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/71a32e9fa086fb16f92d380a1f88d38c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/71a32e9fa086fb16f92d380a1f88d38c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Fix reset of location/tune pubsub
by Philipp Hörist 24 Apr '20

24 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 48974ece by André Apitzsch at 2020-04-24T11:03:22+02:00 Fix reset of location/tune pubsub - - - - - e8d421fe by André Apitzsch at 2020-04-24T12:00:44+02:00 Location: Fix ValueError: too many values to unpack - - - - - 2 changed files: - nbxmpp/modules/location.py - nbxmpp/modules/tune.py Changes: ===================================== nbxmpp/modules/location.py ===================================== @@ -64,13 +64,11 @@ class Location(BaseModule): def set_location(self, data): item = Node('geoloc', {'xmlns': Namespace.LOCATION}) - if data is None: - return - - data = data._asdict() - for tag, value in data: - if value is not None: - item.addChild(tag, payload=value) + if data is not None: + data = data._asdict() + for tag, value in data.items(): + if value is not None: + item.addChild(tag, payload=value) jid = self._client.get_bound_jid().getBare() self._client.get_module('PubSub').publish( ===================================== nbxmpp/modules/tune.py ===================================== @@ -64,13 +64,11 @@ class Tune(BaseModule): def set_tune(self, data): item = Node('tune', {'xmlns': Namespace.TUNE}) - if data is None: - return - - data = data._asdict() - for tag, value in data.items(): - if value is not None: - item.addChild(tag, payload=value) + if data is not None: + data = data._asdict() + for tag, value in data.items(): + if value is not None: + item.addChild(tag, payload=value) jid = self._client.get_bound_jid().getBare() self._client.get_module('PubSub').publish( View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/b70acbc1b363cf5e30bb1a5… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/b70acbc1b363cf5e30bb1a5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add updated symbolic icon to Source.svg
by Philipp Hörist 24 Apr '20

24 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8b451078 by André Apitzsch at 2020-04-24T09:49:54+02:00 Add updated symbolic icon to Source.svg - - - - - 1 changed file: - gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim.Source.svg Changes: ===================================== gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim.Source.svg ===================================== @@ -17,8 +17,8 @@ height="152" id="svg11300" sodipodi:version="0.32" - inkscape:version="0.92.4 5da689c313, 2019-01-14" - sodipodi:docname="org.gajim.Gajim.Devel.Source.svg" + inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)" + sodipodi:docname="org.gajim.Gajim.Source.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.0" style="display:inline;enable-background:new" @@ -738,10 +738,10 @@ borderopacity="0.25490196" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.99999999" - inkscape:cx="-285.6526" - inkscape:cy="-87.397397" - inkscape:current-layer="layer9" + inkscape:zoom="0.70710677" + inkscape:cx="-337.13197" + inkscape:cy="-162.24943" + inkscape:current-layer="layer4" showgrid="false" inkscape:grid-bbox="true" inkscape:document-units="px" @@ -3044,20 +3044,18 @@ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3122);stroke-width:2.9312892;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" inkscape:connector-curvature="0" /> <g - id="g1392" - transform="matrix(1.0149624,0,0,1.0149624,-2.4340374,-2.5735397)"> + transform="translate(159.92187,172)" + id="surface13728"> <path inkscape:connector-curvature="0" - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#bebebe;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;image-rendering:auto;enable-background:accumulate" - d="m 168,178.25956 c -3.59611,0 -7.04759,2.14473 -6.80262,2.8108 0.0338,0.0919 2.33895,0.10984 2.41974,0.62386 l 0.66599,4.02844 c 0,0.38417 0.0293,0.79743 0.28505,0.79743 2.3919,0.53917 4.67215,0.52036 6.85205,0 0.25576,0 0.29667,-0.30087 0.29667,-0.68504 l 0.63789,-4.11273 c 0.10738,-0.43303 2.33669,-0.33902 2.39163,-0.76435 0.10306,-0.79794 -3.1503,-2.69841 -6.7464,-2.69841 z" - id="path2200-6" - sodipodi:nodetypes="csccccccsc" /> + 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-feature-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;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:#bdbdbd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.52244306;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" + d="M 8.078125,5.589811 C 5.7495304,5.6139857 3.4184563,6.3270973 1.4862525,7.6277765 0.91239372,8.038559 0.18596091,8.687565 0.4628905,9.47257 c 0.25241917,0.656059 1.0570194,0.518028 1.6128448,0.616596 0.3696171,0.07378 0.9768009,-0.0065 0.914101,0.52057 0.1830105,1.155673 0.3979677,2.3087 0.5610472,3.466023 -0.042286,0.611112 0.2584983,1.343056 0.9424464,1.416837 2.3187603,0.483774 4.7457319,0.548341 7.0613511,0.0053 0.68575,0.01632 1.105703,-0.68879 1.056485,-1.31311 0.171958,-1.282173 0.39317,-2.560499 0.584142,-3.841187 0.762821,-0.204747 1.699423,-0.08083 2.286598,-0.697632 C 15.971896,9.034471 15.504986,8.22116 14.980907,7.8057333 13.553597,6.6456819 11.744962,6.0514074 9.9533563,5.7404016 9.3334313,5.6419403 8.7059081,5.5898303 8.078125,5.589811 Z m 0,1.5234372 c 1.7656383,0.022616 3.554598,0.4339817 5.096085,1.3078868 0.261105,0.158065 0.648617,0.369273 0.114776,0.352405 -0.629827,0.07578 -1.48254,0.29076 -1.554016,1.050563 -0.212634,1.402555 -0.444506,2.803627 -0.64516,4.207106 -1.9742533,0.435055 -4.0375747,0.410647 -6.0136721,0 C 4.9569067,13.014699 4.7491285,12.006799 4.5952206,10.993655 4.4830302,10.459786 4.471498,9.896148 4.2671444,9.388997 4.0552063,8.812701 2.9917616,8.787656 2.8512944,8.606714 4.028518,7.8140293 5.4362857,7.4221333 6.826649,7.2024494 7.2412107,7.145162 7.6595319,7.1132943 8.078125,7.1132482 Z" + id="path6272" /> <path inkscape:connector-curvature="0" - style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#bebebe;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" - d="m 168,172.75 c -1.63019,0 -2.95155,1.37196 -2.95155,3.06241 0,1.08041 0.58909,1.86748 1.50192,2.57612 0.5322,0.62951 0.3362,0.5436 0.37638,1.20232 0,0.20454 0.0677,0.26736 0.26479,0.26736 0.55232,0.50116 1.11869,0.4882 1.64945,-0.0163 0.19714,0 0.21551,-0.0916 0.21551,-0.29612 0.0688,-0.85338 0.10709,-0.75079 0.48701,-1.2551 0.84218,-0.53965 1.40804,-1.37665 1.40804,-2.47824 0,-1.69045 -1.32137,-3.06241 -2.95155,-3.06241 z" - id="path3941-7" - sodipodi:nodetypes="csccccccsc" /> + 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-feature-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;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:#bdbdbd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.52244306;stroke-linecap:square;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" + d="M 8.078125,0 C 5.998681,0 4.3203024,1.7555881 4.3203125,3.8710938 4.320303,5.1657449 5.048438,6.1636093 5.9824219,6.9355469 v 0.140625 h 4.1523441 v -0.097656 -0.00195 -0.00391 c 0.0012,7.731e-4 0.0028,0.00102 0.0039,0.00195 0.0037,-0.00411 0.0038,-0.0075 0.0078,-0.011719 C 11.123196,6.2967795 11.835906,5.207339 11.83592,3.8710901 11.835812,1.7567534 10.16046,2e-7 8.078125,0 Z m 0,1.5214844 c 1.2301543,0 2.236328,1.0264643 2.236328,2.3496094 0,0.8563539 -0.3950947,1.4327299 -1.0820311,1.875 L 9.1171875,5.8203125 9.0351562,5.9316406 C 8.9311484,6.0706691 8.8506307,6.2231079 8.78125,6.3867188 H 7.4882812 C 7.4025242,6.2590301 7.3088259,6.1331888 7.1894531,5.9921875 l -0.050781,-0.060547 -0.0625,-0.048828 C 6.2405495,5.2340588 5.84375,4.6857324 5.84375,3.8710938 c 0,-1.3219881 1.0091332,-2.3496094 2.234375,-2.3496094 z m 1.84375,6.1015625 C 9.910157,7.6231597 9.8984365,7.62484 9.8867188,7.625 v 0.00195 h 0.00391 c 0.011925,3.4e-6 0.019618,0.00361 0.03125,0.00391 3.224e-4,-0.00431 -3.171e-4,-0.00358 0,-0.00781 z" + id="path6274" /> </g> </g> <g View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8b4510789d5cd04741e4fc5e98da494b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8b4510789d5cd04741e4fc5e98da494b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix org.gajim.Gajim-symbolic icon
by Philipp Hörist 21 Apr '20

21 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 36d26149 by lovetox at 2020-04-21T20:44:49+02:00 Fix org.gajim.Gajim-symbolic icon - - - - - 1 changed file: - gajim/data/icons/hicolor/symbolic/apps/org.gajim.Gajim-symbolic.svg Changes: ===================================== gajim/data/icons/hicolor/symbolic/apps/org.gajim.Gajim-symbolic.svg ===================================== @@ -12,8 +12,7 @@ <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-feature-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;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:#bdbdbd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.52244306;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" d="M 8.078125,5.589811 C 5.7495304,5.6139857 3.4184563,6.3270973 1.4862525,7.6277765 0.91239372,8.038559 0.18596091,8.687565 0.4628905,9.47257 c 0.25241917,0.656059 1.0570194,0.518028 1.6128448,0.616596 0.3696171,0.07378 0.9768009,-0.0065 0.914101,0.52057 0.1830105,1.155673 0.3979677,2.3087 0.5610472,3.466023 -0.042286,0.611112 0.2584983,1.343056 0.9424464,1.416837 2.3187603,0.483774 4.7457319,0.548341 7.0613511,0.0053 0.68575,0.01632 1.105703,-0.68879 1.056485,-1.31311 0.171958,-1.282173 0.39317,-2.560499 0.584142,-3.841187 0.762821,-0.204747 1.699423,-0.08083 2.286598,-0.697632 C 15.971896,9.034471 15.504986,8.22116 14.980907,7.8057333 13.553597,6.6456819 11.744962,6.0514074 9.9533563,5.7404016 9.3334313,5.6419403 8.7059081,5.5898303 8.078125,5.589811 Z m 0,1.5234372 c 1.7656383,0.022616 3.554598,0.4339817 5.096085,1.3078868 0.261105,0.158065 0.648617,0.369273 0.114776,0.352405 -0.629827,0.07578 -1.48254,0.29076 -1.554016,1.050563 -0.212634,1.402555 -0.444506,2.803627 -0.64516,4.207106 -1.9742533,0.435055 -4.0375747,0.410647 -6.0136721,0 C 4.9569067,13.014699 4.7491285,12.006799 4.5952206,10.993655 4.4830302,10.459786 4.471498,9.896148 4.2671444,9.388997 4.0552063,8.812701 2.9917616,8.787656 2.8512944,8.606714 4.028518,7.8140293 5.4362857,7.4221333 6.826649,7.2024494 7.2412107,7.145162 7.6595319,7.1132943 8.078125,7.1132482 Z" - id="path6272" - inkscape:connector-curvature="0" /> + id="path6272" /> <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-feature-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;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:#bdbdbd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.52244306;stroke-linecap:square;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" d="M 8.078125 0 C 5.998681 0 4.3203024 1.7555881 4.3203125 3.8710938 C 4.320303 5.1657449 5.048438 6.1636093 5.9824219 6.9355469 L 5.9824219 7.0761719 L 10.134766 7.0761719 L 10.134766 6.9785156 L 10.134766 6.9765625 L 10.134766 6.9726562 C 10.136001 6.9734293 10.137564 6.9736801 10.138672 6.9746094 C 10.142372 6.9704994 10.142484 6.9671096 10.146484 6.9628906 C 11.123214 6.2967832 11.835924 5.2073427 11.835938 3.8710938 C 11.835812 1.7567534 10.16046 2e-07 8.078125 0 z M 8.078125 1.5214844 C 9.3082793 1.5214844 10.314453 2.5479487 10.314453 3.8710938 C 10.314453 4.7274477 9.9193583 5.3038237 9.2324219 5.7460938 L 9.1171875 5.8203125 L 9.0351562 5.9316406 C 8.9311484 6.0706691 8.8506307 6.2231079 8.78125 6.3867188 L 7.4882812 6.3867188 C 7.4025242 6.2590301 7.3088259 6.1331888 7.1894531 5.9921875 L 7.1386719 5.9316406 L 7.0761719 5.8828125 C 6.2405495 5.2340588 5.84375 4.6857324 5.84375 3.8710938 C 5.84375 2.5491057 6.8528832 1.5214844 8.078125 1.5214844 z M 9.921875 7.6230469 C 9.910157 7.6231597 9.8984365 7.62484 9.8867188 7.625 L 9.8867188 7.6269531 L 9.890625 7.6269531 C 9.90255 7.6269565 9.910243 7.6305594 9.921875 7.6308594 C 9.9221974 7.6265494 9.9215579 7.6272769 9.921875 7.6230469 z " View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/36d26149342ca4c112638a384092f38b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/36d26149342ca4c112638a384092f38b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] History: Reverse result order for search query
by Philipp Hörist 21 Apr '20

21 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2fd6bbb9 by Daniel Brötzmann at 2020-04-21T19:01:07+02:00 History: Reverse result order for search query Reverses history search results to show the last entry first. This way, recent history is displayed first. - - - - - 1 changed file: - gajim/common/logger.py Changes: ===================================== gajim/common/logger.py ===================================== @@ -876,7 +876,7 @@ class Logger: additional_data, log_line_id FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND message LIKE like(?) {date_search} - ORDER BY time, log_line_id + ORDER BY time DESC, log_line_id '''.format(jids=', '.join('?' * len(jids)), date_search=between if date else '') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2fd6bbb9c4a6d2c1f7217ad030f265de… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2fd6bbb9c4a6d2c1f7217ad030f265de… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix typo s/entrys/entries/
by Philipp Hörist 21 Apr '20

21 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0b47c54d by Emmanuel Gil Peyrot at 2020-04-21T18:17:31+02:00 Fix typo s/entrys/entries/ - - - - - 4 changed files: - gajim/common/logger.py - gajim/gtk/css_config.py - gajim/gtk/dataform.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/common/logger.py ===================================== @@ -1490,7 +1490,7 @@ class Logger: rows = self._con.execute(sql).fetchall() for row in rows: self._muc_avatar_sha_cache[row.jid] = row.avatar_sha - log.info('%s Avatar SHA entrys loaded', len(rows)) + log.info('%d Avatar SHA entries loaded', len(rows)) @timeit def set_avatar_sha(self, account_jid, jid, sha=None): @@ -1632,7 +1632,7 @@ class Logger: for row in rows: disco_info = row.disco_info._replace(timestamp=row.last_seen) self._disco_info_cache[row.jid] = disco_info - log.info('%s DiscoInfo entrys loaded', len(rows)) + log.info('%d DiscoInfo entries loaded', len(rows)) def get_last_disco_info(self, jid, max_age=0): """ ===================================== gajim/gtk/css_config.py ===================================== @@ -52,7 +52,7 @@ class CSSConfig(): # gajim-dark.css - Has only entrys which we want to override in gajim.css + Has only entries which we want to override in gajim.css # default.css or default-dark.css ===================================== gajim/gtk/dataform.py ===================================== @@ -37,7 +37,7 @@ from gajim.gtk.util import MaxWidthComboBoxText # hide-fallback-fields Hide fallback fields in IBR form (ejabberd) # left-width Width for labels # read-only Read only mode for fields -# entry-activates-default Form entrys activate the default widget +# entry-activates-default Form entry activates the default widget class DataFormWidget(Gtk.ScrolledWindow): ===================================== gajim/gui_menu_builder.py ===================================== @@ -529,13 +529,13 @@ def get_singlechat_menu(control_id, account, jid): def build_chatstate_menu(): menu = Gio.Menu() - entrys = [ + entries = [ (_('Disabled'), 'disabled'), (_('Composing only'), 'composing_only'), (_('All chat states'), 'all') ] - for entry in entrys: + for entry in entries: label, setting = entry action = 'win.send-chatstate-%s::%s' % (control_id, setting) menu.append(label, action) @@ -646,13 +646,13 @@ def get_groupchat_menu(control_id, account, jid): def build_chatstate_menu(): menu = Gio.Menu() - entrys = [ + entries = [ (_('Disabled'), 'disabled'), (_('Composing only'), 'composing_only'), (_('All chat states'), 'all') ] - for entry in entrys: + for entry in entries: label, setting = entry action = 'win.send-chatstate-%s::%s' % (control_id, setting) menu.append(label, action) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0b47c54d5e9128e22695d72105ca53c6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0b47c54d5e9128e22695d72105ca53c6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rework org.gajim.Gajim-symbolic.svg
by Philipp Hörist 20 Apr '20

20 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: ab1f7084 by lovetox at 2020-04-20T22:49:21+02:00 Rework org.gajim.Gajim-symbolic.svg - - - - - 1 changed file: - gajim/data/icons/hicolor/symbolic/apps/org.gajim.Gajim-symbolic.svg Changes: ===================================== gajim/data/icons/hicolor/symbolic/apps/org.gajim.Gajim-symbolic.svg ===================================== @@ -1,44 +1,22 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16px" height="16px" viewBox="0 0 16 16" version="1.1"> -<defs> -<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%"> - <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/> -</filter> -<mask id="mask0"> - <g filter="url(#alpha)"> -<rect x="0" y="0" width="16" height="16" style="fill:rgb(0%,0%,0%);fill-opacity:0.137778;stroke:none;"/> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + width="16px" + height="16px" + viewBox="0 0 16 16" + version="1.1" + id="svg6277"> + <g + id="surface13728"> + <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-feature-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;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:#bdbdbd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.52244306;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" + d="M 8.078125,5.589811 C 5.7495304,5.6139857 3.4184563,6.3270973 1.4862525,7.6277765 0.91239372,8.038559 0.18596091,8.687565 0.4628905,9.47257 c 0.25241917,0.656059 1.0570194,0.518028 1.6128448,0.616596 0.3696171,0.07378 0.9768009,-0.0065 0.914101,0.52057 0.1830105,1.155673 0.3979677,2.3087 0.5610472,3.466023 -0.042286,0.611112 0.2584983,1.343056 0.9424464,1.416837 2.3187603,0.483774 4.7457319,0.548341 7.0613511,0.0053 0.68575,0.01632 1.105703,-0.68879 1.056485,-1.31311 0.171958,-1.282173 0.39317,-2.560499 0.584142,-3.841187 0.762821,-0.204747 1.699423,-0.08083 2.286598,-0.697632 C 15.971896,9.034471 15.504986,8.22116 14.980907,7.8057333 13.553597,6.6456819 11.744962,6.0514074 9.9533563,5.7404016 9.3334313,5.6419403 8.7059081,5.5898303 8.078125,5.589811 Z m 0,1.5234372 c 1.7656383,0.022616 3.554598,0.4339817 5.096085,1.3078868 0.261105,0.158065 0.648617,0.369273 0.114776,0.352405 -0.629827,0.07578 -1.48254,0.29076 -1.554016,1.050563 -0.212634,1.402555 -0.444506,2.803627 -0.64516,4.207106 -1.9742533,0.435055 -4.0375747,0.410647 -6.0136721,0 C 4.9569067,13.014699 4.7491285,12.006799 4.5952206,10.993655 4.4830302,10.459786 4.471498,9.896148 4.2671444,9.388997 4.0552063,8.812701 2.9917616,8.787656 2.8512944,8.606714 4.028518,7.8140293 5.4362857,7.4221333 6.826649,7.2024494 7.2412107,7.145162 7.6595319,7.1132943 8.078125,7.1132482 Z" + id="path6272" + inkscape:connector-curvature="0" /> + <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-feature-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;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:#bdbdbd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.52244306;stroke-linecap:square;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" + d="M 8.078125 0 C 5.998681 0 4.3203024 1.7555881 4.3203125 3.8710938 C 4.320303 5.1657449 5.048438 6.1636093 5.9824219 6.9355469 L 5.9824219 7.0761719 L 10.134766 7.0761719 L 10.134766 6.9785156 L 10.134766 6.9765625 L 10.134766 6.9726562 C 10.136001 6.9734293 10.137564 6.9736801 10.138672 6.9746094 C 10.142372 6.9704994 10.142484 6.9671096 10.146484 6.9628906 C 11.123214 6.2967832 11.835924 5.2073427 11.835938 3.8710938 C 11.835812 1.7567534 10.16046 2e-07 8.078125 0 z M 8.078125 1.5214844 C 9.3082793 1.5214844 10.314453 2.5479487 10.314453 3.8710938 C 10.314453 4.7274477 9.9193583 5.3038237 9.2324219 5.7460938 L 9.1171875 5.8203125 L 9.0351562 5.9316406 C 8.9311484 6.0706691 8.8506307 6.2231079 8.78125 6.3867188 L 7.4882812 6.3867188 C 7.4025242 6.2590301 7.3088259 6.1331888 7.1894531 5.9921875 L 7.1386719 5.9316406 L 7.0761719 5.8828125 C 6.2405495 5.2340588 5.84375 4.6857324 5.84375 3.8710938 C 5.84375 2.5491057 6.8528832 1.5214844 8.078125 1.5214844 z M 9.921875 7.6230469 C 9.910157 7.6231597 9.8984365 7.62484 9.8867188 7.625 L 9.8867188 7.6269531 L 9.890625 7.6269531 C 9.90255 7.6269565 9.910243 7.6305594 9.921875 7.6308594 C 9.9221974 7.6265494 9.9215579 7.6272769 9.921875 7.6230469 z " + id="path6274" /> </g> -</mask> -<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="15.571428" y1="29.99917" x2="15.571428" y2="42.285942" gradientTransform="matrix(2.931288,0,0,2.931288,-1.412986,2.510315)"> -<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:1;"/> -<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/> -</linearGradient> -<clipPath id="clip1"> - <rect x="0" y="0" width="192" height="152"/> -</clipPath> -<g id="surface511871" clip-path="url(#clip1)"> -<path style=" stroke:none;fill-rule:evenodd;fill:url(#linear0);" d="M 36.695312 90.449219 C 39.863281 90.667969 45.804688 93.007812 48.417969 90.449219 C 42.980469 93.910156 45.859375 116.472656 43.183594 127.925781 C 41.019531 115.433594 39.433594 94.847656 36.695312 90.449219 Z M 36.695312 90.449219 "/> -</g> -<mask id="mask1"> - <g filter="url(#alpha)"> -<rect x="0" y="0" width="16" height="16" style="fill:rgb(0%,0%,0%);fill-opacity:0.137778;stroke:none;"/> - </g> -</mask> -<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="15.571428" y1="29.99917" x2="15.571428" y2="42.285942" gradientTransform="matrix(2.931288,0,0,2.931288,4.44959,2.510315)"> -<stop offset="0" style="stop-color:rgb(0%,0%,0%);stop-opacity:1;"/> -<stop offset="1" style="stop-color:rgb(0%,0%,0%);stop-opacity:0;"/> -</linearGradient> -<clipPath id="clip2"> - <rect x="0" y="0" width="192" height="152"/> -</clipPath> -<g id="surface511874" clip-path="url(#clip2)"> -<path style=" stroke:none;fill-rule:evenodd;fill:url(#linear1);" d="M 107.042969 90.449219 C 103.875 90.667969 97.933594 93.007812 95.320312 90.449219 C 100.757812 93.910156 97.878906 116.472656 100.554688 127.925781 C 102.71875 115.433594 104.304688 94.847656 107.042969 90.449219 Z M 107.042969 90.449219 "/> -</g> -</defs> -<g id="surface511853"> -<use xlink:href="#surface511871" transform="matrix(1,0,0,1,-168,-16)" mask="url(#mask0)"/> -<use xlink:href="#surface511874" transform="matrix(1,0,0,1,-168,-16)" mask="url(#mask1)"/> -<path style="fill:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(74.509805%,74.509805%,74.509805%);stroke-opacity:1;stroke-miterlimit:4;" d="M 167.998496 178.25793 C 164.403843 178.25793 160.951591 180.405484 161.197906 181.071303 C 161.232544 181.163671 163.537894 181.179066 163.618716 181.694787 L 164.284535 185.724339 C 164.284535 186.105357 164.311475 186.521013 164.569336 186.521013 C 166.959356 187.059826 169.241615 187.040582 171.419959 186.521013 C 171.677819 186.521013 171.716306 186.220817 171.716306 185.83595 L 172.355184 181.721728 C 172.462947 181.290677 174.691324 181.383045 174.745205 180.959692 C 174.849119 180.15917 171.596997 178.25793 167.998496 178.25793 Z M 167.998496 178.25793 " transform="matrix(1.014962,0,0,1.014962,-162.434037,-174.57354)"/> -<path style="fill:none;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke:rgb(74.509805%,74.509805%,74.509805%);stroke-opacity:1;stroke-miterlimit:4;" d="M 167.998496 172.750491 C 166.370511 172.750491 165.04657 174.120615 165.04657 175.814028 C 165.04657 176.891654 165.639265 177.68063 166.551398 178.388784 C 167.082514 179.016117 166.886232 178.931446 166.928567 179.589568 C 166.928567 179.793547 166.993994 179.858974 167.190276 179.858974 C 167.744484 180.3593 168.310238 180.347754 168.841353 179.843579 C 169.037635 179.843579 169.056879 179.751211 169.056879 179.547232 C 169.126155 178.692829 169.164641 178.796743 169.54181 178.292568 C 170.384668 177.749906 170.950422 176.914746 170.950422 175.814028 C 170.950422 174.120615 169.63033 172.750491 167.998496 172.750491 Z M 167.998496 172.750491 " transform="matrix(1.014962,0,0,1.014962,-162.434037,-174.57354)"/> -</g> </svg> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ab1f70840e0de1a5f05a9bbcdd5d2a8a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ab1f70840e0de1a5f05a9bbcdd5d2a8a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use nbxmpp.namespaces
by Philipp Hörist 19 Apr '20

19 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d32996e0 by lovetox at 2020-04-19T21:59:37+02:00 Use nbxmpp.namespaces - - - - - 8 changed files: - gajim/chat_control.py - gajim/common/modules/http_auth.py - gajim/common/modules/httpupload.py - gajim/gtk/discovery.py - gajim/gtk/groupchat_info.py - gajim/gui_menu_builder.py - gajim/roster_window.py - test/broken/unit/test_jingle.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -35,12 +35,7 @@ from gi.repository import Pango from gi.repository import GLib from gi.repository import Gdk -from nbxmpp.protocol import NS_XHTML_IM -from nbxmpp.protocol import NS_MUC -from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO -from nbxmpp.protocol import NS_JINGLE_RTP_VIDEO -from nbxmpp.protocol import NS_JINGLE_ICE_UDP -from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5 +from nbxmpp.namespaces import Namespace from gajim.common import app from gajim.common import helpers @@ -321,7 +316,7 @@ class ChatControl(ChatControlBase): online and con.get_module('HTTPUpload').available) # Send file (Jingle) - jingle_support = self.contact.supports(NS_JINGLE_FILE_TRANSFER_5) + jingle_support = self.contact.supports(Namespace.JINGLE_FILE_TRANSFER_5) jingle_conditions = jingle_support and self.contact.show != 'offline' jingle = win.lookup_action('send-file-jingle-' + self.control_id) jingle.set_enabled(online and jingle_conditions) @@ -343,7 +338,7 @@ class ChatControl(ChatControlBase): win.lookup_action( 'invite-contacts-' + self.control_id).set_enabled(False) else: - if self.contact.supports(NS_MUC) and online: + if self.contact.supports(Namespace.MUC) and online: win.lookup_action( 'invite-contacts-' + self.control_id).set_enabled(True) else: @@ -423,7 +418,7 @@ class ChatControl(ChatControlBase): def _update_toolbar(self): # Formatting # TODO: find out what encryption allows for xhtml and which not - if self.contact.supports(NS_XHTML_IM): + if self.contact.supports(Namespace.XHTML_IM): self.xml.formattings_button.set_sensitive(True) self.xml.formattings_button.set_tooltip_text(_( 'Show a list of formattings')) @@ -435,10 +430,12 @@ class ChatControl(ChatControlBase): # Jingle detection jingle_audio = self.jingle['audio'] jingle_video = self.jingle['video'] - if self.contact.supports(NS_JINGLE_ICE_UDP) and \ + if self.contact.supports(Namespace.JINGLE_ICE_UDP) and \ app.is_installed('FARSTREAM') and self.contact.resource: - jingle_audio.available = self.contact.supports(NS_JINGLE_RTP_AUDIO) - jingle_video.available = self.contact.supports(NS_JINGLE_RTP_VIDEO) + jingle_audio.available = self.contact.supports( + Namespace.JINGLE_RTP_AUDIO) + jingle_video.available = self.contact.supports( + Namespace.JINGLE_RTP_VIDEO) else: if jingle_video.available or jingle_audio.available: self.stop_jingle() ===================================== gajim/common/modules/http_auth.py ===================================== @@ -16,7 +16,7 @@ import nbxmpp from nbxmpp.structs import StanzaHandler -from nbxmpp.protocol import NS_HTTP_AUTH +from nbxmpp.namespaces import Namespace from gajim.common import app from gajim.common.nec import NetworkEvent @@ -30,12 +30,12 @@ class HTTPAuth(BaseModule): self.handlers = [ StanzaHandler(name='message', callback=self._http_auth, - ns=NS_HTTP_AUTH, + ns=Namespace.HTTP_AUTH, priority=45), StanzaHandler(name='iq', callback=self._http_auth, typ='get', - ns=NS_HTTP_AUTH, + ns=Namespace.HTTP_AUTH, priority=45) ] ===================================== gajim/common/modules/httpupload.py ===================================== @@ -20,7 +20,7 @@ import io from urllib.parse import urlparse import mimetypes -from nbxmpp import NS_HTTPUPLOAD_0 +from nbxmpp.namespaces import Namespace from nbxmpp.util import is_error_result from nbxmpp.util import convert_tls_error_flags from gi.repository import GLib @@ -69,7 +69,7 @@ class HTTPUpload(BaseModule): return self.available = True - self.httpupload_namespace = NS_HTTPUPLOAD_0 + self.httpupload_namespace = Namespace.HTTPUPLOAD_0 self.component = info.jid self.max_file_size = info.httpupload_max_file_size ===================================== gajim/gtk/discovery.py ===================================== @@ -337,9 +337,9 @@ class ServicesCache: browser = info[0] if browser: return browser - # NS_BROWSE is deprecated, but we check for it anyways. + # Namespace.BROWSE is deprecated, but we check for it anyways. # Some services list it in features and respond to - # NS_DISCO_ITEMS anyways. + # Namespace.DISCO_ITEMS anyways. # Allow browsing for unknown types as well. if ((not features and not identities) or Namespace.DISCO_ITEMS in features or ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -18,7 +18,7 @@ from gi.repository import Gdk from gi.repository import GLib from gi.repository import Gtk -from nbxmpp.protocol import NS_MAM_2 +from nbxmpp.namespaces import Namespace from gajim.common import app from gajim.common.i18n import _ @@ -205,7 +205,7 @@ class GroupChatInfoScrolled(Gtk.ScrolledWindow): grid.remove_row(row) features = list(features) - if NS_MAM_2 in features: + if Namespace.MAM_2 in features: features.append('mam') row = 10 ===================================== gajim/gui_menu_builder.py ===================================== @@ -15,8 +15,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from gi.repository import Gtk, Gio, GLib -from nbxmpp.protocol import NS_COMMANDS -from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5, NS_CONFERENCE +from nbxmpp.namespaces import Namespace from gajim import gtkgui_helpers from gajim.common import app @@ -210,18 +209,18 @@ control=None, gc_contact=None, is_anonymous=True): contacts, account, roster.on_send_file_menuitem_activate, - cap=NS_JINGLE_FILE_TRANSFER_5)) + cap=Namespace.JINGLE_FILE_TRANSFER_5)) execute_command_menuitem.set_submenu(build_resources_submenu( - contacts, account, roster.on_execute_command, cap=NS_COMMANDS)) + contacts, account, roster.on_execute_command, cap=Namespace.COMMANDS)) else: - if contact.supports(NS_JINGLE_FILE_TRANSFER_5): + if contact.supports(Namespace.JINGLE_FILE_TRANSFER_5): send_file_menuitem.set_sensitive(True) send_file_menuitem.connect('activate', roster.on_send_file_menuitem_activate, contact, account) else: send_file_menuitem.set_sensitive(False) - if contact.supports(NS_COMMANDS): + if contact.supports(Namespace.COMMANDS): execute_command_menuitem.set_sensitive(True) if gc_contact and gc_contact.jid and not is_anonymous: execute_command_menuitem.connect('activate', @@ -321,7 +320,7 @@ control=None, gc_contact=None, is_anonymous=True): bookmarked = False c_ = app.contacts.get_contact(account, gc_contact.jid, gc_contact.resource) - if c_ and c_.supports(NS_CONFERENCE): + if c_ and c_.supports(Namespace.CONFERENCE): bookmarked = True build_invite_submenu(invite_menuitem, [(gc_contact, account)], show_bookmarked=bookmarked) @@ -330,7 +329,7 @@ control=None, gc_contact=None, is_anonymous=True): if control and control.resource: force_resource = True build_invite_submenu(invite_menuitem, [(contact, account)], - show_bookmarked=contact.supports(NS_CONFERENCE), + show_bookmarked=contact.supports(Namespace.CONFERENCE), force_resource=force_resource) if app.account_is_disconnected(account): ===================================== gajim/roster_window.py ===================================== @@ -41,9 +41,7 @@ from gi.repository import Pango from gi.repository import GObject from gi.repository import GLib from gi.repository import Gio -from nbxmpp.protocol import NS_ROSTERX -from nbxmpp.protocol import NS_CONFERENCE -from nbxmpp.protocol import NS_JINGLE_FILE_TRANSFER_5 +from nbxmpp.namespaces import Namespace from nbxmpp.structs import MoodData from nbxmpp.structs import ActivityData @@ -3947,7 +3945,7 @@ class RosterWindow: c_dest, was_big_brother, context, etime): type_ = 'message' if (c_dest.show not in ('offline', 'error') and - c_dest.supports(NS_ROSTERX)): + c_dest.supports(Namespace.ROSTERX)): type_ = 'iq' con = app.connections[account_dest] con.get_module('RosterItemExchange').send_contacts( @@ -4169,7 +4167,7 @@ class RosterWindow: return c_dest = app.contacts.get_contact_with_highest_priority( account_dest, jid_dest) - if not c_dest.supports(NS_JINGLE_FILE_TRANSFER_5): + if not c_dest.supports(Namespace.JINGLE_FILE_TRANSFER_5): return uri = data.strip() uri_splitted = uri.split() # we may have more than one file dropped @@ -4877,7 +4875,7 @@ class RosterWindow: if contact.show not in ('offline', 'error'): list_online.append((contact, account)) # Check that all contacts support direct NUC invite - if not contact.supports(NS_CONFERENCE): + if not contact.supports(Namespace.CONFERENCE): show_bookmarked = False list_.append((contact, account)) menu = Gtk.Menu() @@ -5029,7 +5027,7 @@ class RosterWindow: show_bookmarked = True for (contact, current_account) in list_: # Check that all contacts support direct NUC invite - if not contact.supports(NS_CONFERENCE): + if not contact.supports(Namespace.CONFERENCE): show_bookmarked = False break if account is not None: ===================================== test/broken/unit/test_jingle.py ===================================== @@ -8,9 +8,12 @@ lib.setup_env() from mock import Mock -from gajim.common.protocol.bytestream import ConnectionIBBytestream, ConnectionSocks5Bytestream + from nbxmpp import dispatcher -from nbxmpp import protocol +from nbxmpp.namespaces import Namespace + +from gajim.common.protocol.bytestream import ConnectionIBBytestream +from gajim.common.protocol.bytestream import ConnectionSocks5Bytestream from gajim.common.jingle import ConnectionJingle from gajim.common import app from gajim.common.socks5 import SocksQueue @@ -86,7 +89,7 @@ class TestJingle(unittest.TestCase): self.client = Connection() self.client.__str__ = lambda: 'Mock' # FIXME: why do I need this one? self.client._caller = Connection() - self.client.defaultNamespace = protocol.NS_CLIENT + self.client.defaultNamespace = Namespace.CLIENT self.client.Connection = Connection() # mock transport self.con = self.client.Connection self.con.server_resource = None @@ -132,7 +135,7 @@ class TestJingle(unittest.TestCase): def _simulate_jingle_session(self): self.dispatcher.RegisterHandler('iq', self.con._JingleCB, 'set', - protocol.NS_JINGLE) + Namespace.JINGLE) self.dispatcher.ProcessNonBlocking(session_init) session = list(self.con._sessions.values())[0] # The only session we have jft = list(session.contents.values())[0] # jingleFT object View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d32996e0087090ab1457f6b291e1fc80… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d32996e0087090ab1457f6b291e1fc80… 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