x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

x2gothinclient.git - master (branch) updated: 1.0.1.6-7-g2ab0aba
by git-admin＠x2go.org 09 Mar '12

09 Mar '12

The branch, master has been updated via 2ab0aba225b7687322ed54f217c868fd0b8618ad (commit) via 6fc7bd3886f07d5ff98db48f723579b610cd81db (commit) from 31124b868c8d293a65000ba66f475dedff9d7473 (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 2ab0aba225b7687322ed54f217c868fd0b8618ad Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Mar 9 17:17:37 2012 +0100 Drop outdated README.howto and point to Wiki page with TCE documentation. commit 6fc7bd3886f07d5ff98db48f723579b610cd81db Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Mar 9 16:46:18 2012 +0100 Fix typo in copyright file. ----------------------------------------------------------------------- Summary of changes: README.howto | 120 ++---------------------------------------------------- debian/changelog | 4 +- debian/copyright | 6 +- 3 files changed, 10 insertions(+), 120 deletions(-) The diff of changes is: diff --git a/README.howto b/README.howto index 66c1de7..ed9eac0 100644 --- a/README.howto +++ b/README.howto @@ -1,120 +1,8 @@ X2go Thin Client Environment ============================ -This howto is intended for Debian squeeze (and newer Debian versions) +A detailled installation description is available in the X2Go Wiki: +http://wiki.x2go.org/doku.php/wiki:components:tce -Server Installation -------------------- -(use a separate server or VM for providing thin -client chroots, do not use your production Samba, LDAP, Apache2 etc. server -for this!!!) - - $ apt-get install dhcp atftpd nfs-kernel-server debootstrap - - -Installation Thin Client Environment (TCE) - -Choose folder for your TCE chroot (e.g. /opt/x2gothinclient) - -Install TCE: - - <TODO: REVIEW/FIXME (use aptitude instead of apt-get)> - $ debootstrap --arch i386 lenny /opt/x2gothinclient http://ftp.de.debian.org/debian/ - $ cp /etc/resolv.conf /opt/x2gothinclient/etc/ - $ echo "auto lo - $ iface lo inet loopback" >> /opt/x2gothinclient/etc/network/interfaces - $ echo x2gothinclient > /opt/x2gothinclient/etc/hostname - $ echo "127.0.0.1 localhost" >> /opt/x2gothinclient/etc/hosts - -Repeat these steps for any of your X2Go servers: - - <TODO: REVIEW/FIXME (use aptitude instead of apt-get)> - $ echo "192.168.0.1 x2goserver" >> /opt/x2gothinclient/etc/hosts - $ chroot /opt/x2gothinclient/ - $ echo "deb http://x2go.obviously-nice.de/deb/ lenny main" >> /etc/apt/sources.list - $ apt-get update - $ apt-get install locales - $ dpkg-reconfigure locales - -Edit /etc/initramfs-tools/initramfs.conf to boot from NFS: - - <TODO: REVIEW/FIXME (use aptitude instead of apt-get)> - $ apt-get install kernel-image-2.6-686 syslinux - $ apt-get install x2gothinclientsystem - $ cd /usr/share/x2gothinclientsystem/script/ - $ ./x2gothinclient_install.sh - -After a successful TCE configuration you now can leave the chroot environment: - - $ exit - -Server Configuration: ---------------------- - -atftpd: (e.g. /etc/default/atftpd) - ------------------------- -USE_INETD=false -OPTIONS="--daemon --port 69 --tftpd-timeout 300 --retry-timeout 5 --mcast-port 1758 --mcast-addr 239.239.239.0-255 --mcast-ttl 1 --maxthread 100 --verbose=5 /tftpboot" ------------------------- -USE_INETD=false - -If inetd is not used for aftpd then you can start/stop aftpd with "/etc/init.d/atftpd start|stop". - -NOTE! If you intend running aftpd in standalone mode make sure that no other tftpd server is active in inetd/xinetd -configuration. - -The last argv in OPTIONS (s. above) declares the folder for tftp boot. The default is "/tftpboot". - - $ mkdir /tftpboot - -PXE boot configuration: - - $ cp /opt/x2gothinclient/boot/vmlinuz-* /tftpboot/ - $ cp /opt/x2gothinclient/boot/initrd.img-* /tftpboot/ - $ ln -s /tftpboot/vmlinuz-* /tftpboot/vmlinuz - $ ln -s /tftpboot/initrd.img-* /tftpboot/initrd.img - $ cp /opt/x2gothinclient/usr/lib/syslinux/pxelinux.0 /tftpboot/ - -Example: /tftpboot/pxelinux.cfg/default - ---------------------- -label linux -kernel vmlinuz -append root=/dev/nfs nfsroot=192.168.0.1:/opt/x2gothinclient ro initrd=initrd.img ip=dhcp --------------------- - -The given ip address 192.168.0.1 refers to the address of the host that your TCE chroot is installed on. - -DHCP: - -<TODO/FIXME (update for DHCP3 server + translate into English)> -Bestimmen Sie in Datei "/etc/default/dhcp" auf welche Interfaces soll dhcpd laufen. -Beispiel /etc/dhcpd.conf: --------------------- -group -{ - subnet 192.168.0.0 netmask 255.255.255.0 { - default-lease-time 720000; - max-lease-time 1440000; - authoritative; - range 192.168.0.10 192.168.0.100; - filename "/pxelinux.0"; - next-server 192.168.0.1; - } -} --------------------- - -NFS (/etc/exports): --------------------- -/opt/x2gothinclient 192.168.0.0/24(ro,async,no_root_squash) --------------------- - -X2go Server in LDAP -------------------- - -Do not forget to store you X2Go servers in LDAP. Use - - $ ldap.addserver <name> <ip> - -to add an X2Go server to the LDAP tree. +light+love, +Mike Gabriel \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 5d29077..1be7f38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2gothinclient (1.0.1.7-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * Fix typo in copyright file. + * Drop outdated README.howto and point to Wiki page with + TCE documentation. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 08 Mar 2012 13:11:29 +0100 diff --git a/debian/copyright b/debian/copyright index 1c53057..e0c31aa 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ on Thu, 10 Dec 2007 18:20:03 +0100. In 2011 this package has been updated and heavily reworked by Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> -Mike Gariel <mike.gabriel(a)das-netzwerkteam.de> +Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Upstream Authors: Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> @@ -35,13 +35,13 @@ Copyright (C) 2010-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> -Mike Gariel <mike.gabriel(a)das-netzwerkteam.de> +Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> The Debian packaging is (C) 2007-2012, Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> Moritz 'Morty' Struebe <Moritz.Struebe(a)informatik.uni-erlangen.de> -Mike Gariel <mike.gabriel(a)das-netzwerkteam.de> +Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> and is licensed under the GPL, see above. hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) 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 "x2gothinclient.git" (X2Go Thin Client Environment).

1 0

x2goclient.git - master (branch) updated: 3.99.1.1-10-g342bb69
by git-admin＠x2go.org 09 Mar '12

09 Mar '12

The branch, master has been updated via 342bb695167c1808bbf969e56a3d23c136df70cb (commit) from 0aa476e1f80f8dfb19843a3257f641a36fce9800 (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 342bb695167c1808bbf969e56a3d23c136df70cb Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Fri Mar 9 15:50:39 2012 +0100 Replace text on some buttons with icons and SVG icons for published applications. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++ icons/32x32/apps.png | Bin 0 -> 1664 bytes icons/32x32/open_dir.png | Bin 0 -> 476 bytes icons/32x32/stop_session.png | Bin 0 -> 1093 bytes icons/32x32/suspend_session.png | Bin 0 -> 229 bytes onmainwindow.h | 9 +++-- onmainwindow_part2.cpp | 3 +- onmainwindow_part3.cpp | 22 +++++++++++-- onmainwindow_part4.cpp | 63 ++++++++++++++++++++------------------ onmainwindow_privat.h | 2 + resources.rcc | 4 ++ 11 files changed, 67 insertions(+), 39 deletions(-) create mode 100644 icons/32x32/apps.png create mode 100644 icons/32x32/open_dir.png create mode 100644 icons/32x32/stop_session.png create mode 100644 icons/32x32/suspend_session.png The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 221a553..f69b2bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ x2goclient (3.99.2.0-0~x2go1) UNRELEASED; urgency=low session config. - Fixed bug "light font colour on light background" by dark colour schema. - Make X2Go system tray icon not transparent. + - Replace text on buttons "Application", "Share folder", "Suspend", + "Terminate" with icons to fit in dialog window. + - Support for SVG icons for published applications -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Mar 2012 21:02:15 +0100 diff --git a/icons/32x32/apps.png b/icons/32x32/apps.png new file mode 100644 index 0000000..6281943 Binary files /dev/null and b/icons/32x32/apps.png differ diff --git a/icons/32x32/open_dir.png b/icons/32x32/open_dir.png new file mode 100644 index 0000000..8222226 Binary files /dev/null and b/icons/32x32/open_dir.png differ diff --git a/icons/32x32/stop_session.png b/icons/32x32/stop_session.png new file mode 100644 index 0000000..e96e746 Binary files /dev/null and b/icons/32x32/stop_session.png differ diff --git a/icons/32x32/suspend_session.png b/icons/32x32/suspend_session.png new file mode 100644 index 0000000..50bcb55 Binary files /dev/null and b/icons/32x32/suspend_session.png differ diff --git a/onmainwindow.h b/onmainwindow.h index 39cdd47..b7c398b 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -55,6 +55,7 @@ #if defined(CFGPLUGIN) && defined(Q_OS_LINUX) class QX11EmbedContainer; #endif +class QToolButton; class QTemporaryFile; class QLineEdit; class QFrame; @@ -544,7 +545,6 @@ private: QList<Application> applications; QPushButton* bSusp; - QPushButton* sbExp; QPushButton* bTerm; QPushButton* bNew; QPushButton* bShadow; @@ -584,9 +584,10 @@ private: QString readExportsFrom; QString readLoginsFrom; QPushButton* sOk; - QPushButton* sbSusp; - QPushButton* sbTerm; - QPushButton* sbApps; + QToolButton* sbSusp; + QToolButton* sbExp; + QToolButton* sbTerm; + QToolButton* sbApps; QCheckBox* sbAdv; QPushButton* sCancel; QString resolution; diff --git a/onmainwindow_part2.cpp b/onmainwindow_part2.cpp index 803f00c..f71648f 100644 --- a/onmainwindow_part2.cpp +++ b/onmainwindow_part2.cpp @@ -20,6 +20,7 @@ #include "onmainwindow_privat.h" + void ONMainWindow::slotSshConnectionOk() { x2goDebug<<"ssh connection ok"<<endl; @@ -2257,7 +2258,7 @@ void ONMainWindow::slotProxyStderr() exportTimer->start ( 2000 ); } } - sbSusp->setText ( tr ( "Suspend" ) ); + sbSusp->setToolTip ( tr ( "Suspend" ) ); if ( newSession ) { runCommand(); diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp index e4ceb6d..bac846f 100644 --- a/onmainwindow_part3.cpp +++ b/onmainwindow_part3.cpp @@ -331,14 +331,28 @@ void ONMainWindow::slotReadApplications(bool result, QString output, } if (line.indexOf("<icon>")!=-1) { + bool isSvg=false; line=lines[++i]; - QString pic; + QByteArray pic; while (line.indexOf("</icon>")==-1) { - pic+=line; + pic+=QByteArray::fromBase64(line.toAscii()); line=lines[++i]; + if (QString(QByteArray::fromBase64(line.toAscii())).indexOf("</svg>",Qt::CaseInsensitive)!=-1) + { + isSvg=true; + } + } + if (!isSvg) + app.icon.loadFromData(pic); + else + { + QPixmap pix(32,32); + QSvgRenderer svgRenderer( pic ); + QPainter pixPainter(&pix); + svgRenderer.render(&pixPainter); + app.icon=pix; } - app.icon.loadFromData(QByteArray::fromBase64(pic.toAscii())); } } if (app.name.length()>0) @@ -891,7 +905,7 @@ void ONMainWindow::showHelp() "\t\t\t\t comma separated\n" "--kbd-type=<typed>\t\t set default keyboard type\n" "--home=<dir>\t\t\t set users home directory\n" - "--set-kbd=<0|1>\t\t\t overwrite current keyboard settings\n" + "--set-kbd=<0|1>\t\t\t overwrite current keyboard settings\n" "--session-conf=<file>\t\t\t path to alternative session config\n"; qCritical ( "%s",helpMsg.toLocal8Bit().data() ); QMessageBox::information ( this,tr ( "Options" ),helpMsg ); diff --git a/onmainwindow_part4.cpp b/onmainwindow_part4.cpp index 65dd520..cdb5ac8 100644 --- a/onmainwindow_part4.cpp +++ b/onmainwindow_part4.cpp @@ -1858,12 +1858,27 @@ void ONMainWindow::initStatusDlg() slVal->hide(); slVal->setFixedHeight ( slName->sizeHint().height() ); - sbApps=new QPushButton ( tr ( "Applications..." ), - sessionStatusDlg ); - sbExp=new QPushButton ( tr ( "Share folder..." ), - sessionStatusDlg ); - sbSusp=new QPushButton ( tr ( "Abort" ),sessionStatusDlg ); - sbTerm=new QPushButton ( tr ( "Terminate" ),sessionStatusDlg ); + + sbApps=new QToolButton (sessionStatusDlg ); + sbApps->setToolTip(tr ( "Applications..." )); + sbApps->setIcon(QPixmap(":/icons/32x32/apps.png")); + sbApps->setAutoRaise(true); + + sbExp=new QToolButton (sessionStatusDlg ); + sbExp->setIcon(QPixmap(":/icons/32x32/open_dir.png")); + sbExp->setToolTip (tr ("Share folder..." )); + sbExp->setAutoRaise(true); + + sbSusp=new QToolButton (sessionStatusDlg ); + sbSusp->setIcon(QPixmap(":/icons/32x32/suspend_session.png")); + sbSusp->setToolTip(tr ( "Abort" )); + sbSusp->setAutoRaise(true); + + sbTerm=new QToolButton (sessionStatusDlg ); + sbTerm->setIcon(QPixmap(":/icons/32x32/stop_session.png")); + sbTerm->setToolTip(tr ( "Terminate" )); + sbTerm->setAutoRaise(true); + sbAdv=new QCheckBox ( tr ( "Show details" ),sessionStatusDlg ); setWidgetStyle ( sbTerm ); setWidgetStyle ( sbApps ); @@ -1872,29 +1887,17 @@ void ONMainWindow::initStatusDlg() setWidgetStyle ( sbAdv ); sbAdv->setFixedSize ( sbAdv->sizeHint() ); -#ifndef Q_WS_HILDON - sbApps->setFixedSize ( sbApps->sizeHint() ); - sbSusp->setFixedSize ( sbSusp->sizeHint() ); - sbTerm->setFixedSize ( sbTerm->sizeHint() ); - sbExp->setFixedSize ( sbExp->sizeHint() ); -#else - QSize sz=sbSusp->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() /1.5 ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - sbSusp->setFixedSize ( sz ); - sz=sbExp->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - sbExp->setFixedSize ( sz ); - sz=sbTerm->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() /1.5 ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - sbTerm->setFixedSize ( sz ); - sz=sbApps->sizeHint(); - sz.setWidth ( ( int ) ( sz.width() ) ); - sz.setHeight ( ( int ) ( sz.height() /1.5 ) ); - sbApps->setFixedSize ( sz ); -#endif + sbApps->setFixedSize ( 32,32 ); + sbSusp->setFixedSize ( 32,32 ); + sbTerm->setFixedSize ( 32,32 ); + sbExp->setFixedSize ( 32,32 ); + + /* + sbApps->setFocusPolicy(Qt::NoFocus); + sbSusp->setFocusPolicy(Qt::NoFocus); + sbTerm->setFocusPolicy(Qt::NoFocus); + sbExp->setFocusPolicy(Qt::NoFocus);*/ + sbAdv->hide(); sbSusp->hide(); sbTerm->hide(); @@ -1950,7 +1953,7 @@ void ONMainWindow::initStatusDlg() bl->addWidget ( sbExp ); bl->addWidget ( sbSusp ); bl->addWidget ( sbTerm ); - bl->addStretch(); +// bl->addStretch(); layout->addLayout ( ll ); layout->addStretch(); layout->addWidget ( stInfo ); diff --git a/onmainwindow_privat.h b/onmainwindow_privat.h index 2c5ad29..33a8bc4 100644 --- a/onmainwindow_privat.h +++ b/onmainwindow_privat.h @@ -23,6 +23,8 @@ #include <QTextStream> #include <QTranslator> +#include <QToolButton> +#include <QPainter> #include "version.h" #include "x2goclientconfig.h" diff --git a/resources.rcc b/resources.rcc index 01630d0..4263b23 100644 --- a/resources.rcc +++ b/resources.rcc @@ -45,6 +45,10 @@ <file>icons/32x32/x2goclient.png</file> <file>icons/32x32/resolution.png</file> <file>icons/32x32/contest.png</file> + <file>icons/32x32/apps.png</file> + <file>icons/32x32/open_dir.png</file> + <file>icons/32x32/suspend_session.png</file> + <file>icons/32x32/stop_session.png</file> <file>icons/16x16/audio.png</file> <file>icons/16x16/file-open.png</file> <file>icons/16x16/delete.png</file> 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).

1 0

x2goclient.git - master (branch) updated: 3.99.1.1-9-g0aa476e
by git-admin＠x2go.org 09 Mar '12

09 Mar '12

The branch, master has been updated via 0aa476e1f80f8dfb19843a3257f641a36fce9800 (commit) from d21f730472d689a71323a2a1345379649896351d (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 0aa476e1f80f8dfb19843a3257f641a36fce9800 Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Fri Mar 9 12:01:33 2012 +0100 Make X2Go system tray icon not transparent. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + icons/128x128/x2go.png | Bin 3502 -> 6210 bytes 2 files changed, 1 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 49714f2..221a553 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ x2goclient (3.99.2.0-0~x2go1) UNRELEASED; urgency=low - Command line argument "--session-conf=<file>": path to alternative session config. - Fixed bug "light font colour on light background" by dark colour schema. + - Make X2Go system tray icon not transparent. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Mar 2012 21:02:15 +0100 diff --git a/icons/128x128/x2go.png b/icons/128x128/x2go.png index 6bf39cd..43e5f87 100644 Binary files a/icons/128x128/x2go.png and b/icons/128x128/x2go.png differ 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).

1 0

x2goclient.git - master (branch) updated: 3.99.1.1-8-gd21f730
by git-admin＠x2go.org 09 Mar '12

09 Mar '12

The branch, master has been updated via d21f730472d689a71323a2a1345379649896351d (commit) via bdecf63922e7f24ceb9e69fe48369f010ab80cf1 (commit) from 8dd4fca284fbaa90680879a86015c4c82e98b51e (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 d21f730472d689a71323a2a1345379649896351d Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Fri Mar 9 11:16:38 2012 +0100 Fixed bug "light font colour on light background" by dark colour schema. commit bdecf63922e7f24ceb9e69fe48369f010ab80cf1 Author: Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Date: Fri Mar 9 11:14:09 2012 +0100 changelog fix ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++- onmainwindow_part4.cpp | 24 +++++++++++++-- sessionbutton.cpp | 21 ++++++++++-- userbutton.cpp | 79 +++++++++++++++++++++++++---------------------- 4 files changed, 83 insertions(+), 45 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a0fef9a..49714f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ x2goclient (3.99.2.0-0~x2go1) UNRELEASED; urgency=low - * New upstream version (3.99.1.2): + [ Oleksandr Shneyder ] + * New upstream version (3.99.2.0): - Support for "published applications". Sponsored by Stefan Baur (http://www.baur-itcs.de) - Command line argument "--session-conf=<file>": path to alternative session config. + - Fixed bug "light font colour on light background" by dark colour schema. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Mar 2012 21:02:15 +0100 diff --git a/onmainwindow_part4.cpp b/onmainwindow_part4.cpp index db1b860..65dd520 100644 --- a/onmainwindow_part4.cpp +++ b/onmainwindow_part4.cpp @@ -1640,12 +1640,19 @@ void ONMainWindow::initPassDlg() passForm->setFixedSize ( 310,180 ); QPalette pal=passForm->palette(); pal.setBrush ( QPalette::Window, QColor ( 255,255,255,0 ) ); + pal.setColor ( QPalette::Active, QPalette::WindowText, QPalette::Mid ); + pal.setColor ( QPalette::Active, QPalette::ButtonText, QPalette::Mid ); + pal.setColor ( QPalette::Active, QPalette::Text, QPalette::Mid ); + pal.setColor ( QPalette::Inactive, QPalette::WindowText, QPalette::Mid ); + pal.setColor ( QPalette::Inactive, QPalette::ButtonText, QPalette::Mid ); + pal.setColor ( QPalette::Inactive, QPalette::Text, QPalette::Mid ); passForm->setPalette ( pal ); pal.setColor ( QPalette::Button, QColor ( 255,255,255,0 ) ); pal.setColor ( QPalette::Window, QColor ( 255,255,255,255 ) ); pal.setColor ( QPalette::Base, QColor ( 255,255,255,255 ) ); + QFont fnt=passForm->font(); if ( miniMode ) #ifdef Q_WS_HILDON @@ -1713,9 +1720,6 @@ void ONMainWindow::initPassDlg() - pal.setColor ( QPalette::Button, QColor ( 255,255,255,0 ) ); - pal.setColor ( QPalette::Window, QColor ( 255,255,255,255 ) ); - pal.setColor ( QPalette::Base, QColor ( 255,255,255,255 ) ); cbLayout->setPalette ( pal ); ok->setPalette ( pal ); cancel->setPalette ( pal ); @@ -1833,6 +1837,13 @@ void ONMainWindow::initStatusDlg() username->addWidget ( sessionStatusDlg ); QPalette pal=sessionStatusDlg->palette(); pal.setBrush ( QPalette::Window, QColor ( 0,0,0,0 ) ); + pal.setColor ( QPalette::Active, QPalette::WindowText, QPalette::Mid ); + pal.setColor ( QPalette::Active, QPalette::ButtonText, QPalette::Mid ); + pal.setColor ( QPalette::Active, QPalette::Text, QPalette::Mid ); + pal.setColor ( QPalette::Inactive, QPalette::WindowText, QPalette::Mid ); + pal.setColor ( QPalette::Inactive, QPalette::ButtonText, QPalette::Mid ); + pal.setColor ( QPalette::Inactive, QPalette::Text, QPalette::Mid ); + sessionStatusDlg->setPalette ( pal ); slName=new QLabel ( sessionStatusDlg ); @@ -1990,6 +2001,13 @@ void ONMainWindow::initSelectSessDlg() selectSessionDlg->setFixedSize ( 310,180 ); QPalette pal=selectSessionDlg->palette(); pal.setBrush ( QPalette::Window, QColor ( 255,255,255,0 ) ); + pal.setColor ( QPalette::Active, QPalette::WindowText, QPalette::Mid ); + pal.setColor ( QPalette::Active, QPalette::ButtonText, QPalette::Mid ); + pal.setColor ( QPalette::Active, QPalette::Text, QPalette::Mid ); + pal.setColor ( QPalette::Inactive, QPalette::WindowText, QPalette::Mid ); + pal.setColor ( QPalette::Inactive, QPalette::ButtonText, QPalette::Mid ); + pal.setColor ( QPalette::Inactive, QPalette::Text, QPalette::Mid ); + selectSessionDlg->setPalette ( pal ); pal.setColor ( QPalette::Button, QColor ( 255,255,255,0 ) ); diff --git a/sessionbutton.cpp b/sessionbutton.cpp index be840aa..63be020 100644 --- a/sessionbutton.cpp +++ b/sessionbutton.cpp @@ -33,6 +33,19 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id ) { editable=mw->sessionEditEnabled(); + + QPalette pal=palette(); + pal.setColor ( QPalette::Active, QPalette::WindowText, QPalette::Mid ); + pal.setColor ( QPalette::Active, QPalette::ButtonText, QPalette::Mid ); + pal.setColor ( QPalette::Active, QPalette::Text, QPalette::Mid ); + pal.setColor ( QPalette::Inactive, QPalette::WindowText, QPalette::Mid ); + pal.setColor ( QPalette::Inactive, QPalette::ButtonText, QPalette::Mid ); + pal.setColor ( QPalette::Inactive, QPalette::Text, QPalette::Mid ); + + setPalette(pal); + + + QFont fnt=font(); if ( mw->retMiniMode() ) #ifdef Q_WS_HILDON @@ -57,8 +70,8 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id ) cmdBox=new QComboBox ( this ); cmdBox->setMouseTracking ( true ); cmdBox->setFrame ( false ); -// cmdBox->setEditable ( true ); QPalette cpal=cmdBox->palette(); + cpal.setColor ( QPalette::Button,QColor ( 255,255,255 ) ); cpal.setColor ( QPalette::Base,QColor ( 255,255,255 ) ); cpal.setColor ( QPalette::Window,QColor ( 255,255,255 ) ); @@ -656,10 +669,10 @@ void SessionButton::slot_cmd_change ( const QString& command ) cmd="LXDE"; newRootless=false; } - if(command== tr("Published applications")) + if (command== tr("Published applications")) { - published=true; - cmd="PUBLISHED"; + published=true; + cmd="PUBLISHED"; } bool found=false; cmd=par->internAppName ( cmd,&found ); diff --git a/userbutton.cpp b/userbutton.cpp index 21787ca..270ea93 100644 --- a/userbutton.cpp +++ b/userbutton.cpp @@ -26,44 +26,49 @@ UserButton::UserButton ( ONMainWindow* wnd, QWidget *par, QString name, QString fullName, QPixmap& foto, QPalette& bgpal, int width,int height ) - : QPushButton ( par ) + : QPushButton ( par ) { - user=name; - fname=fullName; - image=foto; - setFocusPolicy ( Qt::NoFocus ); - setAutoFillBackground ( true ); - setFlat ( true ); - setPalette ( bgpal ); + user=name; + fname=fullName; + image=foto; + setFocusPolicy ( Qt::NoFocus ); + setAutoFillBackground ( true ); + setFlat ( true ); + bgpal.setColor ( QPalette::Active, QPalette::WindowText, QPalette::Mid ); + bgpal.setColor ( QPalette::Active, QPalette::ButtonText, QPalette::Mid ); + bgpal.setColor ( QPalette::Inactive, QPalette::WindowText, QPalette::Mid ); + bgpal.setColor ( QPalette::Inactive, QPalette::ButtonText, QPalette::Mid ); - bool miniMode=wnd->retMiniMode(); - if ( width==0 || height==0 ) - { - if ( !miniMode ) - { - setFixedSize ( 340,100 ); - } - else - setFixedSize ( 250,100 ); - } - else - { - setFixedSize ( width,height ); - } - QLabel* f=new QLabel ( this ); - QString text=name+"\n("+fullName+")"; - QLabel* n=new QLabel ( text,this ); - if ( !miniMode ) - n->move ( 110,25 ); - else - n->move ( 90,25 ); - f->setPixmap ( foto ); - f->setMaximumSize ( 80,80 ); - if ( !miniMode ) - f->move ( 10,10 ); - else - f->move ( 5,10 ); - connect ( this,SIGNAL ( clicked() ),this,SLOT ( slotClicked() ) ); + setPalette ( bgpal ); + + bool miniMode=wnd->retMiniMode(); + if ( width==0 || height==0 ) + { + if ( !miniMode ) + { + setFixedSize ( 340,100 ); + } + else + setFixedSize ( 250,100 ); + } + else + { + setFixedSize ( width,height ); + } + QLabel* f=new QLabel ( this ); + QString text=name+"\n("+fullName+")"; + QLabel* n=new QLabel ( text,this ); + if ( !miniMode ) + n->move ( 110,25 ); + else + n->move ( 90,25 ); + f->setPixmap ( foto ); + f->setMaximumSize ( 80,80 ); + if ( !miniMode ) + f->move ( 10,10 ); + else + f->move ( 5,10 ); + connect ( this,SIGNAL ( clicked() ),this,SLOT ( slotClicked() ) ); } UserButton::~UserButton() @@ -71,5 +76,5 @@ UserButton::~UserButton() void UserButton::slotClicked() { - emit userSelected ( this ); + emit userSelected ( this ); } 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).

1 0

cups-x2go.git - master (branch) updated: 3.0.0.3-4-g86e725a
by git-admin＠x2go.org 08 Mar '12

08 Mar '12

The branch, master has been updated via 86e725ac8e514d40abcef9db2367be05736d0604 (commit) from 6a7c597b3fa5004c1d24640c48dbca4bf718c180 (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 86e725ac8e514d40abcef9db2367be05736d0604 Author: Helmer Teles <helmer.teles(a)gmail.com> Date: Thu Mar 8 17:27:07 2012 +0100 Fix ignoring number of copies to be printed for single pages. ----------------------------------------------------------------------- Summary of changes: cups-x2go | 4 ++-- cups-x2go.conf | 2 +- debian/changelog | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/cups-x2go b/cups-x2go index 314eca6..967c9ee 100755 --- a/cups-x2go +++ b/cups-x2go @@ -38,8 +38,8 @@ my $x2goserver = "local"; my $printdsa = "/root/.ssh/id_dsa-x2goprint"; # PS2PDF command -my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f \"%s\""; -#my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f /usr/bin/margin-offset.ps \"%s\""; +my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -dDoNumCopies -c .setpdfwrite -f \"%s\""; +#my $ps2pdf = "/usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -dDoNumCopies -c .setpdfwrite -f /usr/bin/margin-offset.ps \"%s\""; ## loglevel for cups-x2go, possible values: emerg, alert, crit, err, warning, notice, info, debug my $strloglevel = "notice"; diff --git a/cups-x2go.conf b/cups-x2go.conf index 0e67c77..89ed3ce 100644 --- a/cups-x2go.conf +++ b/cups-x2go.conf @@ -14,7 +14,7 @@ #printdsa = /root/.ssh/id_dsa-x2goprint ## command to generate PDF file -#ps2pdf = /usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f \"%s\" +#ps2pdf = /usr/bin/gs -q -dCompatibilityLevel=1.4 -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s.pdf\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -dDoNumCopies -c .setpdfwrite -f \"%s\" ## loglevel for cups-x2go, possible values: emerg, alert, crit, err, warning, notice, info, debug #loglevel = notice diff --git a/debian/changelog b/debian/changelog index 0434232..73df8f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ cups-x2go (3.0.0.4-0~x2go1) UNRELEASED; urgency=low + [ Mike Gabriel ] * New upstream version (3.0.0.4): - Add more debug messages. - Use proper project name where appropriate and possible (,,X2Go''). + [ Helmer Teles ] + * New upstream version (3.0.0.4): + - Fix ignoring number of copies to be printed for single pages. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 13 Oct 2011 02:07:16 +0200 cups-x2go (3.0.0.3-0~x2go1) unstable; urgency=low hooks/post-receive -- cups-x2go.git (CUPS Backend for X2Go Printing) 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 "cups-x2go.git" (CUPS Backend for X2Go Printing).

1 0

x2goserver.git - master (branch) updated: 3.1.0.1-11-g9e5134f
by git-admin＠x2go.org 08 Mar '12

08 Mar '12

The branch, master has been updated via 9e5134f95d8d62a4c09d814a4ce6e8a4d473656f (commit) from d19ebdc221f88654fcf726fd445c0426cb3c7e6b (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 9e5134f95d8d62a4c09d814a4ce6e8a4d473656f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 8 15:08:10 2012 +0100 bump version to 3.1.1.0 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 +++--- x2goserver-compat/VERSION.x2goserver-compat | 2 +- .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-pyhoca/VERSION.x2goserver-pyhoca | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5655078..5349c60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ -x2goserver (3.1.0.2-0~x2go1.1) UNRELEASED; urgency=low +x2goserver (3.1.1.0-0~x2go1) UNRELEASED; urgency=low [ Mike Gabriel ] - * New upstream version (3.1.0.2): + * New upstream version (3.1.1.0): - Syslog warnings have to be named ,,warning'' not ,,warn''. - Add usage output to x2goserver-run-extensions. - Fix syslog output of x2goserver-run-exentions. @@ -11,7 +11,7 @@ x2goserver (3.1.0.2-0~x2go1.1) UNRELEASED; urgency=low (if empty after purge) on package purge. [ Oleksandr Shneyder ] - * New upstream version (3.1.0.2): + * New upstream version (3.1.1.0): - Support for "published applications". Sponsored by Stefan Baur (http://www.baur-itcs.de) diff --git a/x2goserver-compat/VERSION.x2goserver-compat b/x2goserver-compat/VERSION.x2goserver-compat index b7ad433..b8f4d84 100644 --- a/x2goserver-compat/VERSION.x2goserver-compat +++ b/x2goserver-compat/VERSION.x2goserver-compat @@ -1 +1 @@ -3.1.0.2 \ No newline at end of file +3.1.1.0 \ No newline at end of file diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index b7ad433..b8f4d84 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -3.1.0.2 \ No newline at end of file +3.1.1.0 \ No newline at end of file diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index ac3b488..78df7c8 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -3.1.0.2 +3.1.1.0 diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index b7ad433..b8f4d84 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -3.1.0.2 \ No newline at end of file +3.1.1.0 \ No newline at end of file diff --git a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca index b7ad433..b8f4d84 100644 --- a/x2goserver-pyhoca/VERSION.x2goserver-pyhoca +++ b/x2goserver-pyhoca/VERSION.x2goserver-pyhoca @@ -1 +1 @@ -3.1.0.2 \ No newline at end of file +3.1.1.0 \ No newline at end of file diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index b7ad433..b8f4d84 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -3.1.0.2 \ No newline at end of file +3.1.1.0 \ No newline at end of file diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index b7ad433..b8f4d84 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -3.1.0.2 \ No newline at end of file +3.1.1.0 \ No newline at end of file hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goclient.git - master (branch) updated: 3.99.1.1-6-g8dd4fca
by git-admin＠x2go.org 08 Mar '12

08 Mar '12

The branch, master has been updated via 8dd4fca284fbaa90680879a86015c4c82e98b51e (commit) from d45a91d7a9b022e3c4775c57e85f34b89b571872 (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 8dd4fca284fbaa90680879a86015c4c82e98b51e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 8 15:07:14 2012 +0100 whitespace fix ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e98ee2e..a0fef9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,7 @@ x2goclient (3.99.2.0-0~x2go1) UNRELEASED; urgency=low - [ Oleksandr Shneyder ] * New upstream version (3.99.1.2): - - Support for "published applications". + - Support for "published applications". Sponsored by Stefan Baur (http://www.baur-itcs.de) - Command line argument "--session-conf=<file>": path to alternative session config. 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).

1 0

x2goclient.git - master (branch) updated: 3.99.1.1-5-gd45a91d
by git-admin＠x2go.org 08 Mar '12

08 Mar '12

The branch, master has been updated via d45a91d7a9b022e3c4775c57e85f34b89b571872 (commit) from 91549d868c72112ffa816a74e4eb89355c030170 (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 d45a91d7a9b022e3c4775c57e85f34b89b571872 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 8 15:06:07 2012 +0100 changelog cleanup ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index e448ace..e98ee2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,9 +2,9 @@ x2goclient (3.99.2.0-0~x2go1) UNRELEASED; urgency=low [ Oleksandr Shneyder ] * New upstream version (3.99.1.2): - - support for "published applications". - Sponsored by Stefan Baur <postmaster(a)stefanbaur.de> - - command line argumnet "--session-conf=<file>": path to alternative + - Support for "published applications". + Sponsored by Stefan Baur (http://www.baur-itcs.de) + - Command line argument "--session-conf=<file>": path to alternative session config. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 07 Mar 2012 21:02:15 +0100 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).

1 0

x2goserver.git - master (branch) updated: 3.1.0.1-10-gd19ebdc
by git-admin＠x2go.org 08 Mar '12

08 Mar '12

The branch, master has been updated via d19ebdc221f88654fcf726fd445c0426cb3c7e6b (commit) from 691ff9b139b7ab1b30c5389e87c9d8294a7cb021 (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 d19ebdc221f88654fcf726fd445c0426cb3c7e6b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 8 15:04:27 2012 +0100 fix sponsor address ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 02d3181..5655078 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,8 +12,8 @@ x2goserver (3.1.0.2-0~x2go1.1) UNRELEASED; urgency=low [ Oleksandr Shneyder ] * New upstream version (3.1.0.2): - - support for "published applications". - Sponsored by Stefan Baur <postmaster(a)stefanbaur.de> + - Support for "published applications". + Sponsored by Stefan Baur (http://www.baur-itcs.de) -- Oleksandr Shneyder <oleksandr.shneyder(a)treuchtlingen.de> Thu, 08 Mar 2012 13:24:10 +0100 hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goserver.git - master (branch) updated: 3.1.0.1-9-g691ff9b
by git-admin＠x2go.org 08 Mar '12

08 Mar '12

The branch, master has been updated via 691ff9b139b7ab1b30c5389e87c9d8294a7cb021 (commit) from 0ae4d0ec543241fb93706958fa0d037b9cb8fc0b (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 691ff9b139b7ab1b30c5389e87c9d8294a7cb021 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 8 14:59:28 2012 +0100 test for symlink is -L not -s ----------------------------------------------------------------------- Summary of changes: debian/x2goserver.prerm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/x2goserver.prerm b/debian/x2goserver.prerm index 52ed206..1ec6436 100755 --- a/debian/x2goserver.prerm +++ b/debian/x2goserver.prerm @@ -19,7 +19,7 @@ set -e case "$1" in remove) # The package is being removed in its own right. - if test -s /etc/x2go/applications; then + if test -L /etc/x2go/applications; then rm -f /etc/x2go/applications fi ;; hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits