Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: MUC: Fix incorrect status message on presence
by Philipp Hörist 09 Apr '20

09 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7a8ccd0a by lovetox at 2020-04-09T23:34:30+02:00 MUC: Fix incorrect status message on presence Fixes #10049 - - - - - ebfc5b3e by lovetox at 2020-04-09T23:34:30+02:00 Fix pylint error - - - - - 3 changed files: - gajim/common/client.py - gajim/common/modules/muc.py - gajim/roster_window.py Changes: ===================================== gajim/common/client.py ===================================== @@ -280,7 +280,7 @@ class Client(ConnectionHandlers): def _on_connection_failed(self, _client, _signal_name): self._schedule_reconnect() - def _on_connected(self, client, _signal_name): + def _on_connected(self, _client, _signal_name): self._set_state(ClientState.CONNECTED) self.get_module('Discovery').discover_server_info() self.get_module('Discovery').discover_account_info() @@ -428,6 +428,9 @@ class Client(ConnectionHandlers): idle_time=idle_time) self.priority = priority + + self.get_module('MUC').update_presence() + app.nec.push_incoming_event( OurShowEvent(None, conn=self, show=show)) ===================================== gajim/common/modules/muc.py ===================================== @@ -304,14 +304,8 @@ class MUC(BaseModule): self._send_presence(muc_data, auto) def _send_presence(self, muc_data, auto): - if self._con.status == 'offline': - # FIXME: Check if this - return - message = self._con.status_message - xmpp_show = helpers.get_xmpp_show(self._con.status) - idle_time = None if auto and app.is_installed('IDLE') and app.config.get('autoaway'): idle_sec = idle.Monitor.get_idle_sec() @@ -320,12 +314,13 @@ class MUC(BaseModule): self._log.info('Send presence: %s, show: %s, ' 'message: %s, idle_time: %s', - muc_data.occupant_jid, xmpp_show, message, idle_time) + muc_data.occupant_jid, self._con.status, + message, idle_time) self._con.get_module('Presence').send_presence( muc_data.occupant_jid, - show=xmpp_show, - status=self._con.status, + show=self._con.status, + status=self._con.status_message, caps=True, idle_time=idle_time) ===================================== gajim/roster_window.py ===================================== @@ -2113,7 +2113,6 @@ class RosterWindow: self.delete_pep(app.get_jid_from_account(account), account) app.connections[account].change_status(status, txt, auto) - app.connections[account].get_module('MUC').update_presence(auto) def chg_contact_status(self, contact, show, status, account): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ebce3fe433ca8455e3133923131f5f7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ebce3fe433ca8455e3133923131f5f7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] TCP: Pass Node objects instead of actual data on data-sent
by Philipp Hörist 09 Apr '20

09 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: ec3c756b by lovetox at 2020-04-09T23:42:06+02:00 TCP: Pass Node objects instead of actual data on data-sent - Use for logging the actual data passed to GLib - Pass a Node object on data-sent so applications don't have to reparse it - - - - - 1 changed file: - nbxmpp/tcp.py Changes: ===================================== nbxmpp/tcp.py ===================================== @@ -289,14 +289,13 @@ class TCPConnection(Connection): self._write_stanzas() return - for stanza in self._write_stanza_buffer: - self._log_stanza(stanza, received=False) - self._write_stanza_buffer = None + self._log_stanza(data, received=False) - try: - self.notify('data-sent', data) - except Exception: - self._log.exception('Error while executing data-sent:') + for stanza in self._write_stanza_buffer: + try: + self.notify('data-sent', stanza) + except Exception: + self._log.exception('Error while executing data-sent:') if self._output_closed and not self._write_queue: self._check_for_shutdown() View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ec3c756b9c7657dee552ef19… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ec3c756b9c7657dee552ef19… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Update app icons
by Philipp Hörist 09 Apr '20

09 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4a1cbf03 by André Apitzsch at 2020-04-08T23:16:46+02:00 Update app icons Icons are generated from Source using App Icon Preview - - - - - a6b5a20d by André Apitzsch at 2020-04-08T23:17:33+02:00 Add app icon for nightly version - - - - - ebce3fe4 by André Apitzsch at 2020-04-08T23:22:35+02:00 Use only scalable app icons - - - - - 7 changed files: - − gajim/data/icons/hicolor/128x128/apps/org.gajim.Gajim.png - − gajim/data/icons/hicolor/64x64/apps/org.gajim.Gajim.png - + gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim.Devel.svg - + gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim.Source.svg - gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim.svg - gajim/data/icons/hicolor/symbolic/apps/org.gajim.Gajim-symbolic.svg - setup.py Changes: ===================================== gajim/data/icons/hicolor/128x128/apps/org.gajim.Gajim.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/128x128/apps/org.gajim.Gajim.png and /dev/null differ ===================================== gajim/data/icons/hicolor/64x64/apps/org.gajim.Gajim.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/64x64/apps/org.gajim.Gajim.png and /dev/null differ ===================================== gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim.Devel.svg ===================================== @@ -0,0 +1,183 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128px" height="128px" viewBox="0 0 128 128" version="1.1"> +<defs> +<radialGradient id="radial0" gradientUnits="userSpaceOnUse" cx="16.488304" cy="23.537582" fx="16.488304" fy="23.537582" r="19" gradientTransform="matrix(5.830516,0,0,5.186123,-57.136612,106.88559)"> +<stop offset="0" style="stop-color:rgb(45.09804%,82.352942%,8.627451%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(30.588236%,60.392159%,2.352941%);stop-opacity:1;"/> +</radialGradient> +<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="128" height="128" style="fill:rgb(0%,0%,0%);fill-opacity:0.137778;stroke:none;"/> + </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="surface511821" 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="128" height="128" 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="surface511824" 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> +<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="16" y1="2" x2="38.465416" y2="42.405006" gradientTransform="matrix(3.689005,0,0,3.693769,-24.666805,156.809784)"> +<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(100%,100%,100%);stop-opacity:0;"/> +</linearGradient> +<radialGradient id="radial1" gradientUnits="userSpaceOnUse" cx="21.142859" cy="22.17857" fx="21.142859" fy="22.17857" r="9" gradientTransform="matrix(2.931285,0,0,2.932291,-6.481694,134.102966)"> +<stop offset="0" style="stop-color:rgb(99.607843%,94.901961%,56.862748%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(92.941177%,83.137256%,0%);stop-opacity:1;"/> +</radialGradient> +<linearGradient id="linear3" gradientUnits="userSpaceOnUse" x1="24.260687" y1="2.533504" x2="24.832115" y2="22.012075" gradientTransform="matrix(1.342451,0,-0.837372,1.723858,33.163297,2.90654)"> +<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(100%,100%,100%);stop-opacity:0;"/> +</linearGradient> +<linearGradient id="linear4" gradientUnits="userSpaceOnUse" x1="16" y1="2" x2="32.927006" y2="31.587952" gradientTransform="matrix(2.912369,0,0,2.925584,-6.027668,173.323547)"> +<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(100%,100%,100%);stop-opacity:0;"/> +</linearGradient> +<linearGradient id="linear5" gradientUnits="userSpaceOnUse" x1="24.000008" y1="31.785711" x2="30.00001" y2="38.499996" gradientTransform="matrix(1.993,0,0,2.079344,16.040779,163.224747)"> +<stop offset="0" style="stop-color:rgb(44.705883%,62.352943%,81.176472%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(22.352941%,43.137255%,65.490198%);stop-opacity:1;"/> +</linearGradient> +<linearGradient id="linear6" gradientUnits="userSpaceOnUse" x1="17.725422" y1="3.860764" x2="27.055439" y2="24.431168" gradientTransform="matrix(2.912369,0,0,2.925584,-6.027668,173.323547)"> +<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(100%,100%,100%);stop-opacity:0;"/> +</linearGradient> +<radialGradient id="radial2" gradientUnits="userSpaceOnUse" cx="16.488304" cy="23.537582" fx="16.488304" fy="23.537582" r="19" gradientTransform="matrix(5.830516,0,0,5.186123,-57.136612,106.88559)"> +<stop offset="0" style="stop-color:rgb(45.09804%,82.352942%,8.627451%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(30.588236%,60.392159%,2.352941%);stop-opacity:1;"/> +</radialGradient> +<mask id="mask3"> + <g filter="url(#alpha)"> +<rect x="0" y="0" width="128" height="128" style="fill:rgb(0%,0%,0%);fill-opacity:0.137778;stroke:none;"/> + </g> +</mask> +<linearGradient id="linear7" 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="clip5"> + <rect x="0" y="0" width="192" height="152"/> +</clipPath> +<g id="surface511821" clip-path="url(#clip5)"> +<path style=" stroke:none;fill-rule:evenodd;fill:url(#linear7);" 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="mask4"> + <g filter="url(#alpha)"> +<rect x="0" y="0" width="128" height="128" style="fill:rgb(0%,0%,0%);fill-opacity:0.137778;stroke:none;"/> + </g> +</mask> +<linearGradient id="linear8" 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="clip6"> + <rect x="0" y="0" width="192" height="152"/> +</clipPath> +<g id="surface511824" clip-path="url(#clip6)"> +<path style=" stroke:none;fill-rule:evenodd;fill:url(#linear8);" 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> +<linearGradient id="linear9" gradientUnits="userSpaceOnUse" x1="16" y1="2" x2="38.465416" y2="42.405006" gradientTransform="matrix(3.689005,0,0,3.693769,-24.666805,156.809784)"> +<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(100%,100%,100%);stop-opacity:0;"/> +</linearGradient> +<radialGradient id="radial3" gradientUnits="userSpaceOnUse" cx="21.142859" cy="22.17857" fx="21.142859" fy="22.17857" r="9" gradientTransform="matrix(2.931285,0,0,2.932291,-6.481694,134.102966)"> +<stop offset="0" style="stop-color:rgb(99.607843%,94.901961%,56.862748%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(92.941177%,83.137256%,0%);stop-opacity:1;"/> +</radialGradient> +<linearGradient id="linear10" gradientUnits="userSpaceOnUse" x1="24.260687" y1="2.533504" x2="24.832115" y2="22.012075" gradientTransform="matrix(1.342451,0,-0.837372,1.723858,33.163297,2.90654)"> +<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(100%,100%,100%);stop-opacity:0;"/> +</linearGradient> +<linearGradient id="linear11" gradientUnits="userSpaceOnUse" x1="16" y1="2" x2="32.927006" y2="31.587952" gradientTransform="matrix(2.912369,0,0,2.925584,-6.027668,173.323547)"> +<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(100%,100%,100%);stop-opacity:0;"/> +</linearGradient> +<linearGradient id="linear12" gradientUnits="userSpaceOnUse" x1="24.000008" y1="31.785711" x2="30.00001" y2="38.499996" gradientTransform="matrix(1.993,0,0,2.079344,16.040779,163.224747)"> +<stop offset="0" style="stop-color:rgb(44.705883%,62.352943%,81.176472%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(22.352941%,43.137255%,65.490198%);stop-opacity:1;"/> +</linearGradient> +<linearGradient id="linear13" gradientUnits="userSpaceOnUse" x1="17.725422" y1="3.860764" x2="27.055439" y2="24.431168" gradientTransform="matrix(2.912369,0,0,2.925584,-6.027668,173.323547)"> +<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(100%,100%,100%);stop-opacity:0;"/> +</linearGradient> +<clipPath id="clip4"> + <rect x="0" y="0" width="128" height="128"/> +</clipPath> +<g id="surface511839" clip-path="url(#clip4)"> +<path style="fill-rule:nonzero;fill:url(#radial2);stroke-width:2.931288;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(30.588236%,60.392159%,2.352941%);stroke-opacity:1;stroke-miterlimit:4;" d="M 63.871094 218.601562 C 35.554688 218.601562 9.640625 233.59375 9.640625 243.296875 C 9.640625 247.816406 28.058594 245.226562 28.695312 249.191406 L 33.273438 280.140625 C 33.273438 283.101562 34.832031 285.421875 36.847656 285.421875 C 55.203125 290.164062 73.234375 290.09375 90.800781 285.421875 C 92.8125 285.421875 94.464844 283.101562 94.464844 280.140625 L 99.042969 249.191406 C 99.890625 245.851562 118.097656 247.816406 118.097656 243.296875 C 118.097656 233.59375 92.183594 218.601562 63.871094 218.601562 Z M 63.871094 218.601562 " transform="matrix(1,0,0,1,0,-172)"/> +<use xlink:href="#surface511821" transform="matrix(1,0,0,1,-8,-16)" mask="url(#mask3)"/> +<use xlink:href="#surface511824" transform="matrix(1,0,0,1,-8,-16)" mask="url(#mask4)"/> +<path style="fill:none;stroke-width:2.93129;stroke-linecap:butt;stroke-linejoin:miter;stroke:url(#linear9);stroke-miterlimit:4;" d="M 63.871094 221.53125 C 37.082031 221.53125 11.375 237.507812 13.199219 242.46875 C 13.453125 243.152344 30.621094 243.289062 31.222656 247.117188 L 36.183594 277.121094 C 36.183594 279.984375 36.402344 283.0625 38.308594 283.0625 C 56.125 287.078125 73.109375 286.9375 89.34375 283.0625 C 91.25 283.0625 91.554688 280.820312 91.554688 277.960938 L 96.304688 247.324219 C 97.105469 244.101562 113.710938 244.800781 114.121094 241.632812 C 114.886719 235.6875 90.65625 221.53125 63.871094 221.53125 Z M 63.871094 221.53125 " transform="matrix(1,0,0,1,0,-172)"/> +<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:0.0593608;stroke-width:2.931289;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:0.423529;stroke-miterlimit:4;" d="M 79.992188 233.257812 C 79.992188 239.734375 72.773438 244.984375 63.871094 244.984375 C 54.964844 244.984375 47.746094 239.734375 47.746094 233.257812 C 47.746094 226.78125 54.964844 221.53125 63.871094 221.53125 C 72.773438 221.53125 79.992188 226.78125 79.992188 233.257812 Z M 79.992188 233.257812 " transform="matrix(1,0,0,1,0,-172)"/> +<path style="fill-rule:nonzero;fill:url(#radial3);stroke-width:2.931289;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.862746%,62.7451%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 63.871094 177.5625 C 50.109375 177.5625 38.953125 188.730469 38.953125 202.488281 C 38.953125 211.28125 43.503906 219.019531 50.382812 223.457031 C 54.878906 228.578125 52.875 226.90625 53.609375 233.1875 C 53.609375 234.851562 54.96875 236.210938 56.632812 236.210938 C 61.96875 240.304688 66.722656 239.871094 71.105469 236.210938 C 72.769531 236.210938 74.128906 234.851562 74.128906 233.1875 C 75 227.039062 73.738281 227.816406 76.945312 223.714844 C 84.054688 219.320312 88.785156 211.453125 88.785156 202.488281 C 88.785156 188.730469 77.628906 177.5625 63.871094 177.5625 Z M 63.871094 177.5625 " transform="matrix(1,0,0,1,0,-172)"/> +<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear10);" d="M 59.097656 24.617188 C 56.738281 29.472656 52.273438 33.410156 49.128906 33.410156 C 45.984375 33.410156 45.34375 29.472656 47.703125 24.617188 C 50.0625 19.761719 54.527344 15.824219 57.671875 15.824219 C 60.816406 15.824219 61.453125 19.761719 59.097656 24.617188 Z M 59.097656 24.617188 "/> +<path style="fill:none;stroke-width:2.931289;stroke-linecap:butt;stroke-linejoin:miter;stroke:url(#linear11);stroke-miterlimit:4;" d="M 63.871094 180.496094 C 51.726562 180.496094 41.882812 190.714844 41.882812 203.304688 C 41.882812 211.351562 46.273438 217.214844 53.070312 222.492188 C 57.035156 227.183594 55.574219 226.542969 55.875 231.449219 C 55.875 232.972656 56.378906 233.441406 57.847656 233.441406 C 61.960938 237.171875 66.179688 237.078125 70.132812 233.320312 C 71.601562 233.320312 71.738281 232.636719 71.738281 231.113281 C 72.25 224.757812 72.535156 225.519531 75.367188 221.765625 C 81.640625 217.746094 85.855469 211.511719 85.855469 203.304688 C 85.855469 190.714844 76.011719 180.496094 63.871094 180.496094 Z M 63.871094 180.496094 " transform="matrix(1,0,0,1,0,-172)"/> +<path style="fill-rule:nonzero;fill:url(#linear12);stroke-width:2.931288;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(20.392157%,39.607844%,64.313728%);stroke-opacity:1;stroke-miterlimit:4;" d="M 52.171875 225.542969 C 53.09375 227.152344 53.101562 228.8125 53.605469 233.160156 C 53.605469 234.832031 54.9375 236.195312 56.589844 236.195312 C 61.890625 240.308594 66.640625 239.875 70.992188 236.195312 C 72.648438 236.195312 74.191406 234.882812 74.191406 233.210938 C 74.757812 229.15625 74.984375 226.558594 75.582031 225.144531 L 71.519531 227.507812 L 56.171875 227.507812 Z M 52.171875 225.542969 " transform="matrix(1,0,0,1,0,-172)"/> +<path style="fill:none;stroke-width:2.931289;stroke-linecap:butt;stroke-linejoin:miter;stroke:url(#linear13);stroke-miterlimit:4;" d="M 56.4375 230.328125 L 56.59375 233.285156 L 58.058594 233.285156 C 63.382812 237.972656 66.652344 235.839844 69.785156 233.265625 L 70.925781 233.265625 L 71.300781 230.328125 Z M 56.4375 230.328125 " transform="matrix(1,0,0,1,0,-172)"/> +</g> +<clipPath id="clip3"> + <rect x="0" y="0" width="128" height="128"/> +</clipPath> +<g id="surface511842" clip-path="url(#clip3)" filter="url(#alpha)"> +<use xlink:href="#surface511839"/> +</g> +<mask id="mask2"> +<use xlink:href="#surface511842"/> +</mask> +<mask id="mask5"> + <g filter="url(#alpha)"> +<rect x="0" y="0" width="128" height="128" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/> + </g> +</mask> +<linearGradient id="linear14" gradientUnits="userSpaceOnUse" x1="300" y1="235" x2="428" y2="235" gradientTransform="matrix(0.000000000000000023,0.37,-0.98462,0.00000000000000006,295.38501,-30.360001)"> +<stop offset="0" style="stop-color:rgb(97.647059%,94.117647%,41.960785%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(96.078432%,76.078433%,6.666667%);stop-opacity:1;"/> +</linearGradient> +<clipPath id="clip8"> + <rect x="0" y="0" width="128" height="128"/> +</clipPath> +<g id="surface511836" clip-path="url(#clip8)"> +<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear14);" d="M 128 80.640625 L 128 128 L 0 128 L 0 80.640625 Z M 128 80.640625 "/> +<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 13.308594 80.640625 L 60.664062 128 L 81.878906 128 L 34.519531 80.640625 Z M 55.730469 80.640625 L 103.09375 128 L 124.308594 128 L 76.945312 80.640625 Z M 98.160156 80.640625 L 128 110.480469 L 128 89.269531 L 119.371094 80.640625 Z M 0 88.546875 L 0 109.761719 L 18.238281 128 L 39.453125 128 Z M 0 88.546875 "/> +</g> +<clipPath id="clip7"> + <rect x="0" y="0" width="128" height="128"/> +</clipPath> +<g id="surface511841" clip-path="url(#clip7)"> +<use xlink:href="#surface511836" mask="url(#mask5)"/> +</g> +</defs> +<g id="surface511803"> +<path style="fill-rule:nonzero;fill:url(#radial0);stroke-width:2.931288;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(30.588236%,60.392159%,2.352941%);stroke-opacity:1;stroke-miterlimit:4;" d="M 63.871094 218.601562 C 35.554688 218.601562 9.640625 233.59375 9.640625 243.296875 C 9.640625 247.816406 28.058594 245.226562 28.695312 249.191406 L 33.273438 280.140625 C 33.273438 283.101562 34.832031 285.421875 36.847656 285.421875 C 55.203125 290.164062 73.234375 290.09375 90.800781 285.421875 C 92.8125 285.421875 94.464844 283.101562 94.464844 280.140625 L 99.042969 249.191406 C 99.890625 245.851562 118.097656 247.816406 118.097656 243.296875 C 118.097656 233.59375 92.183594 218.601562 63.871094 218.601562 Z M 63.871094 218.601562 " transform="matrix(1,0,0,1,0,-172)"/> +<use xlink:href="#surface511821" transform="matrix(1,0,0,1,-8,-16)" mask="url(#mask0)"/> +<use xlink:href="#surface511824" transform="matrix(1,0,0,1,-8,-16)" mask="url(#mask1)"/> +<path style="fill:none;stroke-width:2.93129;stroke-linecap:butt;stroke-linejoin:miter;stroke:url(#linear2);stroke-miterlimit:4;" d="M 63.871094 221.53125 C 37.082031 221.53125 11.375 237.507812 13.199219 242.46875 C 13.453125 243.152344 30.621094 243.289062 31.222656 247.117188 L 36.183594 277.121094 C 36.183594 279.984375 36.402344 283.0625 38.308594 283.0625 C 56.125 287.078125 73.109375 286.9375 89.34375 283.0625 C 91.25 283.0625 91.554688 280.820312 91.554688 277.960938 L 96.304688 247.324219 C 97.105469 244.101562 113.710938 244.800781 114.121094 241.632812 C 114.886719 235.6875 90.65625 221.53125 63.871094 221.53125 Z M 63.871094 221.53125 " transform="matrix(1,0,0,1,0,-172)"/> +<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:0.0593608;stroke-width:2.931289;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:0.423529;stroke-miterlimit:4;" d="M 79.992188 233.257812 C 79.992188 239.734375 72.773438 244.984375 63.871094 244.984375 C 54.964844 244.984375 47.746094 239.734375 47.746094 233.257812 C 47.746094 226.78125 54.964844 221.53125 63.871094 221.53125 C 72.773438 221.53125 79.992188 226.78125 79.992188 233.257812 Z M 79.992188 233.257812 " transform="matrix(1,0,0,1,0,-172)"/> +<path style="fill-rule:nonzero;fill:url(#radial1);stroke-width:2.931289;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.862746%,62.7451%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 63.871094 177.5625 C 50.109375 177.5625 38.953125 188.730469 38.953125 202.488281 C 38.953125 211.28125 43.503906 219.019531 50.382812 223.457031 C 54.878906 228.578125 52.875 226.90625 53.609375 233.1875 C 53.609375 234.851562 54.96875 236.210938 56.632812 236.210938 C 61.96875 240.304688 66.722656 239.871094 71.105469 236.210938 C 72.769531 236.210938 74.128906 234.851562 74.128906 233.1875 C 75 227.039062 73.738281 227.816406 76.945312 223.714844 C 84.054688 219.320312 88.785156 211.453125 88.785156 202.488281 C 88.785156 188.730469 77.628906 177.5625 63.871094 177.5625 Z M 63.871094 177.5625 " transform="matrix(1,0,0,1,0,-172)"/> +<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear3);" d="M 59.097656 24.617188 C 56.738281 29.472656 52.273438 33.410156 49.128906 33.410156 C 45.984375 33.410156 45.34375 29.472656 47.703125 24.617188 C 50.0625 19.761719 54.527344 15.824219 57.671875 15.824219 C 60.816406 15.824219 61.453125 19.761719 59.097656 24.617188 Z M 59.097656 24.617188 "/> +<path style="fill:none;stroke-width:2.931289;stroke-linecap:butt;stroke-linejoin:miter;stroke:url(#linear4);stroke-miterlimit:4;" d="M 63.871094 180.496094 C 51.726562 180.496094 41.882812 190.714844 41.882812 203.304688 C 41.882812 211.351562 46.273438 217.214844 53.070312 222.492188 C 57.035156 227.183594 55.574219 226.542969 55.875 231.449219 C 55.875 232.972656 56.378906 233.441406 57.847656 233.441406 C 61.960938 237.171875 66.179688 237.078125 70.132812 233.320312 C 71.601562 233.320312 71.738281 232.636719 71.738281 231.113281 C 72.25 224.757812 72.535156 225.519531 75.367188 221.765625 C 81.640625 217.746094 85.855469 211.511719 85.855469 203.304688 C 85.855469 190.714844 76.011719 180.496094 63.871094 180.496094 Z M 63.871094 180.496094 " transform="matrix(1,0,0,1,0,-172)"/> +<path style="fill-rule:nonzero;fill:url(#linear5);stroke-width:2.931288;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(20.392157%,39.607844%,64.313728%);stroke-opacity:1;stroke-miterlimit:4;" d="M 52.171875 225.542969 C 53.09375 227.152344 53.101562 228.8125 53.605469 233.160156 C 53.605469 234.832031 54.9375 236.195312 56.589844 236.195312 C 61.890625 240.308594 66.640625 239.875 70.992188 236.195312 C 72.648438 236.195312 74.191406 234.882812 74.191406 233.210938 C 74.757812 229.15625 74.984375 226.558594 75.582031 225.144531 L 71.519531 227.507812 L 56.171875 227.507812 Z M 52.171875 225.542969 " transform="matrix(1,0,0,1,0,-172)"/> +<path style="fill:none;stroke-width:2.931289;stroke-linecap:butt;stroke-linejoin:miter;stroke:url(#linear6);stroke-miterlimit:4;" d="M 56.4375 230.328125 L 56.59375 233.285156 L 58.058594 233.285156 C 63.382812 237.972656 66.652344 235.839844 69.785156 233.265625 L 70.925781 233.265625 L 71.300781 230.328125 Z M 56.4375 230.328125 " transform="matrix(1,0,0,1,0,-172)"/> +<use xlink:href="#surface511841" mask="url(#mask2)"/> +</g> +</svg> ===================================== gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim.Source.svg ===================================== The diff for this file was not included because it is too large. ===================================== gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim.svg ===================================== @@ -1,444 +1,78 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - 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:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="48px" - height="48px" - id="svg4023" - sodipodi:version="0.32" - inkscape:version="0.44+devel" - sodipodi:docname="gajim-48x48.svg" - sodipodi:docbase="/home/cornelius/Desktop/GAJIM iconset/sources/tangoified-logo" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/cornelius/gajim.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <defs - id="defs4025"> - <linearGradient - inkscape:collect="always" - id="linearGradient3106"> - <stop - style="stop-color:black;stop-opacity:1;" - offset="0" - id="stop3108" /> - <stop - style="stop-color:black;stop-opacity:0;" - offset="1" - id="stop3110" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3121"> - <stop - style="stop-color:black;stop-opacity:1;" - offset="0" - id="stop3123" /> - <stop - style="stop-color:black;stop-opacity:0;" - offset="1" - id="stop3125" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3103"> - <stop - style="stop-color:#73d216;stop-opacity:1" - offset="0" - id="stop3105" /> - <stop - style="stop-color:#4e9a06;stop-opacity:1" - offset="1" - id="stop3107" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3223"> - <stop - style="stop-color:#729fcf;stop-opacity:1;" - offset="0" - id="stop3225" /> - <stop - style="stop-color:#396ea7;stop-opacity:1" - offset="1" - id="stop3227" /> - </linearGradient> - <linearGradient - id="linearGradient3128" - inkscape:collect="always"> - <stop - id="stop3130" - offset="0" - style="stop-color:#fef291;stop-opacity:1" /> - <stop - id="stop3132" - offset="1" - style="stop-color:#edd400;stop-opacity:1" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3112"> - <stop - style="stop-color:white;stop-opacity:1;" - offset="0" - id="stop3114" /> - <stop - style="stop-color:white;stop-opacity:0;" - offset="1" - id="stop3116" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3096"> - <stop - style="stop-color:black;stop-opacity:1;" - offset="0" - id="stop3098" /> - <stop - style="stop-color:black;stop-opacity:0;" - offset="1" - id="stop3100" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient3080"> - <stop - style="stop-color:#ad7fa8;stop-opacity:1" - offset="0" - id="stop3082" /> - <stop - style="stop-color:#75507b;stop-opacity:1" - offset="1" - id="stop3084" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3951" - id="linearGradient3957" - x1="16" - y1="2" - x2="32.927006" - y2="31.587952" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.993546,0,0,0.998054,0.154891,5.053486)" /> - <linearGradient - inkscape:collect="always" - id="linearGradient3951"> - <stop - style="stop-color:white;stop-opacity:1;" - offset="0" - id="stop3953" /> - <stop - style="stop-color:white;stop-opacity:0;" - offset="1" - id="stop3955" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3951" - id="linearGradient3092" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-1,3)" - x1="18.107143" - y1="53.76825" - x2="8.4828358" - y2="3.3976703" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3096" - id="radialGradient3102" - cx="23.081985" - cy="42.747208" - fx="23.081985" - fy="42.747208" - r="16.010918" - gradientTransform="matrix(1,0,0,0.119874,0,37.62294)" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3080" - id="radialGradient3104" - cx="17.309582" - cy="24.508204" - fx="17.309582" - fy="24.508204" - r="17.031612" - gradientTransform="matrix(2.13216,1.122823e-2,-1.1822e-2,2.244913,-18.75993,-30.16344)" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3112" - id="linearGradient3118" - x1="24.260687" - y1="2.5335035" - x2="24.832115" - y2="22.012075" - gradientUnits="userSpaceOnUse" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3128" - id="radialGradient3120" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.705883,0,0,1.667238,-17.94118,-19.21085)" - cx="21.142859" - cy="22.17857" - fx="21.142859" - fy="22.17857" - r="9" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3128" - id="radialGradient3221" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.999999,0,0,1.000342,1.223408e-6,-8.326495)" - cx="21.142859" - cy="22.17857" - fx="21.142859" - fy="22.17857" - r="9" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3223" - id="linearGradient3229" - x1="24.000008" - y1="31.785711" - x2="30.00001" - y2="38.499996" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.679906,0,0,0.709362,7.683475,1.608315)" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3103" - id="radialGradient3109" - cx="15.269456" - cy="24.907877" - fx="15.269456" - fy="24.907877" - r="19" - gradientTransform="matrix(1.989063,0,0,1.427178,-17.28077,-7.054682)" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3951" - id="linearGradient3111" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.258493,0,0,1.2607,-6.203794,1.409664)" - x1="16" - y1="2" - x2="38.465416" - y2="42.405006" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3951" - id="linearGradient3115" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.258493,0,0,1.260118,-6.203794,-0.58013)" - x1="16" - y1="2" - x2="38.465416" - y2="42.405006" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3103" - id="radialGradient3117" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.989063,0,0,1.76923,-17.28077,-17.61162)" - cx="16.488304" - cy="23.537582" - fx="16.488304" - fy="23.537582" - r="19" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3121" - id="radialGradient3127" - cx="23.991123" - cy="44.514973" - fx="23.991123" - fy="44.514973" - r="20.85965" - gradientTransform="matrix(1,0,0,0.16707,0,37.07785)" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3106" - id="linearGradient3113" - x1="15.571428" - y1="29.99917" - x2="15.571428" - y2="42.285942" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(1,0)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3106" - id="linearGradient3116" - x1="15.571428" - y1="29.99917" - x2="15.571428" - y2="42.285942" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-1,0)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3951" - id="linearGradient3122" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.993546,0,0,0.998054,0.154891,5.053486)" - x1="17.725422" - y1="3.860764" - x2="27.055439" - y2="24.431168" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="4.9497475" - inkscape:cx="56.051257" - inkscape:cy="28.790721" - inkscape:current-layer="layer1" - showgrid="true" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:window-width="872" - inkscape:window-height="666" - inkscape:window-x="0" - inkscape:window-y="48" /> - <metadata - id="metadata4028"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title>Gajim</dc:title> - <dc:date>28.10.2006</dc:date> - <dc:creator> - <cc:Agent> - <dc:title>Josef Vybíral</dc:title> - </cc:Agent> - </dc:creator> - <dc:rights> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:rights> - <dc:publisher> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:publisher> - <dc:source>http://cornelius.gimp.cz</dc:source> - <dc:subject> - <rdf:Bag> - <rdf:li>gajim</rdf:li> - <rdf:li>jabber</rdf:li> - <rdf:li>im</rdf:li> - </rdf:Bag> - </dc:subject> - <cc:license - rdf:resource="http://creativecommons.org/licenses/by/2.5/" /> - </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/by/2.5/"> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Attribution" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> - </cc:License> - </rdf:RDF> - </metadata> - <g - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer"> - <path - sodipodi:type="arc" - style="opacity:0.2;color:black;fill:url(#radialGradient3127);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path3119" - sodipodi:cx="23.991123" - sodipodi:cy="44.514973" - sodipodi:rx="20.85965" - sodipodi:ry="3.4850264" - d="M 44.850773 44.514973 A 20.85965 3.4850264 0 1 1 3.1314735,44.514973 A 20.85965 3.4850264 0 1 1 44.850773 44.514973 z" - transform="matrix(0.91085,0,0,1.004296,2.147699,-1.206229)" /> - <path - style="color:black;fill:url(#radialGradient3117);fill-opacity:1;fill-rule:nonzero;stroke:#4e9a06;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 24,20.499994 C 14.340002,20.499994 5.4999997,25.614075 5.4999999,28.925145 C 5.4999999,30.465891 11.782985,29.583354 12,30.934936 L 13.5625,41.494104 C 13.5625,42.504255 14.094207,43.295374 14.78125,43.295373 C 21.043751,44.913368 27.194345,44.889639 33.1875,43.295373 C 33.874544,43.295373 34.437499,42.504254 34.4375,41.494104 L 36,30.934936 C 36.288444,29.796311 42.500001,30.465891 42.5,28.925145 C 42.5,25.614075 33.659998,20.499995 24,20.499994 z " - id="rect2193" - sodipodi:nodetypes="csccccccsc" /> - <path - style="opacity:0.13777777;fill:url(#linearGradient3116);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 12,30 C 13.08167,30.075016 15.108027,30.873469 16,30 C 14.14535,31.181252 15.126989,38.878321 14.214286,42.785714 C 13.476214,38.523473 12.935303,31.500991 12,30 z " - id="path2203" - sodipodi:nodetypes="cccc" /> - <path - sodipodi:nodetypes="cccc" - id="path3092" - d="M 36,30 C 34.91833,30.075016 32.891973,30.873469 32,30 C 33.85465,31.181252 32.873011,38.878321 33.785714,42.785714 C 34.523786,38.523473 35.064697,31.500991 36,30 z " - style="opacity:0.13777777;fill:url(#linearGradient3113);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - <path - sodipodi:nodetypes="csccccccsc" - id="path2200" - d="M 23.999995,21.49999 C 14.862161,21.49999 6.0918066,26.949836 6.7142842,28.642348 C 6.800192,28.875931 12.657647,28.921449 12.862932,30.227591 L 14.555257,40.464008 C 14.555257,41.440196 14.629652,42.490301 15.279557,42.4903 C 21.357468,43.860363 27.151674,43.812558 32.690871,42.4903 C 33.340778,42.4903 33.444732,41.725777 33.444733,40.74959 L 35.06563,30.298987 C 35.338482,29.198643 41.003251,29.437534 41.142848,28.356766 C 41.404744,26.32916 33.137829,21.499991 23.999995,21.49999 z " - style="opacity:1;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3115);stroke-width:1.00000072;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <path - sodipodi:type="arc" - style="opacity:1;color:black;fill:black;fill-opacity:0.05936076;fill-rule:nonzero;stroke:white;stroke-width:0.85616213;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.42352941;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path2201" - sodipodi:cx="23.763838" - sodipodi:cy="27.291872" - sodipodi:rx="6.7932758" - sodipodi:ry="2.3738585" - d="M 30.557114 27.291872 A 6.7932758 2.3738585 0 1 1 16.970562,27.291872 A 6.7932758 2.3738585 0 1 1 30.557114 27.291872 z" - transform="matrix(0.809624,0,0,1.685019,4.760218,-20.48733)" /> - <path - style="opacity:1;fill:url(#radialGradient3221);fill-opacity:1;stroke:#c4a000;stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - d="M 23.999992,6.5000004 C 19.305315,6.5000004 15.499995,10.309306 15.499995,15.002912 C 15.499995,18.002685 17.051927,20.642185 19.399704,22.156165 C 20.932368,23.904007 20.249846,23.332652 20.499996,25.475249 C 20.499996,26.043172 20.963518,26.506852 21.531241,26.506852 C 23.351222,27.903595 24.97351,27.756464 26.46874,26.506852 C 27.036466,26.506852 27.49999,26.043171 27.49999,25.475249 C 27.797743,23.377961 27.367148,23.644183 28.461241,22.243932 C 30.886588,20.745572 32.499989,18.061515 32.499989,15.002912 C 32.499989,10.309306 28.694668,6.5000004 23.999992,6.5000004 z " - id="path2159" - sodipodi:nodetypes="csccccccsc" /> - <path - sodipodi:type="arc" - style="opacity:1;color:black;fill:url(#linearGradient3118);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.90256411;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path3110" - sodipodi:cx="22.930462" - sodipodi:cy="12.594153" - sodipodi:rx="4.2426405" - sodipodi:ry="5.1012702" - d="M 27.173102 12.594153 A 4.2426405 5.1012702 0 1 1 18.687821,12.594153 A 4.2426405 5.1012702 0 1 1 27.173102 12.594153 z" - transform="matrix(0.457973,0,-0.285667,0.588089,13.52477,5.593519)" /> - <path - sodipodi:nodetypes="csccccccsc" - id="path3941" - d="M 23.999997,7.4999981 C 19.857634,7.4999981 16.499996,10.986206 16.499996,15.281708 C 16.499996,18.027046 17.996899,20.027021 20.316426,21.827723 C 21.668774,23.42732 21.170725,23.209015 21.272825,24.88285 C 21.272825,25.402601 21.44473,25.562227 21.945666,25.562227 C 23.349132,26.835691 24.788302,26.802766 26.136976,25.52071 C 26.637915,25.52071 26.684599,25.288011 26.684599,24.76826 C 26.859311,22.59978 26.956729,22.860474 27.922104,21.578992 C 30.062119,20.207721 31.499998,18.080886 31.499998,15.281708 C 31.499998,10.986205 28.142359,7.4999981 23.999997,7.4999981 z " - style="opacity:1;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3957);stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <path - style="opacity:1;color:black;fill:url(#linearGradient3229);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 20.009177,22.868465 C 20.323878,23.417025 20.327029,23.983054 20.498275,25.466383 C 20.498275,26.036889 20.95336,26.502322 21.517308,26.502322 C 23.325168,27.905415 24.945214,27.757616 26.430485,26.502322 C 26.994431,26.502322 27.520945,26.054745 27.520945,25.48424 C 27.715256,24.100125 27.791894,23.214268 27.996269,22.731736 L 26.609782,23.53829 L 21.374671,23.53829 L 20.009177,22.868465 z " - id="rect3216" - sodipodi:nodetypes="ccccccccc" /> - <path - sodipodi:nodetypes="ccccccc" - id="path3118" - d="M 21.46429,24.50002 L 21.517992,25.509807 L 22.01793,25.508992 C 23.834715,27.108201 24.948997,26.380367 26.017977,25.502471 L 26.406953,25.501837 L 26.535714,24.50002 L 21.46429,24.50002 z " - style="opacity:1;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3122);stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> +<?xml version="1.0" encoding="UTF-8"?> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128px" height="128px" viewBox="0 0 128 128" version="1.1"> +<defs> +<radialGradient id="radial0" gradientUnits="userSpaceOnUse" cx="16.488304" cy="23.537582" fx="16.488304" fy="23.537582" r="19" gradientTransform="matrix(5.830516,0,0,5.186123,-57.136612,106.88559)"> +<stop offset="0" style="stop-color:rgb(45.09804%,82.352942%,8.627451%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(30.588236%,60.392159%,2.352941%);stop-opacity:1;"/> +</radialGradient> +<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="128" height="128" style="fill:rgb(0%,0%,0%);fill-opacity:0.137778;stroke:none;"/> </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="surface511779" 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="128" height="128" 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="surface511782" 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> +<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="16" y1="2" x2="38.465416" y2="42.405006" gradientTransform="matrix(3.689005,0,0,3.693769,-24.666805,156.809784)"> +<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(100%,100%,100%);stop-opacity:0;"/> +</linearGradient> +<radialGradient id="radial1" gradientUnits="userSpaceOnUse" cx="21.142859" cy="22.17857" fx="21.142859" fy="22.17857" r="9" gradientTransform="matrix(2.931285,0,0,2.932291,-6.481694,134.102966)"> +<stop offset="0" style="stop-color:rgb(99.607843%,94.901961%,56.862748%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(92.941177%,83.137256%,0%);stop-opacity:1;"/> +</radialGradient> +<linearGradient id="linear3" gradientUnits="userSpaceOnUse" x1="24.260687" y1="2.533504" x2="24.832115" y2="22.012075" gradientTransform="matrix(1.342451,0,-0.837372,1.723858,33.163297,2.90654)"> +<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(100%,100%,100%);stop-opacity:0;"/> +</linearGradient> +<linearGradient id="linear4" gradientUnits="userSpaceOnUse" x1="16" y1="2" x2="32.927006" y2="31.587952" gradientTransform="matrix(2.912369,0,0,2.925584,-6.027668,173.323547)"> +<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(100%,100%,100%);stop-opacity:0;"/> +</linearGradient> +<linearGradient id="linear5" gradientUnits="userSpaceOnUse" x1="24.000008" y1="31.785711" x2="30.00001" y2="38.499996" gradientTransform="matrix(1.993,0,0,2.079344,16.040779,163.224747)"> +<stop offset="0" style="stop-color:rgb(44.705883%,62.352943%,81.176472%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(22.352941%,43.137255%,65.490198%);stop-opacity:1;"/> +</linearGradient> +<linearGradient id="linear6" gradientUnits="userSpaceOnUse" x1="17.725422" y1="3.860764" x2="27.055439" y2="24.431168" gradientTransform="matrix(2.912369,0,0,2.925584,-6.027668,173.323547)"> +<stop offset="0" style="stop-color:rgb(100%,100%,100%);stop-opacity:1;"/> +<stop offset="1" style="stop-color:rgb(100%,100%,100%);stop-opacity:0;"/> +</linearGradient> +</defs> +<g id="surface511761"> +<path style="fill-rule:nonzero;fill:url(#radial0);stroke-width:2.931288;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(30.588236%,60.392159%,2.352941%);stroke-opacity:1;stroke-miterlimit:4;" d="M 63.871094 218.601562 C 35.554688 218.601562 9.640625 233.59375 9.640625 243.296875 C 9.640625 247.816406 28.058594 245.226562 28.695312 249.191406 L 33.273438 280.140625 C 33.273438 283.101562 34.832031 285.421875 36.847656 285.421875 C 55.203125 290.164062 73.234375 290.09375 90.800781 285.421875 C 92.8125 285.421875 94.464844 283.101562 94.464844 280.140625 L 99.042969 249.191406 C 99.890625 245.851562 118.097656 247.816406 118.097656 243.296875 C 118.097656 233.59375 92.183594 218.601562 63.871094 218.601562 Z M 63.871094 218.601562 " transform="matrix(1,0,0,1,0,-172)"/> +<use xlink:href="#surface511779" transform="matrix(1,0,0,1,-8,-16)" mask="url(#mask0)"/> +<use xlink:href="#surface511782" transform="matrix(1,0,0,1,-8,-16)" mask="url(#mask1)"/> +<path style="fill:none;stroke-width:2.93129;stroke-linecap:butt;stroke-linejoin:miter;stroke:url(#linear2);stroke-miterlimit:4;" d="M 63.871094 221.53125 C 37.082031 221.53125 11.375 237.507812 13.199219 242.46875 C 13.453125 243.152344 30.621094 243.289062 31.222656 247.117188 L 36.183594 277.121094 C 36.183594 279.984375 36.402344 283.0625 38.308594 283.0625 C 56.125 287.078125 73.109375 286.9375 89.34375 283.0625 C 91.25 283.0625 91.554688 280.820312 91.554688 277.960938 L 96.304688 247.324219 C 97.105469 244.101562 113.710938 244.800781 114.121094 241.632812 C 114.886719 235.6875 90.65625 221.53125 63.871094 221.53125 Z M 63.871094 221.53125 " transform="matrix(1,0,0,1,0,-172)"/> +<path style="fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:0.0593608;stroke-width:2.931289;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:0.423529;stroke-miterlimit:4;" d="M 79.992188 233.257812 C 79.992188 239.734375 72.773438 244.984375 63.871094 244.984375 C 54.964844 244.984375 47.746094 239.734375 47.746094 233.257812 C 47.746094 226.78125 54.964844 221.53125 63.871094 221.53125 C 72.773438 221.53125 79.992188 226.78125 79.992188 233.257812 Z M 79.992188 233.257812 " transform="matrix(1,0,0,1,0,-172)"/> +<path style="fill-rule:nonzero;fill:url(#radial1);stroke-width:2.931289;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(76.862746%,62.7451%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 63.871094 177.5625 C 50.109375 177.5625 38.953125 188.730469 38.953125 202.488281 C 38.953125 211.28125 43.503906 219.019531 50.382812 223.457031 C 54.878906 228.578125 52.875 226.90625 53.609375 233.1875 C 53.609375 234.851562 54.96875 236.210938 56.632812 236.210938 C 61.96875 240.304688 66.722656 239.871094 71.105469 236.210938 C 72.769531 236.210938 74.128906 234.851562 74.128906 233.1875 C 75 227.039062 73.738281 227.816406 76.945312 223.714844 C 84.054688 219.320312 88.785156 211.453125 88.785156 202.488281 C 88.785156 188.730469 77.628906 177.5625 63.871094 177.5625 Z M 63.871094 177.5625 " transform="matrix(1,0,0,1,0,-172)"/> +<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear3);" d="M 59.097656 24.617188 C 56.738281 29.472656 52.273438 33.410156 49.128906 33.410156 C 45.984375 33.410156 45.34375 29.472656 47.703125 24.617188 C 50.0625 19.761719 54.527344 15.824219 57.671875 15.824219 C 60.816406 15.824219 61.453125 19.761719 59.097656 24.617188 Z M 59.097656 24.617188 "/> +<path style="fill:none;stroke-width:2.931289;stroke-linecap:butt;stroke-linejoin:miter;stroke:url(#linear4);stroke-miterlimit:4;" d="M 63.871094 180.496094 C 51.726562 180.496094 41.882812 190.714844 41.882812 203.304688 C 41.882812 211.351562 46.273438 217.214844 53.070312 222.492188 C 57.035156 227.183594 55.574219 226.542969 55.875 231.449219 C 55.875 232.972656 56.378906 233.441406 57.847656 233.441406 C 61.960938 237.171875 66.179688 237.078125 70.132812 233.320312 C 71.601562 233.320312 71.738281 232.636719 71.738281 231.113281 C 72.25 224.757812 72.535156 225.519531 75.367188 221.765625 C 81.640625 217.746094 85.855469 211.511719 85.855469 203.304688 C 85.855469 190.714844 76.011719 180.496094 63.871094 180.496094 Z M 63.871094 180.496094 " transform="matrix(1,0,0,1,0,-172)"/> +<path style="fill-rule:nonzero;fill:url(#linear5);stroke-width:2.931288;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(20.392157%,39.607844%,64.313728%);stroke-opacity:1;stroke-miterlimit:4;" d="M 52.171875 225.542969 C 53.09375 227.152344 53.101562 228.8125 53.605469 233.160156 C 53.605469 234.832031 54.9375 236.195312 56.589844 236.195312 C 61.890625 240.308594 66.640625 239.875 70.992188 236.195312 C 72.648438 236.195312 74.191406 234.882812 74.191406 233.210938 C 74.757812 229.15625 74.984375 226.558594 75.582031 225.144531 L 71.519531 227.507812 L 56.171875 227.507812 Z M 52.171875 225.542969 " transform="matrix(1,0,0,1,0,-172)"/> +<path style="fill:none;stroke-width:2.931289;stroke-linecap:butt;stroke-linejoin:miter;stroke:url(#linear6);stroke-miterlimit:4;" d="M 56.4375 230.328125 L 56.59375 233.285156 L 58.058594 233.285156 C 63.382812 237.972656 66.652344 235.839844 69.785156 233.265625 L 70.925781 233.265625 L 71.300781 230.328125 Z M 56.4375 230.328125 " transform="matrix(1,0,0,1,0,-172)"/> +</g> </svg> ===================================== gajim/data/icons/hicolor/symbolic/apps/org.gajim.Gajim-symbolic.svg ===================================== @@ -1,129 +1,44 @@ -<?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="16" - height="16" - id="svg4023" - sodipodi:version="0.32" - inkscape:version="0.92.2 5c3e80d, 2017-08-06" - sodipodi:docname="org.gajim.Gajim-symbolic.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/cornelius/gajim.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - version="1.1" - viewBox="-0.7 0.2 16 16"> - <defs - id="defs4025" /> - <sodipodi:namedview - id="base" - pagecolor="#555753" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="1" - inkscape:pageshadow="2" - inkscape:zoom="14" - inkscape:cx="-12.741964" - inkscape:cy="-2.4941427" - inkscape:current-layer="layer1" - showgrid="false" - inkscape:grid-bbox="true" - inkscape:document-units="px" - inkscape:window-width="1920" - inkscape:window-height="1016" - inkscape:window-x="0" - inkscape:window-y="27" - inkscape:window-maximized="1" - showguides="true" - fit-margin-top="0" - fit-margin-left="0" - fit-margin-right="0" - fit-margin-bottom="0" - showborder="true" - borderlayer="true" - viewbox-x="-0.7" - viewbox-y="0.2"> - <inkscape:grid - type="xygrid" - id="grid68" - originx="-4.9243182" - originy="-2.7517627" /> - </sodipodi:namedview> - <metadata - id="metadata4028"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - <dc:date /> - <dc:creator> - <cc:Agent> - <dc:title>Josef Vybíral</dc:title> - </cc:Agent> - </dc:creator> - <dc:rights> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:rights> - <dc:publisher> - <cc:Agent> - <dc:title /> - </cc:Agent> - </dc:publisher> - <dc:source /> - <dc:subject> - <rdf:Bag> - <rdf:li>gajim</rdf:li> - <rdf:li>jabber</rdf:li> - <rdf:li>im</rdf:li> - </rdf:Bag> - </dc:subject> - <cc:license - rdf:resource="http://creativecommons.org/licenses/by/2.5/" /> - </cc:Work> - <cc:License - rdf:about="http://creativecommons.org/licenses/by/2.5/"> - <cc:permits - rdf:resource="http://web.resource.org/cc/Reproduction" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/Distribution" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Notice" /> - <cc:requires - rdf:resource="http://web.resource.org/cc/Attribution" /> - <cc:permits - rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> - </cc:License> - </rdf:RDF> - </metadata> - <g - id="layer1" - inkscape:label="Layer 1" - inkscape:groupmode="layer" - transform="translate(-4.9243182,-29.248236)"> - <path - sodipodi:nodetypes="csccccccsc" - id="path2200" - d="m 12.431363,35.902348 c -3.596104,0 -7.047591,2.144734 -6.802621,2.810805 0.03381,0.09192 2.338952,0.109837 2.419739,0.623857 l 0.665998,4.02844 c 0,0.384169 0.02928,0.797428 0.285041,0.797428 2.391902,0.539175 4.672155,0.520362 6.852052,0 0.255764,0 0.296674,-0.300871 0.296675,-0.68504 l 0.637887,-4.112731 c 0.107379,-0.43303 2.336693,-0.339017 2.39163,-0.764343 0.103066,-0.797944 -3.150297,-2.698416 -6.746401,-2.698416 z" - 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" - inkscape:connector-curvature="0" /> - <path - sodipodi:nodetypes="csccccccsc" - id="path3941" - d="m 12.431363,30.392789 c -1.630186,0 -2.951551,1.371963 -2.951551,3.062415 0,1.080401 0.589091,1.867472 1.501919,2.57612 0.532203,0.629506 0.3362,0.543594 0.376381,1.202316 0,0.204542 0.06765,0.267362 0.26479,0.267362 0.55232,0.501159 1.118692,0.488201 1.649449,-0.01634 0.197139,0 0.215511,-0.09158 0.215511,-0.296119 0.06876,-0.853384 0.107094,-0.75079 0.487008,-1.255105 0.842182,-0.53965 1.408045,-1.376645 1.408045,-2.478234 0,-1.690453 -1.321366,-3.062416 -2.951552,-3.062415 z" - 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" - inkscape:connector-curvature="0" /> +<?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;"/> </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> ===================================== setup.py ===================================== @@ -192,10 +192,6 @@ class update_po(Command): # only install subdirectories of data data_files_app_icon = [ - ("share/icons/hicolor/64x64/apps", - ["gajim/data/icons/hicolor/64x64/apps/org.gajim.Gajim.png"]), - ("share/icons/hicolor/128x128/apps", - ["gajim/data/icons/hicolor/128x128/apps/org.gajim.Gajim.png"]), ("share/icons/hicolor/scalable/apps", ["gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim.svg"]), ("share/icons/hicolor/symbolic/apps", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d6596632557ebeffe525a64b91959d5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d6596632557ebeffe525a64b91959d5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Dispatcher: Add logging when running timeout check
by Philipp Hörist 07 Apr '20

07 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 89bbf64c by lovetox at 2020-04-07T22:39:08+02:00 Dispatcher: Add logging when running timeout check - - - - - 7ba2e6af by lovetox at 2020-04-07T22:39:39+02:00 TCP: Check write queue after sending keepalive - - - - - 2 changed files: - nbxmpp/dispatcher.py - nbxmpp/tcp.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -468,6 +468,7 @@ class StanzaDispatcher(Observable): self._id_callbacks[id_] = (func, timeout, user_data) def _timeout_check(self): + self._log.info('Run timeout check') timeouts = {} for id_, data in self._id_callbacks.items(): if data[1] is not None: ===================================== nbxmpp/tcp.py ===================================== @@ -285,6 +285,8 @@ class TCPConnection(Connection): data = data.decode() if data == ' ': # keepalive whitespace + if self._write_queue: + self._write_stanzas() return for stanza in self._write_stanza_buffer: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/03915f1efe9bb11623530cc… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/03915f1efe9bb11623530cc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] SM: Correctly set delay from attribute
by Philipp Hörist 06 Apr '20

06 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 03915f1e by lovetox at 2020-04-06T23:04:49+02:00 SM: Correctly set delay from attribute - - - - - 1 changed file: - nbxmpp/smacks.py Changes: ===================================== nbxmpp/smacks.py ===================================== @@ -132,7 +132,7 @@ class Smacks: attrs = {'stamp': timestamp} if stanza.getType() != 'groupchat': # Dont leak our JID to Groupchats - attrs['from'] = stanza.getAttr('from') + attrs['from'] = str(self._client.get_bound_jid()) stanza.addChild('delay', namespace=NS_DELAY2, attrs=attrs) self._uqueue.append(stanza) self._log.debug('OUT, %s', stanza.getName()) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/03915f1efe9bb11623530cc7… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/03915f1efe9bb11623530cc7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Be more strict with websocket uri detection
by Philipp Hörist 06 Apr '20

06 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d6596632 by lovetox at 2020-04-06T19:13:13+02:00 Be more strict with websocket uri detection - - - - - 2 changed files: - gajim/common/helpers.py - gajim/gtk/account_wizard.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1754,7 +1754,7 @@ def get_custom_host(account): type_ = app.config.get_per('accounts', account, 'custom_type') protocol = ConnectionProtocol.TCP - if host.startswith('ws'): + if host.startswith('ws://') or host.startswith('wss://'): protocol = ConnectionProtocol.WEBSOCKET return ('%s:%s' % (host, port), ===================================== gajim/gtk/account_wizard.py ===================================== @@ -699,7 +699,7 @@ class AdvancedSettings(Page): con_type = self._ui.con_type_combo.get_active_text() protocol = ConnectionProtocol.TCP - if host.startswith('ws'): + if host.startswith('ws://') or host.startswith('wss://'): protocol = ConnectionProtocol.WEBSOCKET return ('%s:%s' % (host, port), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d6596632557ebeffe525a64b91959d53… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d6596632557ebeffe525a64b91959d53… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Allow websocket for custom host
by Philipp Hörist 06 Apr '20

06 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: a61573d5 by lovetox at 2020-04-06T19:09:26+02:00 Allow websocket for custom host - - - - - 2 changed files: - gajim/common/helpers.py - gajim/gtk/account_wizard.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1748,12 +1748,17 @@ def convert_gio_to_openssl_cert(cert): def get_custom_host(account): if not app.config.get_per('accounts', account, 'use_custom_host'): - return + return None host = app.config.get_per('accounts', account, 'custom_host') port = app.config.get_per('accounts', account, 'custom_port') type_ = app.config.get_per('accounts', account, 'custom_type') + + protocol = ConnectionProtocol.TCP + if host.startswith('ws'): + protocol = ConnectionProtocol.WEBSOCKET + return ('%s:%s' % (host, port), - ConnectionProtocol.TCP, + protocol, ConnectionType(type_)) ===================================== gajim/gtk/account_wizard.py ===================================== @@ -698,8 +698,12 @@ class AdvancedSettings(Page): con_type = self._ui.con_type_combo.get_active_text() + protocol = ConnectionProtocol.TCP + if host.startswith('ws'): + protocol = ConnectionProtocol.WEBSOCKET + return ('%s:%s' % (host, port), - ConnectionProtocol.TCP, + protocol, ConnectionType(con_type)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a61573d529483490543a3066cb3f5ba8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a61573d529483490543a3066cb3f5ba8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Jingle: Fix invalid IQ error type
by Philipp Hörist 06 Apr '20

06 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6b44e6d6 by lovetox at 2020-04-06T06:59:56+02:00 Jingle: Fix invalid IQ error type - - - - - 1 changed file: - gajim/common/jingle_session.py Changes: ===================================== gajim/common/jingle_session.py ===================================== @@ -588,7 +588,7 @@ class JingleSession: creator = content['creator'] if (creator, name) not in self.contents: text = 'Content %s (created by %s) does not exist' % (name, creator) - self.__send_error(stanza, 'bad-request', text=text, type_='_modify') + self.__send_error(stanza, 'bad-request', text=text, type_='modify') raise nbxmpp.NodeProcessed cn = self.contents[(creator, name)] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6b44e6d6c833c810fbe1aca084b4888a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6b44e6d6c833c810fbe1aca084b4888a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Client: Allow websocket URIs when using set_custom_host()
by Philipp Hörist 05 Apr '20

05 Apr '20

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: f3df66ee by lovetox at 2020-04-05T22:57:32+02:00 Client: Allow websocket URIs when using set_custom_host() - - - - - 2 changed files: - nbxmpp/addresses.py - nbxmpp/client.py Changes: ===================================== nbxmpp/addresses.py ===================================== @@ -142,14 +142,18 @@ class ServerAddresses(Observable): if address is None: return - host, protocol, type_ = address + host_or_uri, protocol, type_ = address + if protocol == ConnectionProtocol.WEBSOCKET: + host, uri = None, host_or_uri + else: + host, uri = host_or_uri, None self._fallback_addresses = [] self._addresses = [ ServerAddress(domain=self._domain, service=None, host=host, - uri=None, + uri=uri, protocol=protocol, type=type_, proxy=None)] ===================================== nbxmpp/client.py ===================================== @@ -171,10 +171,10 @@ class Client(Observable): def custom_host(self): return self._custom_host - def set_custom_host(self, host, protocol, type_): + def set_custom_host(self, host_or_uri, protocol, type_): if self._domain is None: raise ValueError('Call set_domain() first before set_custom_host()') - self._custom_host = (host, protocol, type_) + self._custom_host = (host_or_uri, protocol, type_) def set_accepted_certificates(self, certificates): self._accepted_certificates = certificates View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/f3df66ee57b632f9526604ab… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/f3df66ee57b632f9526604ab… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Presence: Fix attribute name
by Philipp Hörist 05 Apr '20

05 Apr '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: b6979f13 by lovetox at 2020-04-05T17:41:48+02:00 Presence: Fix attribute name - - - - - b9b7f4fb by lovetox at 2020-04-05T19:07:37+02:00 HTTPUpload: Respect cert store - - - - - 6 changed files: - gajim/common/cert_store.py - gajim/common/client.py - gajim/common/config.py - gajim/common/helpers.py - gajim/common/modules/httpupload.py - gajim/common/modules/presence.py Changes: ===================================== gajim/common/cert_store.py ===================================== @@ -69,6 +69,17 @@ class CertificateStore: self._on_certificate_write_finished, path) + def verify(self, certificate, tls_errors): + if Gio.TlsCertificateFlags.UNKNOWN_CA in tls_errors: + for trusted_certificate in self._certs: + if trusted_certificate.is_same(certificate): + tls_errors.remove(Gio.TlsCertificateFlags.UNKNOWN_CA) + break + + if not tls_errors: + return True + return False + @staticmethod def _on_certificate_write_finished(data, error, path): if data is None: ===================================== gajim/common/client.py ===================================== @@ -21,7 +21,6 @@ from nbxmpp.const import StreamError from nbxmpp.const import ConnectionType from gi.repository import GLib -from gi.repository import Gio from gajim.common import passwords from gajim.common.nec import NetworkEvent @@ -36,6 +35,7 @@ from gajim.common.helpers import get_custom_host from gajim.common.helpers import get_user_proxy from gajim.common.helpers import warn_about_plain_connection from gajim.common.helpers import get_resource +from gajim.common.helpers import get_ignored_ssl_errors from gajim.common.i18n import _ from gajim.common.connection_handlers import ConnectionHandlers @@ -140,7 +140,8 @@ class Client(ConnectionHandlers): self._client.set_accepted_certificates( app.cert_store.get_certificates()) - self._client.set_ignored_tls_errors(self._get_ignored_ssl_errors()) + self._client.set_ignored_tls_errors( + get_ignored_ssl_errors(self._account)) if app.config.get_per('accounts', self._account, 'use_plain_connection'): @@ -161,11 +162,6 @@ class Client(ConnectionHandlers): self._register_new_handlers() - def _get_ignored_ssl_errors(self): - ignore_ssl_errors = app.config.get_per( - 'accounts', self.name, 'ignore_ssl_errors').split() - return {Gio.TlsCertificateFlags(int(err)) for err in ignore_ssl_errors} - def process_ssl_errors(self): if not self._ssl_errors: self.connect(ignore_all_errors=True) ===================================== gajim/common/config.py ===================================== @@ -346,7 +346,6 @@ class Config: 'ft_send_local_ips': [opt_bool, True, _('If enabled, Gajim will send your local IP so your contact can connect to your machine for file transfers.')], 'opened_chat_controls': [opt_str, '', _('List of XMPP Addresses (space separated) for which the chat window will be re-opened on next startup.')], 'recent_groupchats': [opt_str, ''], - 'httpupload_verify': [opt_bool, True, _('HTTP File Upload: Enable HTTPS Verification.')], 'filetransfer_preference' : [opt_str, 'httpupload', _('Preferred file transfer mechanism for file drag&drop on a chat window. Can be \'httpupload\' (default) or \'jingle\'.')], 'allow_posh': [opt_bool, True, _('Allow certificate verification with POSH.')], }, {}), ===================================== gajim/common/helpers.py ===================================== @@ -1764,3 +1764,9 @@ def warn_about_plain_connection(account, connection_types): if type_.is_plain and warn: return True return False + + +def get_ignored_ssl_errors(account): + ignore_ssl_errors = app.config.get_per( + 'accounts', account, 'ignore_ssl_errors').split() + return {Gio.TlsCertificateFlags(int(err)) for err in ignore_ssl_errors} ===================================== gajim/common/modules/httpupload.py ===================================== @@ -22,6 +22,7 @@ import mimetypes from nbxmpp import NS_HTTPUPLOAD_0 from nbxmpp.util import is_error_result +from nbxmpp.util import convert_tls_error_flags from gi.repository import GLib from gi.repository import Soup @@ -218,23 +219,21 @@ class HTTPUpload(BaseModule): self._session.queue_message(message, self._on_finish, transfer) def _check_certificate(self, message): - https_used, _tls_certificate, tls_errors = message.get_https_status() + https_used, tls_certificate, tls_errors = message.get_https_status() if not https_used: self._log.warning('HTTPS was not used for upload') self._session.cancel_message(message, Soup.Status.CANCELLED) return - if not app.config.get_per('accounts', - self._account, - 'httpupload_verify'): + tls_errors = convert_tls_error_flags(tls_errors) + if app.cert_store.verify(tls_certificate, tls_errors): return - if tls_errors: - phrase = get_tls_error_phrase(tls_errors) + for error in tls_errors: + phrase = get_tls_error_phrase(error) self._log.warning('TLS verification failed: %s', phrase) - self._session.cancel_message(message, Soup.Status.CANCELLED) - self._raise_information_event('httpupload-error', phrase) - return + self._session.cancel_message(message, Soup.Status.CANCELLED) + self._raise_information_event('httpupload-error', phrase) def _on_finish(self, _session, message, transfer): self._queued_messages.pop(id(transfer), None) ===================================== gajim/common/modules/presence.py ===================================== @@ -334,7 +334,7 @@ class Presence(BaseModule): self._log.info('Request Subscription to %s', jid) if auto_auth: - self.jids_for_auto_auth.add(jid) + self._jids_for_auto_auth.add(jid) infos = {'jid': jid} if name: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8a60259ab793f75a37fb100d2737883… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8a60259ab793f75a37fb100d2737883… 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