The branch, release/4.0.0.x has been updated via 1771a0cc49e5ec461c70611d7af94e0e8dda9632 (commit) via d424aa74e7b36f35f3971f10eed887ccb3b9a6a1 (commit) via 38be735fcf09b07127e3a803154f462422076fd3 (commit) via f3926671465a1449908d4b7cb79ce4c0eec64680 (commit) from 2647cbe5a04b3589e875404cb2de198dab7a55dc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1771a0cc49e5ec461c70611d7af94e0e8dda9632 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Wed Jan 30 15:32:00 2013 +0100 Fix X2Go Logo Conflicts (resolved by Mike Gabriel): debian/changelog commit d424aa74e7b36f35f3971f10eed887ccb3b9a6a1 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Wed Jan 30 14:22:29 2013 +0100 Set autologin as false by default. Quote session ID in SSH broker code commit 38be735fcf09b07127e3a803154f462422076fd3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jan 18 20:58:14 2013 +0100 More icon updates needed. Discovered during Debian package update. Conflicts (resolved by Mike Gabriel): debian/changelog commit f3926671465a1449908d4b7cb79ce4c0eec64680 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Wed Jan 16 14:10:44 2013 +0100 fixed support for RSA Keys in X2Go Broker code Conflicts (resolved by Mike Gabriel) debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 16 ++ httpbrokerclient.cpp | 13 +- icons/128x128/x2go.png | Bin 6210 -> 6085 bytes icons/128x128/x2gomailclient.png | Bin 3502 -> 19158 bytes icons/128x128/x2gosession.png | Bin 8786 -> 9324 bytes icons/16x16/x2go.png | Bin 518 -> 854 bytes icons/x2goclient.xpm | 319 ++++++++++++++++++++---- onmainwindow.cpp | 3 + svg/x2gologo.svg | 513 ++++++++++++++++---------------------- 9 files changed, 513 insertions(+), 351 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 2ee9910..7199196 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +x2goclient (4.0.0.2-0~x2go1) UNRELEASED; urgency=low + + [ Mike Gabriel ] + * New upstream version (4.0.0.2): + - More icon updates needed. Discovered during Debian package update. + + [ Oleksandr Shneyder ] + * New upstream version (4.0.0.2): + - Fix support for RSA Keys in X2Go Broker code. + - Set autologin as false by default. Quote session ID in SSH broker code + - support for session key "usebrokerpassforproxy" - use broker pass for + authentication on proxy + - Fix X2Go Logo. + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 30 Dec 2012 15:41:04 +0100 + x2goclient (4.0.0.1-0~x2go1) unstable; urgency=low * Bugfix release (4.0.0.1): diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp index f473a96..3093a48 100644 --- a/httpbrokerclient.cpp +++ b/httpbrokerclient.cpp @@ -250,7 +250,7 @@ void HttpBrokerClient::getUserSessions() void HttpBrokerClient::selectUserSession(const QString& session) { - QString brokerUser=config->brokerUser; + QString brokerUser=config->brokerUser; if(mainWindow->getUsePGPCard()) brokerUser=mainWindow->getCardLogin(); @@ -270,7 +270,7 @@ void HttpBrokerClient::selectUserSession(const QString& session) } else { - sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+config->brokerUserId+ " --task selectsession --sid "+session, + sshConnection->executeCommand ( config->sshBrokerBin+" --user "+ brokerUser +" --authid "+config->brokerUserId+ " --task selectsession --sid \\\""+session+"\\\"", this,SLOT ( slotSelectSession(bool,QString,int))); } @@ -279,7 +279,7 @@ void HttpBrokerClient::selectUserSession(const QString& session) void HttpBrokerClient::changePassword(QString newPass) { newBrokerPass=newPass; - QString brokerUser=config->brokerUser; + QString brokerUser=config->brokerUser; if(mainWindow->getUsePGPCard()) brokerUser=mainWindow->getCardLogin(); @@ -460,8 +460,15 @@ void HttpBrokerClient::parseSession(QString sinfo) x2goDebug<<"starting parser\n"; QStringList lst=sinfo.split("SERVER:",QString::SkipEmptyParts); int keyStartPos=sinfo.indexOf("-----BEGIN DSA PRIVATE KEY-----"); + if(keyStartPos==-1) + keyStartPos=sinfo.indexOf("-----BEGIN RSA PRIVATE KEY-----"); QString endStr="-----END DSA PRIVATE KEY-----"; int keyEndPos=sinfo.indexOf(endStr); + if(keyEndPos==-1) + { + endStr="-----END RSA PRIVATE KEY-----"; + keyEndPos=sinfo.indexOf(endStr); + } if (! (keyEndPos == -1 || keyStartPos == -1 || lst.size()==0)) config->key=sinfo.mid(keyStartPos, keyEndPos+endStr.length()-keyStartPos); QString serverLine=(lst[1].split("\n"))[0]; diff --git a/icons/128x128/x2go.png b/icons/128x128/x2go.png index 43e5f87..adc77f7 100644 Binary files a/icons/128x128/x2go.png and b/icons/128x128/x2go.png differ diff --git a/icons/128x128/x2gomailclient.png b/icons/128x128/x2gomailclient.png index 6bf39cd..55cd35f 100644 Binary files a/icons/128x128/x2gomailclient.png and b/icons/128x128/x2gomailclient.png differ diff --git a/icons/128x128/x2gosession.png b/icons/128x128/x2gosession.png index fdb4956..bf22738 100644 Binary files a/icons/128x128/x2gosession.png and b/icons/128x128/x2gosession.png differ diff --git a/icons/16x16/x2go.png b/icons/16x16/x2go.png index f014e76..3b5aad9 100644 Binary files a/icons/16x16/x2go.png and b/icons/16x16/x2go.png differ diff --git a/icons/x2goclient.xpm b/icons/x2goclient.xpm index 74d2262..3530d4d 100644 --- a/icons/x2goclient.xpm +++ b/icons/x2goclient.xpm @@ -1,47 +1,280 @@ /* XPM */ -static char *x_goclient_new[] = { +static char *x_goclient[] = { /* columns rows colors chars-per-pixel */ -"32 32 9 1", -" c #1C3C1C3C1C3C", -". c #1F5F1F5F1F5F", -"X c #228222822282", -"o c #25A625A625A6", -"O c #28C928C928C9", -"+ c #2BEC2BEC2BEC", -"@ c #2F0F2F0F2F0F", -"# c #323232323232", -"$ c None", +"32 32 242 2", +" c #353B54", +". c #3B3E52", +"X c #343D5A", +"o c #383F5A", +"O c #3D454F", +"+ c #3E4155", +"@ c #3A425E", +"# c #374263", +"$ c #3E4562", +"% c #33426E", +"& c #3C466C", +"* c #3E496E", +"= c #2F4575", +"- c #2F487C", +"; c #314373", +": c #3C4A73", +"> c #33467A", +", c #374B7C", +"< c #3F547F", +"1 c #42434F", +"2 c #4D4D4D", +"3 c #444553", +"4 c #464851", +"5 c #434559", +"6 c #47495B", +"7 c #404561", +"8 c #444A65", +"9 c #494D63", +"0 c #434C6B", +"q c #494F6D", +"w c #4C5165", +"e c #47516E", +"r c #4B546D", +"t c #545564", +"y c #555C65", +"u c #54556A", +"i c #555A6E", +"p c #5D5E6A", +"a c #444F76", +"s c #484F70", +"d c #4C5471", +"f c #4D5872", +"g c #46537B", +"h c #525672", +"j c #545B72", +"k c #5B5F73", +"l c #555E7B", +"z c #595E7B", +"x c #5E656D", +"c c #5D6074", +"v c #57627F", +"b c #5D637A", +"n c #636474", +"m c #656B73", +"M c #6A6F76", +"N c #62667C", +"B c #66697C", +"V c #6A6C7C", +"C c #6D727A", +"Z c #777777", +"A c #72757E", +"S c #73787F", +"D c #797979", +"F c #334E85", +"G c #3C5183", +"H c #37548C", +"J c #3C5489", +"K c #3D5A93", +"L c #345A9D", +"P c #415587", +"I c #455887", +"U c #4E5D85", +"Y c #455B8A", +"T c #4A5E8B", +"R c #475F95", +"E c #485E91", +"W c #4F628E", +"Q c #516186", +"! c #5A6482", +"~ c #53648C", +"^ c #596789", +"/ c #5B6A8C", +"( c #476196", +") c #496093", +"_ c #466199", +"` c #4B659C", +"' c #4F689E", +"] c #526491", +"[ c #546993", +"{ c #596992", +"} c #536C9E", +"| c #5E6F99", +" . c #5F7194", +".. c #646A83", +"X. c #696D82", +"o. c #626B8A", +"O. c #6F7287", +"+. c #6B718C", +"@. c #6D788F", +"#. c #747583", +"$. c #767A83", +"%. c #797D85", +"&. c #75778C", +"*. c #747A8D", +"=. c #7C7E8E", +"-. c #616D92", +";. c #667394", +":. c #6A7696", +">. c #6D7891", +",. c #6A7A9C", +"<. c #717792", +"1. c #7A7F96", +"2. c #787F9A", +"3. c #4F6DA4", +"4. c #546DA1", +"5. c #5770A0", +"6. c #5C74A3", +"7. c #5774A9", +"8. c #5C7AAE", +"9. c #4372BF", +"0. c #647BA7", +"q. c #6E7DA2", +"w. c #627EAF", +"e. c #4976C0", +"r. c #487CCD", +"t. c #7E828A", +"y. c #7E8293", +"u. c #7C829A", +"i. c #7284A3", +"p. c #7C86A1", +"a. c #7184AB", +"s. c #7887AA", +"d. c #7A8DAC", +"f. c #6683B3", +"g. c #6C89BB", +"h. c #728AB7", +"j. c #7E8FB1", +"k. c #4580D8", +"l. c #4C85DB", +"z. c #7492C2", +"x. c #7F9BC7", +"c. c #7393C9", +"v. c #6693D7", +"b. c #759EDD", +"n. c #78A0DE", +"m. c #518BE2", +"M. c #69A1F2", +"N. c #78ABF6", +"B. c #83848D", +"V. c #84898F", +"C. c #838591", +"Z. c #858990", +"A. c #898D93", +"S. c #86899D", +"D. c #8D8D9B", +"F. c #8F909C", +"G. c #93939E", +"H. c #868FA2", +"J. c #8C92A2", +"K. c #9296A5", +"L. c #9C9CA2", +"P. c #9D9DAB", +"I. c #8193B4", +"U. c #8A95B2", +"Y. c #8194B9", +"T. c #939CB0", +"R. c #9EA0A4", +"E. c #9FA0AC", +"W. c #8EA1BF", +"Q. c #A4A4A5", +"!. c #A2A4AD", +"~. c #ACACAC", +"^. c #A9ACB0", +"/. c #A3AABF", +"(. c #ADB0B5", +"). c #B3B3B4", +"_. c #B1B3B9", +"`. c #BBBBBD", +"'. c #879DC5", +"]. c #859FCB", +"[. c #8EA2C7", +"{. c #94A5C2", +"}. c #95A9CB", +"|. c #87A5D2", +" X c #88A6D3", +".X c #8FABD9", +"XX c #94ADD3", +"oX c #93AFDE", +"OX c #ABB7CE", +"+X c #ACB8CF", +"@X c #B1B8C4", +"#X c #BBBEC4", +"$X c #B7BECA", +"%X c #A4B6D2", +"&X c #A7B9D4", +"*X c #8BAEE3", +"=X c #9BB7E0", +"-X c #9BB8E1", +";X c #85B7FF", +":X c #8FBDFF", +">X c #91BEFE", +",X c #BBC1CD", +"<X c #97C1FF", +"1X c #9CC4FF", +"2X c #AAC0E0", +"3X c #AEC7EC", +"4X c #B6C7E4", +"5X c #BACCE5", +"6X c #A0C7FF", +"7X c #A6CAFF", +"8X c #ACCEFF", +"9X c #AFD0FF", +"0X c #B2D2FF", +"qX c #BAD6FF", +"wX c #BED8FF", +"eX c #C1C1C3", +"rX c #C6C6C8", +"tX c #CACACB", +"yX c #D9D9D9", +"uX c #CBD4E1", +"iX c #CAD7EA", +"pX c #CBD8EB", +"aX c #D0DCEE", +"sX c #C0D5F3", +"dX c #C4DCFE", +"fX c #C9DFFF", +"gX c #CDE1FF", +"hX c #D5E1F3", +"jX c #DAE4F2", +"kX c #D3E5FE", +"lX c #DBE7FA", +"zX c #DBEAFF", +"xX c #EAEAEC", +"cX c #E7EDF7", +"vX c #EFEFF0", +"bX c #E3EEFE", +"nX c #E7F1FF", +"mX c #EBF3FF", +"MX c #F1F7FF", +"NX c #F5F9FE", +"BX c #FEFEFE", +"VX c None", /* pixels */ -"$o$$$$$$$$$$$$$$$$$$$$$$$$$$$$o$", -"o$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$o", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", -"$$$$$$$$$$$$$$ @###@$$$$$ ##@$$$", -"$$$$$$$$$$$$$$$$@##$$$$$$$O@$$$$", -"$$$$$$$$$$$$$$$$$## $$$$$$#$$$$$", -"$$$$$$$$$$$$$$$$$@#@$$$$$$o$$$$$", -"$$$$$$$$$$$$$$ o$ ##$$$$$#$$$$$$", -"$$$$$$$$$$$$$$$$$$##@$$$ o$$$$$$", -"$$$$$$$$$$$$$$$$$$X##$$$#$$$$$$$", -"$$$$$$$$$$$$$$Xo#$$##o$ o$$$$$$$", -"$$$$$$$$$$$$$$$$$$$@##$#$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$###o$$$$$$$$", -"$$$$$$$$$$$$$$ o@#o$@##$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$##$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$##@$$$$$$$$", -"$$$$$$$$$$$$$$$@###$X###$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$#$##@$$$$$$$", -"$$$$$$$$$$$$$$$$$$$ $o##$$$$$$$", -"$$$$$$$$$$$$$$$O#$$#$$$##o$$$$$$", -"$$$$$$$$$$$$$$$$$$ X$$$@##$$$$$$", -"$$$$$$$$$$$$$$$$$$#$$$$$## $$$$$", -"$$$$$$$$$$$$$$$X$X $$$$$###$$$$$", -"$$$$$$$$$$$$$$$$$#$$$$$$$##$$$$$", -"$$$$$$$$$$$$$$$$oX$$$$$$$##@$$$$", -"$$$$$$$$$$$$$$$$#$$$$$$$$o## $$$", -"$$$$$$$$$$$$$$ @#O$$$$$$ #### $$", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", -"X$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$o", -"$X$$$$$$$$$$$$$$$$$$$$$$$$$$$$o$" +"VXVXx m m m M M C C C A C S S S %.%.%.%.%.t.t.t.B.t.V.V.V.t.VXVX", +"VXM ~.BXBXBXBXBXBXBXBXBXBXNXNXNXNXNXNXBXBXBXBXBXBXBXBXBXBX(.R.VX", +"x _.BXBXBXBXBXBXBXBXNXNXmXmXmXnXnXnXmXMXMXBXBXBXBXBXBXBXBXBX(.B.", +"x BXBXBXBXBXBXBXNXMXmXbXlXzXzXzXzXzXzXbXnXmXMXNXBXBXBXBXBXBXBXA.", +"x BXeXL.V.A n n k p n n n 5X#.B.Z.D.G.G.B.zXbXnXC._.`.#XeXF.BXA.", +"x BXeXL.Z.#.V B N N ......}.}.+.Q.Q.~.y.dXgXzXlXnXS.yXrX_.BXBXA.", +"x BXBXBXBXvXjXuX5X&X{.I.i.:.;.oX=.Q.~.u.qXdXfXkXzXJ.yXP.BXBXBXA.", +"x BXeXL.C.V c i i j k b ..X.O.o.h.Q.~.G.8X0XqXfXkXE.!.NXBXBXBXA.", +"x BXtXL.t.X.c i i l c b ....O.*.g.1.~.).i.7X0XqXU.tX{.MXBXBXBXZ.", +"x BXBXMXnXkXwX3X-X Xh.f.6.[ ~ Q | 6.~.).S.1X7X0XE.K.lXbXMXBXBXD.", +"x BX#XK.y.! c l l l ! ! ! o.o.+.o.M.J.)._.z.1Xs.tX{.gXzXnXNXBXA.", +"x BX#XJ.*.b f r r r i v b ..#.=.C.{ -.).).1.>XE.J.qXfXlXnXNXBXA.", +"x BXcXpX5X2XXXx.g.8.7.3.` ( E T Q ~ m.Q.).).;.#X|.0XdXgXbXMXBXA.", +"x NX,XT.p.>./ / { ~ ] ~ ) ] { { | +.e.:.`.`.`.S.1X9XwXgXzXnXNXA.", +"x NX@XJ.>.! f w e r r f c N V #.C.D.&.r._.`.eXc.1X8XqXgXlXmXNXA.", +"y NXuX+X{.Y.a.f.6.} ' ` ` R ( ) ] { { e.y.`.eX,.1X8XqXfXzXmXNX%.", +"O NXuX&X{.j.i.f.6.4.` ` R R E E W ^ / 3.I Z Z k 1X8XqXfXzXnXNXO ", +"O NX,XH.>.v r * $ # X X . + 1 + r.+ 4 2 2 0.8XwXfXzXnXNXO ", +"O NX,XE.p.;.^ Q T I P G F > > = ; % L H 4 : 2 2 7 8XdXfXzXmXBXO ", +"O NXnXaX5X2XXXx.g.8.4._ K H F - = = l.+ & N.3 2 2 '.dXgXbXmXBXO ", +"O BX`.J.*.b r $ $ @ o @ o o + . + , J 4 v.;Xg 2 2 q fXkXbXNXBX1 ", +"O BX,XF.*.b j f e 0 * & & & & & # M.3 : ;X>X*X4 2 4 4XzXnXNXBXO ", +"O BXBXMXnXgXsX3X-X|.z.f.} T P : 3.I 4 b.>X1X7Xs 2 2 l bXMXBXBXO ", +"O BXrXR.y.X.k w 0 8 8 $ $ $ 7 @ b.5 a <X1X7X0X[.2 2 3 cXBXBXBXO ", +"O BXeXG.V.V i w 9 9 7 5 7 7 7 [ U 4 *X7X8X0XwXfX9 2 2 &.BXBXBXO ", +"O BXBXBXBXvXjXiX4X%XW.d.,./ ..X4 0 9X0XqXwXgXkX<.2 2 4 xXBXBX1 ", +"O BXeXR.V.#.N c j h h d d j.XX8 2 d qXdXfXgXkXzXK.2 2 2 u xXBXO ", +"O BXeXG.B.M p t 9 6 5 3 5 4X3 3 3 3 + kXkXzXbXu 3 3 5 5 5 3 BXO ", +"O BXBXBXBXBXBXBXBXmXnXbXhXzXzXzXzXzXzXbXbXnXMXBXBXBXBXBXBXBXBXO ", +"O _.BXBXBXBXBXBXBXBXBXMXmXmXnXnXbXnXmXmXMXBXBXBXBXBXBXBXBXBXQ.O ", +"VX4 ).BXBXBXBXBXBXBXBXBXBXBXNXNXNXNXNXBXBXBXBXBXBXBXBXBXBX(.4 VX", +"VXVXO O O O O O O O O O O O O O 1 O O O O O O O O O O O O O VXVX" }; diff --git a/onmainwindow.cpp b/onmainwindow.cpp index db72c4a..d6fece0 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -103,6 +103,9 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) appSeparator=0; config.brokerNoAuth=false; + config.brokerAutologin=false; + cmdAutologin=false; + #ifdef Q_OS_WIN diff --git a/svg/x2gologo.svg b/svg/x2gologo.svg index c88606a..7cc8da5 100644 --- a/svg/x2gologo.svg +++ b/svg/x2gologo.svg @@ -1,106 +1,35 @@ <?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://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: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" - id="svg2" - sodipodi:version="0.32" - inkscape:version="0.48.3.1 r9886" + version="1.0" width="128" height="128" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.46" sodipodi:docname="x2go-logo.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - version="1.0" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:output_extension="org.inkscape.output.svg.inkscape"> <metadata - id="metadata87"> + id="metadata45"> <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>x2go Logo</dc:title> - <dc:date>12.06.2007</dc:date> - <dc:creator> - <cc:Agent> - <dc:title>Heinz-M. Graesing</dc:title> - </cc:Agent> - </dc:creator> - <dc:rights> - <cc:Agent> - <dc:title>obviously-nice</dc:title> - </cc:Agent> - </dc:rights> - <dc:publisher> - <cc:Agent> - <dc:title>obviously-nice</dc:title> - </cc:Agent> - </dc:publisher> - <dc:source>http://www.x2go.org/artwork</dc:source> - <dc:language>DE</dc:language> - <dc:subject> - <rdf:Bag> - <rdf:li>Logo</rdf:li> - </rdf:Bag> - </dc:subject> - <cc:license - rdf:resource="http://www.gnu.org/licenses/gpl-2.0.txt" /> </cc:Work> </rdf:RDF> </metadata> - <defs - id="defs85"> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 64 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="128 : 64 : 1" - inkscape:persp3d-origin="64 : 42.666667 : 1" - id="perspective46" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4472" - id="radialGradient4478" - cx="44.602337" - cy="44.941875" - fx="44.602337" - fy="44.941875" - r="35.79092" - gradientTransform="matrix(1,0,0,1.15885,67.847226,-18.98329)" - gradientUnits="userSpaceOnUse" /> - <linearGradient - id="linearGradient4472"> - <stop - style="stop-color: rgb(23, 118, 255); stop-opacity: 1;" - offset="0" - id="stop4474" /> - <stop - id="stop4564" - offset="1" - style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" /> - </linearGradient> - <radialGradient - r="35.79092" - fy="44.941875" - fx="44.602337" - cy="44.941875" - cx="44.602337" - gradientTransform="matrix(1.5430561,0,0,1.7881705,-4.7786,-14.363356)" - gradientUnits="userSpaceOnUse" - id="radialGradient3195" - xlink:href="#linearGradient4472" - inkscape:collect="always" /> - </defs> <sodipodi:namedview - inkscape:window-height="1056" - inkscape:window-width="1855" + inkscape:window-height="713" + inkscape:window-width="1280" inkscape:pageshadow="2" inkscape:pageopacity="0.0" guidetolerance="10.0" @@ -110,232 +39,206 @@ bordercolor="#666666" pagecolor="#ffffff" id="base" - showgrid="true" - inkscape:object-nodes="true" - inkscape:grid-points="true" - inkscape:guide-points="true" - width="128px" - height="128px" - inkscape:zoom="3.82" + showgrid="false" + inkscape:zoom="3.890625" inkscape:cx="64" - inkscape:cy="64" - inkscape:window-x="65" - inkscape:window-y="24" - inkscape:current-layer="svg2" - inkscape:window-maximized="1"> - <inkscape:grid - id="GridFromPre046Settings" - type="xygrid" - originx="0px" - originy="0px" - spacingx="1px" - spacingy="1px" - color="#0000ff" - empcolor="#0000ff" - opacity="0.2" - empopacity="0.4" - empspacing="5" - visible="true" - enabled="true" - snapvisiblegridlinesonly="true" - dotted="true" /> - </sodipodi:namedview> - <path - style="fill:#ffffff;fill-opacity:1;stroke:none" - d="m 9.9375,2.03125 c -4.3962933,0 -8,3.5724569 -8,7.96875 l 0,108.0625 c 0,4.39629 3.6037067,8 8,8 l 108.0625,0 c 4.3963,0 7.96875,-3.60371 7.96875,-8 l 0,-108.0625 c 0,-4.3962931 -3.57245,-7.96875 -7.96875,-7.96875 z" - id="rect3043" - inkscape:connector-curvature="0" - sodipodi:nodetypes="sssssssss" /> - <path - sodipodi:nodetypes="cssccssccccssccssc" - inkscape:connector-curvature="0" - id="path3045" - d="M 9.0087977,0 C 4.0359413,0 0,4.0359413 0,9.0087977 L 0,118.9912 C 0,123.96406 4.0359413,128 9.0087977,128 L 118.9912,128 C 123.96406,128 128,123.96406 128,118.9912 L 128,9.0087977 C 128,4.0359413 123.96406,0 118.9912,0 82.330401,0 45.669599,0 9.0087977,0 z m 0.9384164,2.0332356 c 36.0143369,0 72.0286739,0 108.0430059,0 4.3963,0 7.97654,3.5802463 7.97654,7.9765394 l 0,108.043015 c 0,4.39629 -3.58024,8.00782 -7.97654,8.00782 l -108.0430059,0 c -4.3962933,0 -8.0078202,-3.61153 -8.0078202,-8.00782 l 0,-108.043015 c 0,-4.3962931 3.6115269,-7.9765394 8.0078202,-7.9765394 z" - style="fill:#4d4d4d" /> - <g - style="fill:#4d4d4d" - id="g4" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 90,977.626 13.32,-25.776 c 0.936,-2.52 1.368,-4.32 1.368,-5.256 0,-1.512 -0.504,-2.664 -1.44,-3.312 -1.008,-0.72 -2.736,-1.08 -5.184,-1.08 l 0,-2.376 22.104,0 0,2.376 c -3.024,0 -5.184,0.648 -6.696,1.944 -1.512,1.296 -3.6,4.752 -6.48,10.368 l -14.616,28.44 18.432,41.544 c 1.872,3.888 3.528,6.624 4.968,8.136 1.44,1.44 3.168,2.232 5.112,2.232 l 0,2.304 -26.352,0 0,-2.304 c 2.376,0 4.032,-0.288 5.04,-0.936 1.008,-0.576 1.512,-1.584 1.512,-2.88 0,-1.224 -0.72,-3.384 -2.016,-6.552 l -12.96,-29.016 -14.832,29.016 c -1.368,2.448 -2.088,4.464 -2.088,5.976 0,2.952 2.16,4.392 6.48,4.392 l 0,2.304 -19.944,0 0,-2.304 c 1.944,0 3.672,-0.648 5.112,-1.872 1.44,-1.224 2.952,-3.312 4.392,-6.408 L 83.736,990.01 67.248,952.498 c -1.728,-4.032 -3.312,-6.696 -4.824,-8.136 -1.584,-1.44 -3.816,-2.16 -6.696,-2.16 l 0,-2.376 28.296,0 0,2.376 c -4.392,0 -6.624,1.512 -6.624,4.536 0,1.512 0.432,3.24 1.296,5.112 L 90,977.626 z" - id="path6" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g8" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,940.474 43.992,-1.224 0,2.448 -43.992,-1.224 z" - id="path10" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g12" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,946.45 43.992,-1.152 0,1.656 5.184,0.072 0.36,0 0.288,0 0.288,0.072 0.288,0 0.288,0.072 0.216,0.072 0.216,0.072 0.216,0.072 0.144,0.072 0.144,0.072 0.144,0.072 0.144,0.072 0.072,0.072 0.144,0.072 0,0.072 0.072,0 -52.2,-1.44 z" - id="path14" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g16" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,952.498 54.288,-1.512 0.216,0.36 0.288,0.576 0.288,0.576 0.288,0.648 0.288,0.648 0.144,0.216 -55.8,-1.512 z" - id="path18" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g20" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,958.474 56.952,-1.584 1.44,3.168 -58.392,-1.584 z" - id="path22" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g24" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,964.45 59.544,-1.584 1.44,3.24 -60.984,-1.656 z" - id="path26" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g28" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,970.498 62.136,-1.728 1.512,3.456 -63.648,-1.728 z" - id="path30" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g32" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,976.474 64.728,-1.8 1.584,3.6 -66.312,-1.8 z" - id="path34" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g36" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,982.45 67.32,-1.8 1.656,3.672 -68.976,-1.872 z" - id="path38" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g40" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,988.426 69.912,-1.872 1.512,3.312 -0.216,0.504 -71.208,-1.944 z" - id="path42" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g44" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,994.402 70.128,-1.944 -1.944,3.816 -68.184,-1.872 z" - id="path46" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g48" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,1000.378 67.032,-1.8 -1.8,3.6 -65.232,-1.8 z" - id="path50" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g52" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,1006.354 63.936,-1.728 -1.728,3.456 -62.208,-1.728 z" - id="path54" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g56" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,1012.402 60.912,-1.656 -1.728,3.24 -59.184,-1.584 z" - id="path58" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g60" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,1036.378 43.992,-1.224 0,2.448 -43.992,-1.224 z" - id="path62" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g64" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,1030.402 51.12,-1.44 -0.072,0.144 -0.144,0.072 -0.144,0.144 -0.144,0.072 -0.072,0.144 -0.144,0.072 -0.072,0.072 -0.144,0 -0.144,0.072 -0.072,0.072 -0.144,0.072 -0.072,0 -0.144,0.072 -0.144,0 -0.072,0 -0.144,0.072 -0.144,0 -0.144,0 -4.968,0.072 0,1.44 -43.992,-1.152 z" - id="path66" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> - <g - style="fill:#4d4d4d" - id="g68" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,1024.354 54.792,-1.44 -0.792,1.584 -0.288,0.504 -0.216,0.504 -0.216,0.36 -53.28,-1.512 z" - id="path70" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> - </g> + inkscape:cy="55.972543" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:current-layer="svg2" /> + <defs + id="defs85"> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 64 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="128 : 64 : 1" + inkscape:persp3d-origin="64 : 42.666667 : 1" + id="perspective47" /> + </defs> <g - style="fill:#4d4d4d" - id="g72" - transform="matrix(1.0009775,0,0,1.0009775,0,-925.3907)"> - <path - d="m 6.984,1018.378 57.816,-1.584 -1.512,3.096 -56.304,-1.512 z" - id="path74" - style="fill:#4d4d4d" - inkscape:connector-curvature="0" /> + id="g2420" + transform="matrix(0.8602352,0,0,0.8602352,9.0000023,8.8898921)" + style="fill:#ffffff"> + <g + style="fill:#ffffff" + id="g4" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path6" + d="M 90,977.626 L 103.32,951.85 C 104.256,949.33 104.688,947.53 104.688,946.594 C 104.688,945.082 104.184,943.93 103.248,943.282 C 102.24,942.562 100.512,942.202 98.064,942.202 L 98.064,939.826 L 120.168,939.826 L 120.168,942.202 C 117.144,942.202 114.984,942.85 113.472,944.146 C 111.96,945.442 109.872,948.898 106.992,954.514 L 92.376,982.954 L 110.808,1024.498 C 112.68,1028.386 114.336,1031.122 115.776,1032.634 C 117.216,1034.074 118.944,1034.866 120.888,1034.866 L 120.888,1037.17 L 94.536,1037.17 L 94.536,1034.866 C 96.912,1034.866 98.568,1034.578 99.576,1033.93 C 100.584,1033.354 101.088,1032.346 101.088,1031.05 C 101.088,1029.826 100.368,1027.666 99.072,1024.498 L 86.112,995.482 L 71.28,1024.498 C 69.912,1026.946 69.192,1028.962 69.192,1030.474 C 69.192,1033.426 71.352,1034.866 75.672,1034.866 L 75.672,1037.17 L 55.728,1037.17 L 55.728,1034.866 C 57.672,1034.866 59.4,1034.218 60.84,1032.994 C 62.28,1031.77 63.792,1029.682 65.232,1026.586 L 83.736,990.01 L 67.248 ,952.498 C 65.52,948.466 63.936,945.802 62.424,944.362 C 60.84,942.922 58.608,942.202 55.728,942.202 L 55.728,939.826 L 84.024,939.826 L 84.024,942.202 C 79.632,942.202 77.4,943.714 77.4,946.738 C 77.4,948.25 77.832,949.978 78.696,951.85 L 90,977.626 z" /> + </g> + <g + style="fill:#ffffff" + id="g8" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path10" + d="M 6.984,940.474 L 50.976,939.25 L 50.976,941.698 L 6.984,940.474 z" /> + </g> + <g + style="fill:#ffffff" + id="g12" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path14" + d="M 6.984,946.45 L 50.976,945.298 L 50.976,946.954 L 56.16,947.026 L 56.52,947.026 L 56.808,947.026 L 57.096,947.098 L 57.384,947.098 L 57.672,947.17 L 57.888,947.242 L 58.104,947.314 L 58.32,947.386 L 58.464,947.458 L 58.608,947.53 L 58.752,947.602 L 58.896,947.674 L 58.968,947.746 L 59.112,947.818 L 59.112,947.89 L 59.184,947.89 L 6.984,946.45 z" /> + </g> + <g + style="fill:#ffffff" + id="g16" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path18" + d="M 6.984,952.498 L 61.272,950.986 L 61.488,951.346 L 61.776,951.922 L 62.064,952.498 L 62.352,953.146 L 62.64,953.794 L 62.784,954.01 L 6.984,952.498 z" /> + </g> + <g + style="fill:#ffffff" + id="g20" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path22" + d="M 6.984,958.474 L 63.936,956.89 L 65.376,960.058 L 6.984,958.474 z" /> + </g> + <g + style="fill:#ffffff" + id="g24" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path26" + d="M 6.984,964.45 L 66.528,962.866 L 67.968,966.106 L 6.984,964.45 z" /> + </g> + <g + style="fill:#ffffff" + id="g28" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path30" + d="M 6.984,970.498 L 69.12,968.77 L 70.632,972.226 L 6.984,970.498 z" /> + </g> + <g + style="fill:#ffffff" + id="g32" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path34" + d="M 6.984,976.474 L 71.712,974.674 L 73.296,978.274 L 6.984,976.474 z" /> + </g> + <g + style="fill:#ffffff" + id="g36" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path38" + d="M 6.984,982.45 L 74.304,980.65 L 75.96,984.322 L 6.984,982.45 z" /> + </g> + <g + style="fill:#ffffff" + id="g40" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path42" + d="M 6.984,988.426 L 76.896,986.554 L 78.408,989.866 L 78.192,990.37 L 6.984,988.426 z" /> + </g> + <g + style="fill:#ffffff" + id="g44" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path46" + d="M 6.984,994.402 L 77.112,992.458 L 75.168,996.274 L 6.984,994.402 z" /> + </g> + <g + style="fill:#ffffff" + id="g48" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path50" + d="M 6.984,1000.378 L 74.016,998.578 L 72.216,1002.178 L 6.984,1000.378 z" /> + </g> + <g + style="fill:#ffffff" + id="g52" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path54" + d="M 6.984,1006.354 L 70.92,1004.626 L 69.192,1008.082 L 6.984,1006.354 z" /> + </g> + <g + style="fill:#ffffff" + id="g56" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path58" + d="M 6.984,1012.402 L 67.896,1010.746 L 66.168,1013.986 L 6.984,1012.402 z" /> + </g> + <g + style="fill:#ffffff" + id="g60" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path62" + d="M 6.984,1036.378 L 50.976,1035.154 L 50.976,1037.602 L 6.984,1036.378 z" /> + </g> + <g + style="fill:#ffffff" + id="g64" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path66" + d="M 6.984,1030.402 L 58.104,1028.962 L 58.032,1029.106 L 57.888,1029.178 L 57.744,1029.322 L 57.6,1029.394 L 57.528,1029.538 L 57.384,1029.61 L 57.312,1029.682 L 57.168,1029.682 L 57.024,1029.754 L 56.952,1029.826 L 56.808,1029.898 L 56.736,1029.898 L 56.592,1029.97 L 56.448,1029.97 L 56.376,1029.97 L 56.232,1030.042 L 56.088,1030.042 L 55.944,1030.042 L 50.976,1030.114 L 50.976,1031.554 L 6.984,1030.402 z" /> + </g> + <g + style="fill:#ffffff" + id="g68" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path70" + d="M 6.984,1024.354 L 61.776,1022.914 L 60.984,1024.498 L 60.696,1025.002 L 60.48,1025.506 L 60.264,1025.866 L 6.984,1024.354 z" /> + </g> + <g + style="fill:#ffffff" + id="g72" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path74" + d="M 6.984,1018.378 L 64.8,1016.794 L 63.288,1019.89 L 6.984,1018.378 z" /> + </g> + <g + style="fill:#ffffff" + id="g76" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path78" + d="M 63.936,924.49 L 118.872,924.49 C 123.84,924.49 127.872,928.522 127.872,933.49 L 127.872,1043.362 C 127.872,1048.33 123.84,1052.362 118.872,1052.362 L 63.936,1052.362 L 63.936,1050.418 L 117.864,1050.418 C 122.256,1050.418 125.856,1046.818 125.856,1042.426 L 125.856,934.498 C 125.856,930.106 122.256,926.506 117.864,926.506 L 63.936,926.506 L 63.936,924.49 z" /> + </g> + <g + style="fill:#ffffff" + id="g80" + transform="translate(0,-924.362)"> + <path + style="fill:#ffffff" + id="path82" + d="M 9,924.49 L 63.936,924.49 L 63.936,926.506 L 9.936,926.506 C 5.544,926.506 1.944,930.106 1.944,934.498 L 1.944,1042.426 C 1.944,1046.818 5.544,1050.418 9.936,1050.418 L 63.936,1050.418 L 63.936,1052.362 L 9,1052.362 C 4.032,1052.362 0,1048.33 0,1043.362 L 0,933.49 C 0,928.522 4.032,924.49 9,924.49 z" /> + </g> </g> - <path - style="fill:#4d4d4d" - d="M 9.0087977,0 C 4.0359413,0 0,4.0359413 0,9.0087977 L 0,118.9912 C 0,123.96406 4.0359413,128 9.0087977,128 L 118.9912,128 C 123.96406,128 128,123.96406 128,118.9912 L 128,9.0087977 C 128,4.0359413 123.96406,0 118.9912,0 82.330401,0 45.669599,0 9.0087977,0 z m 0.9384164,2.0332356 c 36.0143369,0 72.0286739,0 108.0430059,0 4.3963,0 7.97654,3.5802463 7.97654,7.9765394 l 0,108.043015 c 0,4.39629 -3.58024,8.00782 -7.97654,8.00782 l -108.0430059,0 c -4.3962933,0 -8.0078202,-3.61153 -8.0078202,-8.00782 l 0,-108.043015 c 0,-4.3962931 3.6115269,-7.9765394 8.0078202,-7.9765394 z" - id="path78" - inkscape:connector-curvature="0" - sodipodi:nodetypes="cssccssccccssccssc" /> </svg> hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).
-
git-admin＠x2go.org