changeset 693e4cdeb587 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=693e4cdeb587
description: Merge changes from default branch to osx_newbuildsys branch.
diffstat:
data/pixmaps/Makefile | 2 +-
data/pixmaps/gajim.svg | 444
++++++++++++++++++++++++++++++++++++++++
src/common/connection.py | 19 +
src/common/connection_handlers.py | 37 +-
src/common/socks5.py | 1 +
src/roster_window.py | 27 ++-
6 files changed, 509 insertions(+), 21 deletions(-)
diffs (truncated from 681 to 300 lines):
diff -r 4b15efdffcb1 -r 693e4cdeb587 data/pixmaps/Makefile
--- a/data/pixmaps/Makefile Thu Jul 02 12:50:26 2009 +0200
+++ b/data/pixmaps/Makefile Tue Jul 07 22:48:02 2009 +0200
@@ -1,7 +1,7 @@
include ../../buildsys.mk
install-extra:
- for i in *.bmp *.icns *.ico *.png agents/*.png dock_icns/*.icns
events/*.png; do \
+ for i in *.bmp *.icns *.ico *.png *.svg agents/*.png dock_icns/*.icns
events/*.png; do \
${INSTALL_STATUS}; \
if ${MKDIR_P}
${DESTDIR}${datadir}/${PACKAGE}/pixmaps/$$(dirname $$i) && ${INSTALL} -m 644
$$i ${DESTDIR}${datadir}/${PACKAGE}/pixmaps/$$i; then \
${INSTALL_OK}; \
diff -r 4b15efdffcb1 -r 693e4cdeb587 data/pixmaps/gajim.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/data/pixmaps/gajim.svg Tue Jul 07 22:48:02 2009 +0200
@@ -0,0 +1,444 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<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"
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
