x2go-commits September 2013

x2go-commits@lists.x2go.org

2 participants
2415 discussions

x2goclient.git - build-main (branch) updated: 4.0.1.0-40-g1df7b6c
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via 1df7b6c9df38f425bba72abe9b2f926c2fed7b3d (commit) from 897b0f36774b2a7dc2f995b533ee993b7fad8607 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]changelog | 4 ++++ x2goclient_es.ts | 60 +++++++++++++++++++++++++++--------------------------- 2 files changed, 34 insertions(+), 30 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 31767d7..3116d6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -62,6 +62,10 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.1.1): - Swedish translation update. + [ Ricardo Díaz Martín ] + * New upstream version (4.0.1.1): + - Update Spanish translation file. + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Mar 2013 23:21:11 +0100 x2goclient (4.0.1.0-0~x2go1) unstable; urgency=low diff --git a/x2goclient_es.ts b/x2goclient_es.ts index 04a130c..c8d27a4 100644 --- a/x2goclient_es.ts +++ b/x2goclient_es.ts @@ -781,7 +781,7 @@ Hash de su clave pública: </translation> <message> <location filename="onmainwindow.cpp" line="50"/> <source>Starting x2goclient...</source> - <translation type="unfinished"></translation> + <translation>Iniciando el cliente X2Go</translation> </message> <message> <location filename="onmainwindow.cpp" line="89"/> @@ -829,7 +829,7 @@ Hash de su clave pública: </translation> <message> <location filename="onmainwindow.cpp" line="229"/> <source>Starting x2goclient in portable mode... data directory is: </source> - <translation type="unfinished"></translation> + <translation>Iniciando x2goclint en modo portable... el directorio de los datos es: </translation> </message> <message> <location filename="onmainwindow.cpp" line="351"/> @@ -850,25 +850,25 @@ Hash de su clave pública: </translation> <message> <location filename="onmainwindow.cpp" line="460"/> <source>Started x2goclient.</source> - <translation type="unfinished"></translation> + <translation>Cliente X2Go iniciado.</translation> </message> <message> <location filename="onmainwindow.cpp" line="522"/> <location filename="onmainwindow.cpp" line="535"/> <source>Can't load translator: </source> - <translation type="unfinished"></translation> + <translation>No se puede cargar el traductor.</translation> </message> <message> <location filename="onmainwindow.cpp" line="527"/> <location filename="onmainwindow.cpp" line="540"/> <source>Translator: </source> - <translation type="unfinished"></translation> + <translation>Traductor: </translation> </message> <message> <location filename="onmainwindow.cpp" line="527"/> <location filename="onmainwindow.cpp" line="540"/> <source> installed.</source> - <translation type="unfinished"></translation> + <translation> instalado.</translation> </message> <message> <location filename="onmainwindow.cpp" line="561"/> @@ -1157,12 +1157,12 @@ Hash de su clave pública: </translation> <message> <location filename="onmainwindow.cpp" line="1259"/> <source>Closing x2goclient...</source> - <translation type="unfinished"></translation> + <translation>Cerrando x2goclient</translation> </message> <message> <location filename="onmainwindow.cpp" line="1407"/> <source>Closed x2goclient.</source> - <translation type="unfinished"></translation> + <translation>x2goclient finalizado.</translation> </message> <message> <location filename="onmainwindow.cpp" line="1678"/> @@ -1202,7 +1202,7 @@ Use x2goclient hidden mode?</source> <message> <location filename="onmainwindow.cpp" line="2152"/> <source>No X2Go sessions found, closing.</source> - <translation type="unfinished"></translation> + <translation>No se han encontrado sesiones X2Go.</translation> </message> <message> <source>X2Go sessions not found</source> @@ -1242,22 +1242,22 @@ Use x2goclient hidden mode?</source> <message> <location filename="onmainwindow.cpp" line="2781"/> <source>Starting connection to server: </source> - <translation type="unfinished"></translation> + <translation>Iniciando conección con el servidor: </translation> </message> <message> <location filename="onmainwindow.cpp" line="2790"/> <source> to </source> - <translation type="unfinished"></translation> + <translation> a </translation> </message> <message> <location filename="onmainwindow.cpp" line="2835"/> <source>Connection Error(</source> - <translation type="unfinished"></translation> + <translation>Error en la conexión (</translation> </message> <message> <location filename="onmainwindow.cpp" line="2904"/> <source>Couldn't find a SSH connection.</source> - <translation type="unfinished"></translation> + <translation>No se pudo encontrar la conexión SSH.</translation> </message> <message> <location filename="onmainwindow.cpp" line="2921"/> @@ -1316,7 +1316,7 @@ Hash de su clave pública: </translation> <message> <location filename="onmainwindow.cpp" line="3041"/> <source>Authentication failed: </source> - <translation type="unfinished"></translation> + <translation>Fallo en la autenticación: </translation> </message> <message> <location filename="onmainwindow.cpp" line="3045"/> @@ -1364,13 +1364,13 @@ Hash de su clave pública: </translation> <location filename="onmainwindow.cpp" line="7406"/> <location filename="onmainwindow.cpp" line="7408"/> <source>Connection failed: </source> - <translation type="unfinished"></translation> + <translation>Fallo en la conexión: </translation> </message> <message> <location filename="onmainwindow.cpp" line="3458"/> <location filename="onmainwindow.cpp" line="7406"/> <source> - Wrong password.</source> - <translation type="unfinished"></translation> + <translation> - Contraseña incorrecta.</translation> </message> <message> <location filename="onmainwindow.cpp" line="3573"/> @@ -1488,45 +1488,45 @@ Hash de su clave pública: </translation> <message> <location filename="onmainwindow.cpp" line="4836"/> <source>New session started</source> - <translation type="unfinished"></translation> + <translation>Iniciada nueva sesión</translation> </message> <message> <location filename="onmainwindow.cpp" line="4871"/> <source>Session resumed</source> - <translation type="unfinished"></translation> + <translation>Sesión suspendida</translation> </message> <message> <location filename="onmainwindow.cpp" line="5103"/> <location filename="onmainwindow.cpp" line="5107"/> <source>Unable to create folder: </source> - <translation type="unfinished"></translation> + <translation>No se ha podido crear la carpeta: </translation> </message> <message> <location filename="onmainwindow.cpp" line="5133"/> <location filename="onmainwindow.cpp" line="5137"/> <source>Unable to write file: </source> - <translation type="unfinished"></translation> + <translation>No se ha podido guardar el archivo: </translation> </message> <message> <location filename="onmainwindow.cpp" line="5406"/> <source>Emergency exit.</source> - <translation type="unfinished"></translation> + <translation>Salida de emergencia.</translation> </message> <message> <location filename="onmainwindow.cpp" line="5415"/> <source>Waiting for proxy to exit.</source> - <translation type="unfinished"></translation> + <translation>Esperando a la salida del proxy.</translation> </message> <message> <location filename="onmainwindow.cpp" line="5418"/> <source>Failed, killing the proxy.</source> - <translation type="unfinished"></translation> + <translation>Error, finalizando el proxy.</translation> </message> <message> <location filename="onmainwindow.cpp" line="6830"/> <location filename="onmainwindow.cpp" line="6835"/> <source>Wrong parameter: </source> - <translation type="unfinished"></translation> + <translation>Parámetro incorrecto: </translation> </message> <message> <location filename="onmainwindow.cpp" line="7263"/> @@ -1698,12 +1698,12 @@ Los documentos no guardados se perderán</translation> <message> <location filename="onmainwindow.cpp" line="7359"/> <source>RSA file empty.</source> - <translation type="unfinished"></translation> + <translation>Archivo RSA vacío.</translation> </message> <message> <location filename="onmainwindow.cpp" line="7368"/> <source>Can not open key: </source> - <translation type="unfinished"></translation> + <translation>No se puede abrir la clave: </translation> </message> <message> <location filename="onmainwindow.cpp" line="7701"/> @@ -1743,7 +1743,7 @@ Los documentos no guardados se perderán</translation> <message> <location filename="onmainwindow.cpp" line="8062"/> <source>Card not configured.</source> - <translation type="unfinished"></translation> + <translation>Tarjeta no configurada.</translation> </message> <message> <location filename="onmainwindow.cpp" line="8066"/> @@ -1816,7 +1816,7 @@ Actualiza el paquete x2goserver en el servidor</translation> <message> <location filename="onmainwindow.cpp" line="9641"/> <source>Error getting window geometry (window closed)?</source> - <translation type="unfinished"></translation> + <translation>Fallo al obtener el tamaño de la ventana (ventana cerrada)?</translation> </message> <message> <location filename="onmainwindow.cpp" line="9917"/> @@ -2157,7 +2157,7 @@ Ejemplo: <message> <location filename="ongetpass.cpp" line="79"/> <source>No response received from the remote server. Do you want to terminate the current session?</source> - <translation type="unfinished"></translation> + <translation>No se ha recibido respuesta del servidor remoto. ¿Finalizar la sesión actual?</translation> </message> </context> <context> @@ -2943,7 +2943,7 @@ el sonido en conexiones a través de firewalls</translation> <message> <location filename="xsettingsui.ui" line="61"/> <source> do not use primary clipboard</source> - <translation type="unfinished"></translation> + <translation> no usar el portapapeles principal</translation> </message> <message> <location filename="xsettingsui.ui" line="68"/> 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). [View Less]

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-38-g1b1fc7f
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via 1b1fc7f252485d4043d3090eb568ef68e9978a0e (commit) from 7996b7bf565ba8dd982909db914f984c441d1943 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]changelog | 1 + onmainwindow.cpp | 23 +++++++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7ab91a9..3bcc547 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low resolution. (Fixes: #151). - Wait for x2gocmdexitmessage to return before closing in hidden mode. - Support for published applications in X2Go Plugin + - Support for "shadow" mode in X2Go Plugin [ Mike Gabriel ] * New upstream version (4.0.1.1): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index fc735ab..e1af9c6 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -71,6 +71,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) acceptRsa=false; cardStarted=false; cardReady=false; + shadowSession=false; proxyRunning=false; // useSshAgent=false; closeEventSent=false; @@ -1674,7 +1675,8 @@ void ONMainWindow::slotClosePass() void ONMainWindow::slotPassEnter() { - shadowSession=false; + if(!embedMode) + shadowSession=false; #if defined ( Q_OS_WIN ) || defined (Q_OS_DARWIN ) QString disp=getXDisplay(); if ( disp==QString::null ) @@ -3113,6 +3115,7 @@ void ONMainWindow::slotSessEnter() void ONMainWindow::continueNormalSession() { x2goDebug<<"Continue normal x2go session"; + if (brokerMode) { slotListSessions(true,QString::null,0); @@ -3279,7 +3282,8 @@ bool ONMainWindow::startSession ( const QString& sid ) user=getCurrentUname(); runRemoteCommand=true; - shadowSession=false; + if(!embedMode) + shadowSession=false; applications.clear(); removeAppsFromTray(); @@ -3733,6 +3737,12 @@ void ONMainWindow::startNewSession() else { command=config.command; + if ( command=="SHADOW" ) + { + shadowSession=true; + runRemoteCommand=false; + } + rootless= config.rootless; host=config.server; startEmbedded=false; @@ -3784,7 +3794,6 @@ void ONMainWindow::startNewSession() delete st; } - if ( shadowSession ) { runRemoteCommand=false; @@ -9909,7 +9918,7 @@ void ONMainWindow::setEmbedSessionActionsEnabled ( bool enable ) { act_shareFolder->setEnabled ( enable ); if(!enable) - act_showApps->setVisible(enable); + act_showApps->setVisible(enable); act_suspend->setEnabled ( enable ); act_terminate->setEnabled ( enable ); act_embedContol->setEnabled ( enable ); @@ -10009,6 +10018,12 @@ void ONMainWindow::processCfgLine ( QString line ) if ( lst[0]=="command" ) { config.command=lst[1]; + if ( config.command=="SHADOW" ) + { + shadowSession=true; + runRemoteCommand=false; + } + return; } if ( lst[0]=="server" ) 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). [View Less]

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-43-g8437e37
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via 8437e3713e2d32b18c851898c8dd218e0f0a81de (commit) from 468be3aa8d457ec4bc429e76f4c26f4bbf27f0d0 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]changelog | 4 +++ x2goclient_nb_no.ts | 68 ++++++++++++++++++++++++++++----------------------- 2 files changed, 41 insertions(+), 31 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 475caf3..51e8eba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low + [ Terje Andersen ] + * New upstream version (4.0.1.1): + - Update Norwegian Bokmaal translation file. + [ Oleksandr Shneyder ] * New upstream version (4.0.1.1): - Use "127.0.0.1" instead of localhost to avoid wrong IPv6 hostname diff --git a/x2goclient_nb_no.ts b/x2goclient_nb_no.ts index 4d0d931..527d1ec 100644 --- a/x2goclient_nb_no.ts +++ b/x2goclient_nb_no.ts @@ -892,65 +892,65 @@ Offentlig nøkkel: </translation> <message> <location filename="onmainwindow.cpp" line="4836"/> <source>New session started</source> - <translation type="unfinished"></translation> + <translation>Ny sesjon startet</translation> </message> <message> <location filename="onmainwindow.cpp" line="4871"/> <source>Session resumed</source> - <translation type="unfinished"></translation> + <translation>Sesjon gjenopptatt</translation> </message> <message> <location filename="onmainwindow.cpp" line="5103"/> <location filename="onmainwindow.cpp" line="5107"/> <source>Unable to create folder: </source> - <translation type="unfinished"></translation> + <translation>Klarer ikke å opprette katalogen: </translation> </message> <message> <location filename="onmainwindow.cpp" line="5133"/> <location filename="onmainwindow.cpp" line="5137"/> <source>Unable to write file: </source> - <translation type="unfinished"></translation> + <translation>Klarer ikke å skrive til filen: </translation> </message> <message> <location filename="onmainwindow.cpp" line="5406"/> <source>Emergency exit.</source> - <translation type="unfinished"></translation> + <translation>Avsluttning grunnet nødstilfelle.</translation> </message> <message> <location filename="onmainwindow.cpp" line="5415"/> <source>Waiting for proxy to exit.</source> - <translation type="unfinished"></translation> + <translation>Venter på at proxy skal avslutte.</translation> </message> <message> <location filename="onmainwindow.cpp" line="5418"/> <source>Failed, killing the proxy.</source> - <translation type="unfinished"></translation> + <translation>Feilet, dreper derfor proxy.</translation> </message> <message> <location filename="onmainwindow.cpp" line="6830"/> <location filename="onmainwindow.cpp" line="6835"/> <source>Wrong parameter: </source> - <translation type="unfinished"></translation> + <translation>Feil parameter: </translation> </message> <message> <location filename="onmainwindow.cpp" line="7359"/> <source>RSA file empty.</source> - <translation type="unfinished"></translation> + <translation>RSA filen er tom.</translation> </message> <message> <location filename="onmainwindow.cpp" line="7368"/> <source>Can not open key: </source> - <translation type="unfinished"></translation> + <translation>Kan ikke åpne nøkkelfilen: </translation> </message> <message> <location filename="onmainwindow.cpp" line="8062"/> <source>Card not configured.</source> - <translation type="unfinished"></translation> + <translation>Kortet er ikke konfigurert.</translation> </message> <message> <location filename="onmainwindow.cpp" line="9641"/> <source>Error getting window geometry (window closed)?</source> - <translation type="unfinished"></translation> + <translation>Feil under uthenting av vindusgeometrien (Er vinduet lukket?)</translation> </message> <message> <location filename="onmainwindow.cpp" line="10220"/> @@ -1489,7 +1489,8 @@ Vennligst sjekk instillingene dine</translation> <message> <location filename="onmainwindow.cpp" line="7727"/> <source>X2Go Client V. </source> - <translation type="unfinished">X2Go Client V. </translation> + <translatorcomment>X2Go klient V. </translatorcomment> + <translation>X2Go Client V. </translation> </message> <message> <source> (C. 2006-2007 Oleksandr Shneyder, Heinz-Markus Graesing) Client for use with the X2Go network based computing environment. This Client will be able to connect to X2Go server(s) and start, stop, resume and terminate (running) desktop sessions. X2Go Client stores different server connections and may automatically request authentication data from LDAP directories. Furthermore it can be used as fullscreen loginscreen (replacement for loginmanager like xdm). Please visit x2go.org for further information.</source> @@ -1649,27 +1650,27 @@ Vennligst sjekk instillingene dine</translation> <message> <location filename="onmainwindow.cpp" line="2152"/> <source>No X2Go sessions found, closing.</source> - <translation type="unfinished"></translation> + <translation>Ingen X2Go sesjoner ble funnet, lukker.</translation> </message> <message> <location filename="onmainwindow.cpp" line="2781"/> <source>Starting connection to server: </source> - <translation type="unfinished"></translation> + <translation>Starter tilkobling til server: </translation> </message> <message> <location filename="onmainwindow.cpp" line="2790"/> <source> to </source> - <translation type="unfinished"></translation> + <translation> til </translation> </message> <message> <location filename="onmainwindow.cpp" line="2835"/> <source>Connection Error(</source> - <translation type="unfinished"></translation> + <translation>Tilkoblingsfeil(</translation> </message> <message> <location filename="onmainwindow.cpp" line="2904"/> <source>Couldn't find a SSH connection.</source> - <translation type="unfinished"></translation> + <translation>Klarte ikke å finne en SSH tilkobling.</translation> </message> <message> <location filename="onmainwindow.cpp" line="2954"/> @@ -1709,7 +1710,7 @@ Offentlig nøkkel: </translation> <message> <location filename="onmainwindow.cpp" line="3041"/> <source>Authentication failed: </source> - <translation type="unfinished"></translation> + <translation>Autentisering feilet: </translation> </message> <message> <location filename="onmainwindow.cpp" line="3045"/> @@ -1729,13 +1730,13 @@ Offentlig nøkkel: </translation> <location filename="onmainwindow.cpp" line="7406"/> <location filename="onmainwindow.cpp" line="7408"/> <source>Connection failed: </source> - <translation type="unfinished"></translation> + <translation>Tilkoblingen feilet: </translation> </message> <message> <location filename="onmainwindow.cpp" line="3458"/> <location filename="onmainwindow.cpp" line="7406"/> <source> - Wrong password.</source> - <translation type="unfinished"></translation> + <translation> - Feil passord.</translation> </message> <message> <location filename="onmainwindow.cpp" line="3649"/> @@ -1803,35 +1804,38 @@ Vennligst oppdater til en nyere x2goserver pakke</translation> <message> <location filename="onmainwindow.cpp" line="50"/> <source>Starting x2goclient...</source> - <translation type="unfinished"></translation> + <translatorcomment>virker som om det er egennavnet "x2goclient" som er ment her, beholder engelsk versjon</translatorcomment> + <translation>Starter x2goclient...</translation> </message> <message> <location filename="onmainwindow.cpp" line="229"/> <source>Starting x2goclient in portable mode... data directory is: </source> - <translation type="unfinished"></translation> + <translatorcomment>virker som om det er egennavnet "x2goclient" som er ment her, beholder engelsk versjon</translatorcomment> + <translation>Starter x2goclient i portabel modus... data-katalogen er: </translation> </message> <message> <location filename="onmainwindow.cpp" line="460"/> <source>Started x2goclient.</source> - <translation type="unfinished"></translation> + <translatorcomment>virker som om det er egennavnet "x2goclient" som er ment her, beholder engelsk versjon</translatorcomment> + <translation>Startet x2goclient.</translation> </message> <message> <location filename="onmainwindow.cpp" line="522"/> <location filename="onmainwindow.cpp" line="535"/> <source>Can't load translator: </source> - <translation type="unfinished"></translation> + <translation>Kan ikke laste oversetter: </translation> </message> <message> <location filename="onmainwindow.cpp" line="527"/> <location filename="onmainwindow.cpp" line="540"/> <source>Translator: </source> - <translation type="unfinished"></translation> + <translation>Oversetter: </translation> </message> <message> <location filename="onmainwindow.cpp" line="527"/> <location filename="onmainwindow.cpp" line="540"/> <source> installed.</source> - <translation type="unfinished"></translation> + <translation> installert.</translation> </message> <message> <location filename="onmainwindow.cpp" line="770"/> @@ -1934,12 +1938,14 @@ Vennligst oppdater til en nyere x2goserver pakke</translation> <message> <location filename="onmainwindow.cpp" line="1259"/> <source>Closing x2goclient...</source> - <translation type="unfinished"></translation> + <translatorcomment>virker som om det er egennavnet "x2goclient" som er ment her, beholder engelsk versjon</translatorcomment> + <translation>Lukker x2goclient...</translation> </message> <message> <location filename="onmainwindow.cpp" line="1407"/> <source>Closed x2goclient.</source> - <translation type="unfinished"></translation> + <translatorcomment>virker som om det er egennavnet "x2goclient" som er ment her, beholder engelsk versjon</translatorcomment> + <translation>Lukket x2goclient.</translation> </message> <message> <location filename="onmainwindow.cpp" line="2027"/> @@ -2349,7 +2355,7 @@ Eksempel: <message> <location filename="ongetpass.cpp" line="79"/> <source>No response received from the remote server. Do you want to terminate the current session?</source> - <translation type="unfinished"></translation> + <translation>Ingen respons mottatt fra serveren. Ønsker du å avslutte gjeldende sesjon?</translation> </message> </context> <context> @@ -3141,7 +3147,7 @@ lydsystem forbindelser gjennom brannmurer</translation> <message> <location filename="xsettingsui.ui" line="61"/> <source> do not use primary clipboard</source> - <translation type="unfinished"></translation> + <translation> ikke benytt primær utklippstavle</translation> </message> <message> <location filename="xsettingsui.ui" line="68"/> 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). [View Less]

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-33-gc8c8e2f
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via c8c8e2febcab710108761ddabeab99364d6d1837 (commit) from 3d6450d24cc3596bfbb9d602bd5e5216e9c99e9d (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-34-g2f8cdb2
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via 2f8cdb2dd5778cdd8104c6427c25167f7c0c3bf9 (commit) from c8c8e2febcab710108761ddabeab99364d6d1837 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]changelog | 1 + debian/control | 20 ++++++++++++++++++++ debian/rules | 3 +++ 3 files changed, 24 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0ca8369..dd7122b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low just calling free(). Required under MS Windows as documented in libssh2 API. (Fixes: #243). (For further details see: http://api.libssh.org/master/group__libssh__session.html) + * Provide bin:package with debug symbols for X2Go Client. (Fixes: #255). [ Ezra Bühler ] * New upstream version (4.0.1.1): diff --git a/debian/control b/debian/control index 266f13a..21a806c 100644 --- a/debian/control +++ b/debian/control @@ -49,6 +49,26 @@ Description: X2Go Client application (Qt4) x2goclient is a graphical client (Qt4) for the X2Go system. You can use it to connect to running sessions and start new sessions. +Package: x2goclient-dbg +Priority: extra +Section: debug +Architecture: any +Depends: ${misc:Depends}, x2goclient (= ${binary:Version}) +Description: X2Go Client application (Qt4), debug symbols + X2Go is a serverbased computing environment with + - session resuming + - low bandwidth support + - LDAP support + - client-side mass storage mounting support + - client-side printing support + - audio support + - authentication by smartcard and USB stick + . + x2goclient is a graphical client (Qt4) for the X2Go system. + You can use it to connect to running sessions and start new sessions + . + This package provides the debug symbols for the x2goclient application. + Package: x2goplugin Architecture: any Depends: diff --git a/debian/rules b/debian/rules index 2bbb30a..8d25702 100755 --- a/debian/rules +++ b/debian/rules @@ -14,3 +14,6 @@ override_dh_auto_clean: rm -Rf x2goclient_*.qm override_dh_auto_install: + +override_dh_strip: + dh_strip --dbg-package=x2goclient-dbg \ No newline at end of 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). [View Less]

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-32-g3d6450d
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via 3d6450d24cc3596bfbb9d602bd5e5216e9c99e9d (commit) from af80d226b539a8edefdc424edd1e51211ad575c3 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-28-g512b85b
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via 512b85b24ca11d37c422d009fb3190c35d30d03e (commit) from b9e540ce5fb9b4e4ea44a26bbc6dc68cde1e5bb5 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]changelog | 3 +++ sessionbutton.cpp | 7 +++++++ settingswidget.cpp | 31 +++++++++++++++++++++++-------- settingswidget.h | 2 -- 4 files changed, 33 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9f1e098..84daa74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,9 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low #165). - Use the session icon as tray icon, pop up notification bubble that informs about current session actions. (Fixes: #177). + - Allow for setting maximum available desktop size as window size via the + session profile card. Unfortunately, this feature is for now only available + on Linux. (Fixes: #214). [ Otto Kjell ] * New upstream version (4.0.1.1): diff --git a/sessionbutton.cpp b/sessionbutton.cpp index 576d491..65351bc 100644 --- a/sessionbutton.cpp +++ b/sessionbutton.cpp @@ -433,8 +433,15 @@ void SessionButton::redraw() for (uint i=0;i<displays;++i) { geomBox->addItem ( tr( "Display " )+QString::number(i+1)); + + //add maximun available area + geomBox->addItem( QString::number(QApplication::desktop()->availableGeometry(i).width()) + "x" + QString::number(QApplication::desktop()->availableGeometry(i).height())); + + } #ifndef Q_WS_HILDON + + geomBox->addItem ( "1440x900" ); geomBox->addItem ( "1280x1024" ); geomBox->addItem ( "1024x768" ); diff --git a/settingswidget.cpp b/settingswidget.cpp index 98cb9b0..15eb91e 100644 --- a/settingswidget.cpp +++ b/settingswidget.cpp @@ -68,16 +68,12 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw, custom=new QRadioButton ( tr ( "Window" ),dgb ); #endif display=new QRadioButton ( tr ( "Use whole display" ),dgb ); -#ifdef Q_OS_LINUX maxRes=new QRadioButton ( tr ( "Maximum available" ),dgb ); -#endif radio->addButton ( fs ); radio->addButton ( custom ); radio->setExclusive ( true ); radio->addButton(display); -#ifdef Q_OS_LINUX radio->addButton(maxRes); -#endif width=new QSpinBox ( dgb ); height=new QSpinBox ( dgb ); cbSetDPI=new QCheckBox ( tr ( "Set display DPI" ),dgb ); @@ -110,9 +106,7 @@ SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw, dwLay->addStretch(); dispLay->addWidget(display); -#ifdef Q_OS_LINUX dispLay->addWidget(maxRes); -#endif dispLay->addSpacing(15); dispLay->addWidget(lDisplay=new QLabel(tr("&Display:"),dgb)); dispLay->addWidget(displayNumber=new QSpinBox(dgb)); @@ -665,8 +659,6 @@ void SettingsWidget::saveSettings() st.setting()->setValue ( sessionId+"/fullscreen", ( QVariant ) fs->isChecked() ); - st.setting()->setValue ( sessionId+"/width", - ( QVariant ) width->value() ); st.setting()->setValue ( sessionId+"/multidisp", ( QVariant ) display->isChecked() ); st.setting()->setValue ( sessionId+"/display", @@ -687,8 +679,31 @@ void SettingsWidget::saveSettings() ( QVariant ) params->text()); #endif #endif + + st.setting()->setValue ( sessionId+"/width", + ( QVariant ) width->value() ); + st.setting()->setValue ( sessionId+"/height", ( QVariant ) height->value() ); + + //if maxRes is checked width and height are setted to max area available + if (maxRes->isChecked() + || st.setting()->value(sessionId + "/multidisp", (QVariant) false).toBool() + || st.setting()->value(sessionId + "/maxdim", (QVariant) false).toBool()) { + + //get screen number + int selectedScreen = st.setting()->value(sessionId + "/display", (QVariant) -1).toInt(); + + //get max available desktop area for selected screen + int height = QApplication::desktop()->availableGeometry(selectedScreen).height(); + int width = QApplication::desktop()->availableGeometry(selectedScreen).width(); + + //save max resolution + st.setting()->setValue (sessionId + "/width", (QVariant) width); + st.setting()->setValue (sessionId + "/height", (QVariant) height); + } + + st.setting()->setValue ( sessionId+"/dpi", ( QVariant ) DPI->value() ); st.setting()->setValue ( sessionId+"/setdpi", diff --git a/settingswidget.h b/settingswidget.h index 590e728..75d6724 100644 --- a/settingswidget.h +++ b/settingswidget.h @@ -68,9 +68,7 @@ private: QLineEdit* type; QRadioButton* custom; QRadioButton* display; -#ifdef Q_OS_LINUX QRadioButton* maxRes; -#endif QRadioButton* arts; QRadioButton* pulse; QRadioButton* esd; 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). [View Less]

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-29-ge3b8739
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via e3b87397d75a7e246d29c4f94b1368e092f27207 (commit) from 512b85b24ca11d37c422d009fb3190c35d30d03e (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/… [View More]changelog | 3 +++ man/man1/x2goclient.1 | 3 +++ onmainwindow.cpp | 35 +++++++++++++++++++++++------------ onmainwindow.h | 1 + 4 files changed, 30 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 84daa74..c2dcc38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low patch was applied. Segfault only occurred if the tray icon was not used. - Show session name in notification bubbles. - Update German translation. + - Add cmdline option --broker-autologoff: Enforce re-authentication against + X2Go Session Broker after a session has been suspended or terminated. + (Fixes: #179). [ Ezra Bühler ] * New upstream version (4.0.1.1): diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1 index 4bbe926..9eb69ae 100644 --- a/man/man1/x2goclient.1 +++ b/man/man1/x2goclient.1 @@ -117,6 +117,9 @@ with \fI--broker-autologin\fR or \fI--broker-ssh-key\fR. For SSH based X2Go Session Brokers. If an SSH agent is available or default key files exist then try those for authentication against the X2Go Session Broker. .TP +\*(T<\fB\-\-broker-autologoff\fR\*(T> +Enforce re-authentication against X2Go Session Broker after a session has been suspended or terminated. +.TP \*(T<\fB\-\-broker-ssh-key=<SSHPRIVKEY>\fR\*(T> For SSH based X2Go Session Brokers. Full path to a valid SSH private key file. .TP diff --git a/onmainwindow.cpp b/onmainwindow.cpp index c2fdeea..c2ee334 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -104,6 +104,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) appSeparator=0; config.brokerNoAuth=false; config.brokerAutologin=false; + config.brokerAutologoff=false; cmdAutologin=false; @@ -5473,18 +5474,22 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) cleanPrintSpool(); if ( !restartResume ) { - if ( !embedMode ) + if ( brokerMode && (!config.brokerAutologoff) ) { - if (!brokerMode) - { - pass->setText ( "" ); - QTimer::singleShot ( 2000,this, - SLOT ( slotShowPassForm() ) ); - } - else - QTimer::singleShot ( 2000,broker, - SLOT ( getUserSessions() ) ); - + x2goDebug<<"Re-reading user's session profiles from broker."; + QTimer::singleShot ( 2000,broker, + SLOT ( getUserSessions() ) ); + } + else if ( brokerMode && config.brokerAutologoff ) + { + x2goDebug<<"Logging off from broker as requested via cmdline."; + QTimer::singleShot(1, this,SLOT(slotGetBrokerAuth())); + } + else if ( !embedMode ) + { + pass->setText ( "" ); + QTimer::singleShot ( 2000,this, + SLOT ( slotShowPassForm() ) ); } } else @@ -6375,6 +6380,12 @@ bool ONMainWindow::parseParameter ( QString param ) return true; } + if ( param == "--broker-autologoff") + { + config.brokerAutologoff=true; + return true; + } + if ( param == "--broker-noauth") { config.brokerNoAuth=true; @@ -8172,7 +8183,7 @@ void ONMainWindow::slotGpgAgentFinished ( int , QProcess::ExitStatus ) x2goDebug<<"SSH-ADD out: "<<sshout; - if(brokerMode) + if(brokerMode && (!config.brokerAutologoff)) { broker->getUserSessions(); } diff --git a/onmainwindow.h b/onmainwindow.h index 86f04ec..61e730f 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -166,6 +166,7 @@ struct ConfigFile bool brokerAuthenticated; bool brokerNoAuth; bool brokerAutologin; + bool brokerAutologoff; QString brokerSshKey; QString iniFile; QString server; 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). [View Less]

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-30-g736ec9e
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via 736ec9e1531886250ab8b7986db9146dc73a7d2d (commit) from e3b87397d75a7e246d29c4f94b1368e092f27207 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: onmainwindow.… [View More]

1 0

x2goclient.git - build-main (branch) updated: 4.0.1.0-35-g047050e
by git-admin＠x2go.org 11 Sep '13

11 Sep '13

The branch, build-main has been updated via 047050ec7a4dfe5326a655cbd471ae8b5d35a31b (commit) from 2f8cdb2dd5778cdd8104c6427c25167f7c0c3bf9 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/rules … [View More]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits September 2013