[X2go-Commits] x2goclient.git - build-main (branch) updated: 3.99.0.5

X2go dev team git-admin at x2go.org
Fri Jan 27 12:44:30 CET 2012


The branch, build-main has been updated
       via  986a2d932a40c15530c2bc82fe68a01334e121d7 (commit)
       via  1f80f60284d577b08413ec97d0273c5f37bd614f (commit)
       via  3f2251d8ed0be9dc11d63c5e674bbbd9379b51dd (commit)
       via  c1978d323ecae3d457991efd0227b54648f55098 (commit)
       via  9466e124dec28220afaeebc9e42f0f3da8a6412c (commit)
       via  9be7d2eac5f8f4a24edc6b102ea55e09ac247ef3 (commit)
       via  85a3aed4bb827c77ce03e46ea3ef6cd07e8a7c55 (commit)
      from  1d1c2551d31b7f579e0596f43571da7dfa34c17b (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:
 LICENSE                    |    6 +-
 Makefile.docupload         |    2 +-
 VERSION                    |    2 +-
 brokerpassdlg.cpp          |    2 +-
 brokerpassdlg.h            |    2 +-
 contest.cpp                |    2 +-
 contest.h                  |    2 +-
 debian/changelog           |   18 +++-
 debian/copyright           |    8 +-
 desktop/x2goclient.desktop |    2 +-
 examples/x2goclient-cli    |    2 +-
 man/man1/x2goclient.1      |   10 +-
 ongetpass.cpp              |    2 +-
 onmainwindow.cpp           |    2 +-
 onmainwindow.h             |    2 +-
 onmainwindow_part2.cpp     |  303 ++++++++++++++++++++++----------------------
 onmainwindow_part3.cpp     |    2 +-
 onmainwindow_part4.cpp     |    2 +-
 onmainwindow_privat.h      |    2 +-
 portable/stopu3client.cpp  |    4 +-
 userbutton.cpp             |    2 +-
 userbutton.h               |    2 +-
 version.h                  |    2 +-
 x2goclient.cpp             |    2 +-
 x2goclient_de.ts           |    4 +-
 x2goclient_fr.ts           |    2 +-
 x2goclient_ru.ts           |    2 +-
 x2goplugin.rc              |   10 +-
 xsettingsui.ui             |    2 +-
 xsettingswidget.cpp        |    2 +-
 xsettingswidget.h          |    2 +-
 31 files changed, 214 insertions(+), 195 deletions(-)

The diff of changes is:
diff --git a/LICENSE b/LICENSE
index 82828ef..0479009 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2007  Obviously Nice - http://www.obviouslynice.de                                   
+Copyright (C) 2005-2012 Obviously Nice - http://www.obviouslynice.de                                   
                                                                           
 This program is free software; you can redistribute it and/or modify  
 it under the terms of the GNU General Public License as published by  
@@ -15,8 +15,8 @@ along with this program; if not, write to the
 Free Software Foundation, Inc.,                                       
 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             
 
-Copyright (C) 2007  Oleksandr Shneyder                              
+Copyright (C) 2005-2012 Oleksandr Shneyder                              
 oleksandr.shneyder at obviously-nice.de                                   
 
-Copyright (C) 2007  Heinz-Markus Graesing
+Copyright (C) 2005-2012 Heinz-Markus Graesing
 heinz-m.graesing at obviously-nice.de
diff --git a/Makefile.docupload b/Makefile.docupload
index fa2190f..6c3d232 100644
--- a/Makefile.docupload
+++ b/Makefile.docupload
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # Makefile.docupload file - for x2goclient
-# Copyright 2010-2011 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>, GPLv3 applies to this file
+# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>, GPLv3 applies to this file
 
 VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1`
 DOC_HOST=code.x2go.org
diff --git a/VERSION b/VERSION
index 7e58983..e98a62b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.99.0.4
+3.99.0.5
diff --git a/brokerpassdlg.cpp b/brokerpassdlg.cpp
index b3a7571..7d7432b 100644
--- a/brokerpassdlg.cpp
+++ b/brokerpassdlg.cpp
@@ -1,6 +1,6 @@
 /*
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2011  Oleksandr Shneyder
+    Copyright (C) 2005-2012 Oleksandr Shneyder
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/brokerpassdlg.h b/brokerpassdlg.h
index 90b3ba2..6123171 100644
--- a/brokerpassdlg.h
+++ b/brokerpassdlg.h
@@ -1,6 +1,6 @@
 /*
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2011 Oleksandr Shneyder
+    Copyright (C) 2005-2012 Oleksandr Shneyder
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/contest.cpp b/contest.cpp
index 2fe6895..cefab6b 100644
--- a/contest.cpp
+++ b/contest.cpp
@@ -1,6 +1,6 @@
 /*
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2011  Oleksandr Shneyder
+    Copyright (C) 2005-2012 Oleksandr Shneyder
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/contest.h b/contest.h
index ca34c57..e345148 100644
--- a/contest.h
+++ b/contest.h
@@ -1,6 +1,6 @@
 /*
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2011  Oleksandr Shneyder
+    Copyright (C) 2005-2012 Oleksandr Shneyder
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/debian/changelog b/debian/changelog
index 60c4563..ff3a618 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+x2goclient (3.99.0.5-0~x2go1) unstable; urgency=low
+
+  [ Mike Gabriel ]
+  * New upstream version (3.99.0.5):
+    - Rename in human readable text strings ,,X2go'' to ,,X2Go''.
+    - Fix version string on man page.
+
+  [ Oleksandr Shneyder ]
+  * New upstream version (3.99.0.5):
+    - Waiting for SshMasterConnection thread to be finished before
+      deleting it (segfault by wrong authentication fix).
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 27 Jan 2012 12:43:04 +0100
+
 x2goclient (3.99.0.4-0~x2go1) unstable; urgency=low
 
   [ Oleksandr Shneyder ]
@@ -49,7 +63,7 @@ x2goclient (3.99.0.1-0~x2go1) unstable; urgency=low
     - Add build_man/clean_man stanzas to Makefile.
   * Explicitly use source format 3.0 (native).
   * Build-depend on libssh-dev (>=0.4.7).
-  * Update menu file in /debian folder (rename title to ,,X2go Client (Qt)'').
+  * Update menu file in /debian folder (rename title to ,,X2Go Client (Qt)'').
   * Do not run man2html from rules file anymore.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 12 Oct 2011 11:11:50 +0200
@@ -113,7 +127,7 @@ x2goclient (3.01-18) unstable; urgency=low
 
 x2goclient (3.01-17) unstable; urgency=low
 
-  * Minimize X2go Client to system tray thank Joachim Langenbach <joachim at falaba.de> for patch
+  * Minimize X2Go Client to system tray thank Joachim Langenbach <joachim at falaba.de> for patch
 
  -- Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>  Thu, 27 Jan 2011 12:32:29 +0100
 
diff --git a/debian/copyright b/debian/copyright
index a340aaf..06180fc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Upstream Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
 
-Copyright (C) 2007-2011 X2Go Project - http://wiki.x2go.org
+Copyright (C) 2005-2012 X2Go Project - http://wiki.x2go.org
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -17,15 +17,15 @@ along with this program; if not, write to the
 Free Software Foundation, Inc.,
 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
-Copyright (C) 2007-2011  Oleksandr Shneyder
+Copyright (C) 2005-2012  Oleksandr Shneyder
 oleksandr.shneyder at obviously-nice.de
 
-Copyright (C) 2007-2011  Heinz-Markus Graesing
+Copyright (C) 2005-2012  Heinz-Markus Graesing
 heinz-m.graesing at obviously-nice.de
 
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
-The Debian packaging is (C) 2007-2011, Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de> and
+The Debian packaging is (C) 2005-2012 , Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de> and
 is licensed under the GPL, see above.
 
diff --git a/desktop/x2goclient.desktop b/desktop/x2goclient.desktop
index 5cc4280..6b1bca9 100644
--- a/desktop/x2goclient.desktop
+++ b/desktop/x2goclient.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Version=3.99.0.4
+Version=3.99.0.5
 Type=Application
 Name=X2Go Client
 Exec=/usr/bin/x2goclient
diff --git a/examples/x2goclient-cli b/examples/x2goclient-cli
index 1ed658c..65681ab 100755
--- a/examples/x2goclient-cli
+++ b/examples/x2goclient-cli
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 ############################################################################
-#    Copyright (C) 2006 by Oleksandr Shneyder                              #
+#    Copyright (C) 2006-2012 by Oleksandr Shneyder                              #
 #    oleksandr.shneyder at obviously-nice.de                                   #
 #                                                                          #
 #    This program is free software; you can redistribute it and/or modify  #
diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1
index b4f2bf4..f4c98c8 100644
--- a/man/man1/x2goclient.1
+++ b/man/man1/x2goclient.1
@@ -5,9 +5,9 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2goclient 1 "July 2011" "Version 3.0.1.x" "X2go Client (Qt4)"
+.TH x2goclient 1 "July 2011" "Version 3.99.0.x" "X2Go Client (Qt4)"
 .SH NAME
-x2goclient \- Client application to launch server-side X2go sessions.
+x2goclient \- Client application to launch server-side X2Go sessions.
 .SH SYNOPSIS
 'nh
 .fi
@@ -15,7 +15,7 @@ x2goclient \- Client application to launch server-side X2go sessions.
 \fBx2goclient\fR  <options>
 
 .SH DESCRIPTION
-\fBx2goclient\fR is a GUI application for launching server-side X2go sessions.
+\fBx2goclient\fR is a GUI application for launching server-side X2Go sessions.
 .PP
 .SH OPTIONS
 \fBx2goclient\fR has the following options:
@@ -80,7 +80,7 @@ Activate sound for session, not enabled by default.
 Which soundsystem to use: arts, esd, pulse (default: arts).
 .SH THIN CLIENT OPTIONS
 The following command line options are primarily interesting if \fBx2goclient\fR is used
-as a login manager on X2go thin clients.
+as a login manager on X2Go thin clients.
 .TP
 \*(T<\fB\-\-session=<session-profile-name>\fR\*(T>
 Pre-selection of session at client startup.
@@ -125,5 +125,5 @@ Failover LDAP Server portnumber (default: 389).
 Failover LDAP Server hostname.
 .PP
 .SH AUTHOR
-This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2Go project
 (http://www.x2go.org).
diff --git a/ongetpass.cpp b/ongetpass.cpp
index b3194e4..ef548d6 100644
--- a/ongetpass.cpp
+++ b/ongetpass.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005 by Oleksandr Shneyder   *
+ *   Copyright (C) 2005-2012 by Oleksandr Shneyder   *
  *   oleksandr.shneyder at obviously-nice.de   *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 81dce94..f583283 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-*   Copyright (C) 2005-2011 by Oleksandr Shneyder   *
+*   Copyright (C) 2005-2012 by Oleksandr Shneyder   *
 *   oleksandr.shneyder at obviously-nice.de   *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
diff --git a/onmainwindow.h b/onmainwindow.h
index 4a41d58..79d60e4 100644
--- a/onmainwindow.h
+++ b/onmainwindow.h
@@ -1,6 +1,6 @@
 
 /***************************************************************************
- *   Copyright (C) 2005-2011 by Oleksandr Shneyder   *
+ *   Copyright (C) 2005-2012 by Oleksandr Shneyder   *
  *   oleksandr.shneyder at obviously-nice.de   *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
diff --git a/onmainwindow_part2.cpp b/onmainwindow_part2.cpp
index aa98603..6201f5b 100644
--- a/onmainwindow_part2.cpp
+++ b/onmainwindow_part2.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-*   Copyright (C) 2005-2011 by Oleksandr Shneyder   *
+*   Copyright (C) 2005-2012 by Oleksandr Shneyder   *
 *   oleksandr.shneyder at obviously-nice.de   *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
@@ -26,7 +26,7 @@ void ONMainWindow::slotSshConnectionOk()
     passForm->setEnabled ( true );
     if ( useLdap )
     {
-	continueLDAPSession();
+        continueLDAPSession();
     }
     else
         continueNormalSession();
@@ -35,31 +35,31 @@ void ONMainWindow::slotSshConnectionOk()
 
 SshMasterConnection*  ONMainWindow::findServerSshConnection(QString host)
 {
-  for(int i=0;i<serverSshConnections.count();++i)
-  {
-    if(serverSshConnections[i])
+    for (int i=0;i<serverSshConnections.count();++i)
     {
-      if(serverSshConnections[i]->getHost()==host)
-	return serverSshConnections[i];
+        if (serverSshConnections[i])
+        {
+            if (serverSshConnections[i]->getHost()==host)
+                return serverSshConnections[i];
+        }
     }
-  }
-  return 0l;
+    return 0l;
 }
 
 void ONMainWindow::slotServSshConnectionOk(QString server)
 {
-        SshMasterConnection* con=findServerSshConnection(server);
-	if(!con)
-	  return;
-        SshProcess* lproc;
-        lproc=new SshProcess ( con,  this );
-        connect ( lproc,SIGNAL ( sshFinished ( bool,
-                                               QString,SshProcess* ) ),
-                  this,SLOT (
-                      slotListAllSessions ( bool,
-                                            QString,SshProcess* ) ) );
-	x2goDebug<<"getting sessions on "<<server<<endl;
-        lproc->startNormal ( "export HOSTNAME && x2golistsessions" );
+    SshMasterConnection* con=findServerSshConnection(server);
+    if (!con)
+        return;
+    SshProcess* lproc;
+    lproc=new SshProcess ( con,  this );
+    connect ( lproc,SIGNAL ( sshFinished ( bool,
+                                           QString,SshProcess* ) ),
+              this,SLOT (
+                  slotListAllSessions ( bool,
+                                        QString,SshProcess* ) ) );
+    x2goDebug<<"getting sessions on "<<server<<endl;
+    lproc->startNormal ( "export HOSTNAME && x2golistsessions" );
 }
 
 void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage )
@@ -80,6 +80,7 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage )
                tr ( "For security reasons, connection will be stopped" );
         if ( sshConnection )
         {
+            sshConnection->wait();
             delete sshConnection;
             sshConnection=0l;
         }
@@ -92,6 +93,7 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage )
                     "confuse your client into thinking the key does not exist" );
         if ( sshConnection )
         {
+            sshConnection->wait();
             delete sshConnection;
             sshConnection=0l;
         }
@@ -101,6 +103,7 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage )
     case SSH_SERVER_ERROR:
         if ( sshConnection )
         {
+            sshConnection->wait();
             delete sshConnection;
             sshConnection=0l;
         }
@@ -120,6 +123,7 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage )
     {
         if ( sshConnection )
         {
+            sshConnection->wait();
             delete sshConnection;
             sshConnection=0l;
         }
@@ -134,6 +138,7 @@ void ONMainWindow::slotSshUserAuthError ( QString error )
 {
     if ( sshConnection )
     {
+        sshConnection->wait();
         delete sshConnection;
         sshConnection=0l;
     }
@@ -168,14 +173,14 @@ void ONMainWindow::slotSessEnter()
         slotPassEnter();
         return;
     }
-    if(brokerMode)
+    if (brokerMode)
     {
-      if(!config.brokerAuthenticated)
-      {
-	x2goDebug<<"starting broker request";
-	slotStartBroker();
-	return;
-      }
+        if (!config.brokerAuthenticated)
+        {
+            x2goDebug<<"starting broker request";
+            slotStartBroker();
+            return;
+        }
     }
 
     resumingSession.sessionId=QString::null;
@@ -192,16 +197,16 @@ void ONMainWindow::slotSessEnter()
 void ONMainWindow::continueNormalSession()
 {
     x2goDebug<<"continue normal x2go session"<<endl;
-    if(brokerMode)
+    if (brokerMode)
     {
-      slotListSessions(true,QString::null,0);
-      return;
+        slotListSessions(true,QString::null,0);
+        return;
     }
     SshProcess* proc=new SshProcess ( sshConnection, this );
     connect ( proc,SIGNAL ( sshFinished ( bool,QString,SshProcess* ) ),
               this,SLOT ( slotListSessions ( bool, QString,
                                              SshProcess* ) ) );
-    if ( !shadowSession )      
+    if ( !shadowSession )
         proc->startNormal ( "export HOSTNAME && x2golistsessions" );
     else
         proc->startNormal ( "export HOSTNAME && x2golistdesktops" );
@@ -250,7 +255,7 @@ bool ONMainWindow::startSession ( const QString& sid )
         autologin=st.setting()->value ( sid+"/autologin",
                                         ( QVariant ) false ).toBool();
         krblogin=st.setting()->value ( sid+"/krblogin",
-                                        ( QVariant ) false ).toBool();
+                                       ( QVariant ) false ).toBool();
         if ( cmd=="SHADOW" )
             shadowSession=true;
     }
@@ -260,22 +265,22 @@ bool ONMainWindow::startSession ( const QString& sid )
         sshPort=config.sshport;
         selectedCommand=config.command;
     }
-    if(!brokerMode)
-       passwd=getCurrentPass();
+    if (!brokerMode)
+        passwd=getCurrentPass();
     else
     {
-      currentKey=config.key;
-      host=config.server;
-      X2goSettings st ( config.iniFile, QSettings::IniFormat );
-      passForm->setEnabled ( false );
-      user=st.setting()->value ( sid+"/user",
+        currentKey=config.key;
+        host=config.server;
+        X2goSettings st ( config.iniFile, QSettings::IniFormat );
+        passForm->setEnabled ( false );
+        user=st.setting()->value ( sid+"/user",
                                    ( QVariant ) QString::null ).toString();
-      login->setText(user);
-      sshPort=st.setting()->value ( sid+"/sshport",
-                                   ( QVariant ) "22" ).toString();
+        login->setText(user);
+        sshPort=st.setting()->value ( sid+"/sshport",
+                                      ( QVariant ) "22" ).toString();
     }
-    if(sshConnection)
-      sshConnection->disconnectSession();
+    if (sshConnection)
+        sshConnection->disconnectSession();
     sshConnection=startSshConnection ( host,sshPort,acceptRsa,user,passwd,autologin, krblogin );
     return true;
 }
@@ -480,70 +485,70 @@ void ONMainWindow::startNewSession()
             return;
         }
         sshConnection=findServerSshConnection(host);
-	if(!sshConnection)
+        if (!sshConnection)
         {
             QMessageBox::critical ( 0l,tr ( "Error" ),
                                     tr ( "Server not availabel" ),
                                     QMessageBox::Ok,
                                     QMessageBox::NoButton );
             return;
-        }	
+        }
     }
     else
     {
         X2goSettings* st;
-	
-	if(!brokerMode)
-	  st=new X2goSettings( "sessions" );
-	else
-	  st= new X2goSettings(config.iniFile,QSettings::IniFormat);
-        
-	QString sid;
+
+        if (!brokerMode)
+            st=new X2goSettings( "sessions" );
+        else
+            st= new X2goSettings(config.iniFile,QSettings::IniFormat);
+
+        QString sid;
         if ( !embedMode )
             sid=lastSession->id();
         else
             sid="embedded";
         pack=st->setting()->value ( sid+"/pack",
-                                   ( QVariant ) defaultPack ).toString();
+                                    ( QVariant ) defaultPack ).toString();
         fullscreen=st->setting()->value ( sid+"/fullscreen",
-                                         ( QVariant )
-                                         defaultFullscreen ).toBool();
+                                          ( QVariant )
+                                          defaultFullscreen ).toBool();
         height=st->setting()->value ( sid+"/height",
-                                     ( QVariant ) defaultHeight ).toInt();
+                                      ( QVariant ) defaultHeight ).toInt();
         width=st->setting()->value ( sid+"/width",
-                                    ( QVariant ) defaultWidth ).toInt();
+                                     ( QVariant ) defaultWidth ).toInt();
         setDPI=st->setting()->value ( sid+"/setdpi",
-                                     ( QVariant ) defaultSetDPI ).toBool();
+                                      ( QVariant ) defaultSetDPI ).toBool();
         dpi=st->setting()->value ( sid+"/dpi",
-                                  ( QVariant ) defaultDPI ).toUInt();
+                                   ( QVariant ) defaultDPI ).toUInt();
         quality=st->setting()->value (
                     sid+"/quality",
                     ( QVariant ) defaultQuality ).toInt();
         speed=st->setting()->value ( sid+"/speed",
-                                    ( QVariant ) defaultLink ).toInt();
+                                     ( QVariant ) defaultLink ).toInt();
 
         usekbd=st->setting()->value ( sid+"/usekbd",
-                                     ( QVariant ) defaultSetKbd ).toBool();
+                                      ( QVariant ) defaultSetKbd ).toBool();
         layout=st->setting()->value ( sid+"/layout",
-                                     ( QVariant )
-                                     defaultLayout[0] ).toString();
+                                      ( QVariant )
+                                      defaultLayout[0] ).toString();
         type=st->setting()->value ( sid+"/type",
-                                   ( QVariant )
-                                   defaultKbdType ).toString();
+                                    ( QVariant )
+                                    defaultKbdType ).toString();
         if ( !embedMode )
         {
             command=st->setting()->value ( sid+"/command",
-                                          ( QVariant ) defaultCmd ).toString();
+                                           ( QVariant ) defaultCmd ).toString();
             host=st->setting()->value (
                      sid+"/host",
                      ( QVariant )
                      ( QString ) "localhost" ).toString();
 
             rootless=st->setting()->value ( sid+"/rootless",
-                                           ( QVariant ) false ).toBool();
+                                            ( QVariant ) false ).toBool();
             xdmcpServer=st->setting()->value ( sid+"/xdmcpserver",
-                                              ( QVariant )
-                                              "localhost" ).toString();
+                                               ( QVariant )
+                                               "localhost" ).toString();
         }
         else
         {
@@ -552,7 +557,7 @@ void ONMainWindow::startNewSession()
             host=config.server;
             startEmbedded=false;
             if ( st->setting()->value ( sid+"/startembed",
-                                       ( QVariant ) true ).toBool() )
+                                        ( QVariant ) true ).toBool() )
             {
                 startEmbedded=true;
                 fullscreen=false;
@@ -599,9 +604,9 @@ void ONMainWindow::startNewSession()
     }
 
     resumingSession.server=host;
-    
-    if(defaultLayout.size()>0)
-	  layout=cbLayout->currentText();
+
+    if (defaultLayout.size()>0)
+        layout=cbLayout->currentText();
 
 
     QString geometry;
@@ -612,14 +617,14 @@ void ONMainWindow::startNewSession()
     proxyWinHeight=height;
 //#ifdef CFGCLIENT
     xorgMode=WIN;
-    if(fullscreen)
-      xorgMode=FS;
-    if(rootless)
-      xorgMode=SAPP;
+    if (fullscreen)
+        xorgMode=FS;
+    if (rootless)
+        xorgMode=SAPP;
     xorgWidth=QString::number(width);
     xorgHeight=QString::number(height);
-    if(! startXorgOnStart)
-      startXOrg();
+    if (! startXorgOnStart)
+        startXOrg();
 //#endif
 #endif
     if ( fullscreen )
@@ -779,7 +784,7 @@ void ONMainWindow::resumeSession ( const x2goSession& s )
         layout=defaultLayout[0];
         type=defaultKbdType;
         sshConnection=findServerSshConnection(host);
-	if(!sshConnection)
+        if (!sshConnection)
         {
             QMessageBox::critical ( 0l,tr ( "Error" ),
                                     tr ( "Server not availabel" ),
@@ -797,47 +802,47 @@ void ONMainWindow::resumeSession ( const x2goSession& s )
         else
             sid="embedded";
         X2goSettings* st;
-	if(!brokerMode)
-	  st=new X2goSettings( "sessions" );
-	else
-	  st=new X2goSettings(config.iniFile,QSettings::IniFormat);
+        if (!brokerMode)
+            st=new X2goSettings( "sessions" );
+        else
+            st=new X2goSettings(config.iniFile,QSettings::IniFormat);
 
         pack=st->setting()->value ( sid+"/pack",
-                                   ( QVariant ) defaultPack ).toString();
+                                    ( QVariant ) defaultPack ).toString();
 
         fullscreen=st->setting()->value ( sid+"/fullscreen",
-                                         ( QVariant )
-                                         defaultFullscreen ).toBool();
+                                          ( QVariant )
+                                          defaultFullscreen ).toBool();
         height=st->setting()->value ( sid+"/height",
-                                     ( QVariant ) defaultHeight ).toInt();
+                                      ( QVariant ) defaultHeight ).toInt();
         width=st->setting()->value ( sid+"/width",
-                                    ( QVariant ) defaultWidth ).toInt();
+                                     ( QVariant ) defaultWidth ).toInt();
         quality=st->setting()->value ( sid+"/quality",
-                                      ( QVariant )
-                                      defaultQuality ).toInt();
+                                       ( QVariant )
+                                       defaultQuality ).toInt();
         speed=st->setting()->value ( sid+"/speed",
-                                    ( QVariant ) defaultLink ).toInt();
+                                     ( QVariant ) defaultLink ).toInt();
         usekbd=st->setting()->value ( sid+"/usekbd",
-                                     ( QVariant ) defaultSetKbd ).toBool();
+                                      ( QVariant ) defaultSetKbd ).toBool();
         layout=st->setting()->value ( sid+"/layout",
-                                     ( QVariant )
-                                     defaultLayout[0] ).toString();
+                                      ( QVariant )
+                                      defaultLayout[0] ).toString();
         type=st->setting()->value ( sid+"/type",
-                                   ( QVariant )
-                                   defaultKbdType ).toString();
+                                    ( QVariant )
+                                    defaultKbdType ).toString();
         rootless=st->setting()->value ( sid+"/rootless",
-                                     ( QVariant ) false ).toBool();
+                                        ( QVariant ) false ).toBool();
 
         if ( !embedMode )
         {
             host=st->setting()->value ( sid+"/host",
-                                       ( QVariant ) s.server ).toString();
+                                        ( QVariant ) s.server ).toString();
         }
         else
         {
             startEmbedded=false;
             if ( st->setting()->value ( sid+"/startembed",
-                                       ( QVariant ) true ).toBool() )
+                                        ( QVariant ) true ).toBool() )
             {
                 fullscreen=false;
                 startEmbedded=true;
@@ -866,9 +871,9 @@ void ONMainWindow::resumeSession ( const x2goSession& s )
         }
         delete st;
     }
-    
-    if(defaultLayout.size()>0)
-	layout=cbLayout->currentText();
+
+    if (defaultLayout.size()>0)
+        layout=cbLayout->currentText();
 
     QString geometry;
 #ifdef Q_OS_WIN
@@ -877,16 +882,16 @@ void ONMainWindow::resumeSession ( const x2goSession& s )
     proxyWinHeight=height;
 // #ifdef CFGCLIENT
     xorgMode=WIN;
-    if(fullscreen)
-      xorgMode=FS;
-    if(rootless)
-      xorgMode=SAPP;
+    if (fullscreen)
+        xorgMode=FS;
+    if (rootless)
+        xorgMode=SAPP;
     xorgWidth=QString::number(width);
     xorgHeight=QString::number(height);
-    if(! startXorgOnStart)
-      startXOrg();
+    if (! startXorgOnStart)
+        startXOrg();
 // #endif
-    
+
 #endif
     if ( fullscreen )
     {
@@ -1229,18 +1234,18 @@ void ONMainWindow::slotSuspendSess()
     }
     else
     {
-      sshConnection=findServerSshConnection(host);
-      if(!sshConnection)
-      {
+        sshConnection=findServerSshConnection(host);
+        if (!sshConnection)
+        {
             QMessageBox::critical ( 0l,tr ( "Error" ),
                                     tr ( "Server not availabel" ),
                                     QMessageBox::Ok,
                                     QMessageBox::NoButton );
             return;
-      }
+        }
     }
 
-     
+
     suspendSession ( sessId );
 }
 
@@ -1338,18 +1343,18 @@ void ONMainWindow::slotTermSess()
     }
     else
     {
-      QString host=sessTv->model()->index ( sessTv->currentIndex().row(),
-                                            S_SERVER ).data().toString();
-					    
-      sshConnection=findServerSshConnection(host);
-      if(!sshConnection)
-      {
+        QString host=sessTv->model()->index ( sessTv->currentIndex().row(),
+                                              S_SERVER ).data().toString();
+
+        sshConnection=findServerSshConnection(host);
+        if (!sshConnection)
+        {
             QMessageBox::critical ( 0l,tr ( "Error" ),
                                     tr ( "Server not availabel" ),
                                     QMessageBox::Ok,
                                     QMessageBox::NoButton );
             return;
-      }
+        }
     }
 
     termSession ( sessId );
@@ -2023,17 +2028,17 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus )
     else
         proxyWinTimer->stop();
 // #ifdef CFGCLIENT
-    if(! startXorgOnStart)
-    {
-      if(xorg)
-      {
-	if(xorg->state() ==QProcess::Running)
-	{
-	  xorg->terminate();
-	  delete xorg;
-	  xorg=0;
-	}
-      }
+    if (! startXorgOnStart)
+    {
+        if (xorg)
+        {
+            if (xorg->state() ==QProcess::Running)
+            {
+                xorg->terminate();
+                delete xorg;
+                xorg=0;
+            }
+        }
     }
 // #endif
 #endif
@@ -2116,16 +2121,16 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus )
     {
         if ( !embedMode )
         {
-	  if(!brokerMode)
-	  {
-            pass->setText ( "" );
-            QTimer::singleShot ( 2000,this,
-                                 SLOT ( slotShowPassForm() ) );
-	  }
-	  else
-	                QTimer::singleShot ( 2000,broker,
-                                 SLOT ( getUserSessions() ) );
-	    
+            if (!brokerMode)
+            {
+                pass->setText ( "" );
+                QTimer::singleShot ( 2000,this,
+                                     SLOT ( slotShowPassForm() ) );
+            }
+            else
+                QTimer::singleShot ( 2000,broker,
+                                     SLOT ( getUserSessions() ) );
+
         }
     }
     else
@@ -2169,10 +2174,10 @@ void ONMainWindow::slotProxyStderr()
 #ifndef CFGPLUGIN
         if (trayEnabled)
         {
-	       if(!useLdap)
-	          trayIconActiveConnectionMenu->setTitle(lastSession->name());
-	       else
-		  trayIconActiveConnectionMenu->setTitle(lastUser->username());
+            if (!useLdap)
+                trayIconActiveConnectionMenu->setTitle(lastSession->name());
+            else
+                trayIconActiveConnectionMenu->setTitle(lastUser->username());
             trayIconActiveConnectionMenu->setEnabled(true);
             if (trayMinCon && !trayAutoHidden)
             {
diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp
index abd29f5..a2ff1e6 100644
--- a/onmainwindow_part3.cpp
+++ b/onmainwindow_part3.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-*   Copyright (C) 2005-2011 by Oleksandr Shneyder   *
+*   Copyright (C) 2005-2012 by Oleksandr Shneyder   *
 *   oleksandr.shneyder at obviously-nice.de   *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
diff --git a/onmainwindow_part4.cpp b/onmainwindow_part4.cpp
index 52b381d..39343a1 100644
--- a/onmainwindow_part4.cpp
+++ b/onmainwindow_part4.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-*   Copyright (C) 2005-2011 by Oleksandr Shneyder   *
+*   Copyright (C) 2005-2012 by Oleksandr Shneyder   *
 *   oleksandr.shneyder at obviously-nice.de   *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
diff --git a/onmainwindow_privat.h b/onmainwindow_privat.h
index 98cef6e..9e4375a 100644
--- a/onmainwindow_privat.h
+++ b/onmainwindow_privat.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2011 by Oleksandr Shneyder   *
+ *   Copyright (C) 2005-2012 by Oleksandr Shneyder   *
  *   oleksandr.shneyder at obviously-nice.de   *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
diff --git a/portable/stopu3client.cpp b/portable/stopu3client.cpp
index 2bfbd5d..3cc7c67 100644
--- a/portable/stopu3client.cpp
+++ b/portable/stopu3client.cpp
@@ -1,5 +1,5 @@
 /**************************************************************************
-*   Copyright (C) 2010 by Oleksandr Shneyder                              *
+*   Copyright (C) 2005-2012 by Oleksandr Shneyder                              *
 *   oleksandr.shneyder at obviously-nice.de                                  *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
@@ -19,7 +19,7 @@
 ***************************************************************************/
 /* 
 
-     this is helper program to stop running in "portable" mode X2go Client
+     this is helper program to stop running in "portable" mode X2Go Client
      before U3 USB-drive will be unmounted
 
 */
diff --git a/userbutton.cpp b/userbutton.cpp
index e77cf12..21787ca 100644
--- a/userbutton.cpp
+++ b/userbutton.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005 by Oleksandr Shneyder   *
+ *   Copyright (C) 2005-2012 by Oleksandr Shneyder   *
  *   oleksandr.shneyder at obviously-nice.de   *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
diff --git a/userbutton.h b/userbutton.h
index 03c5c84..7606d97 100644
--- a/userbutton.h
+++ b/userbutton.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005 by Oleksandr Shneyder   *
+ *   Copyright (C) 2005-2012 by Oleksandr Shneyder   *
  *   oleksandr.shneyder at obviously-nice.de   *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
diff --git a/version.h b/version.h
index 6e5c5e0..5647dc5 100644
--- a/version.h
+++ b/version.h
@@ -1 +1 @@
-#define VERSION "3.99.0.4"
+#define VERSION "3.99.0.5"
diff --git a/x2goclient.cpp b/x2goclient.cpp
index 580ee3b..d2d0b94 100644
--- a/x2goclient.cpp
+++ b/x2goclient.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010 by Oleksandr Shneyder   *
+ *   Copyright (C) 2005-2012 by Oleksandr Shneyder   *
  *   oleksandr.shneyder at obviously-nice.de   *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
diff --git a/x2goclient_de.ts b/x2goclient_de.ts
index 01de7a5..37176b3 100644
--- a/x2goclient_de.ts
+++ b/x2goclient_de.ts
@@ -2093,7 +2093,7 @@ Sie können SSHD über folgenden Befehl installieren:
     <message>
         <location filename="printdialog.ui" line="16"/>
         <source>Print - X2Go client</source>
-        <translation>Drucken - X2go Client</translation>
+        <translation>Drucken - X2Go Client</translation>
     </message>
 </context>
 <context>
@@ -2920,7 +2920,7 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="27"/>
-        <source>You must restart the X2go Client for the changes to take effect</source>
+        <source>You must restart the X2Go Client for the changes to take effect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts
index 6fcba31..1cd6797 100644
--- a/x2goclient_fr.ts
+++ b/x2goclient_fr.ts
@@ -2337,7 +2337,7 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="27"/>
-        <source>You must restart the X2go Client for the changes to take effect</source>
+        <source>You must restart the X2Go Client for the changes to take effect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/x2goclient_ru.ts b/x2goclient_ru.ts
index 46271fe..b49003a 100644
--- a/x2goclient_ru.ts
+++ b/x2goclient_ru.ts
@@ -2901,7 +2901,7 @@ sound system connections through firewalls</source>
     </message>
     <message>
         <location filename="xsettingsui.ui" line="27"/>
-        <source>You must restart the X2go Client for the changes to take effect</source>
+        <source>You must restart the X2Go Client for the changes to take effect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/x2goplugin.rc b/x2goplugin.rc
index 05ee2b0..2b05a07 100644
--- a/x2goplugin.rc
+++ b/x2goplugin.rc
@@ -1,8 +1,8 @@
 1 TYPELIB "x2goplugin.rc"
 
 1 VERSIONINFO
- FILEVERSION 3,99,0,4
- PRODUCTVERSION 3,99,0,4
+ FILEVERSION 3,99,0,5
+ PRODUCTVERSION 3,99,0,5
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -21,13 +21,13 @@ BEGIN
             VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0"
 	    VALUE "FileExtents", "x2go\0"
 	    VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0"
-            VALUE "FileVersion", "3, 99, 0 ,4\0"
+            VALUE "FileVersion", "3, 99, 0 ,5\0"
             VALUE "InternalName", "x2goplugin\0"
             VALUE "LegalCopyright", "Copyright © 2010-2012 Obviously Nice\0"
 	    VALUE "MIMEType", "application/x2go\0"
             VALUE "OriginalFilename", "npx2goplugin.dll\0"
-            VALUE "ProductName", "X2GoClient Plug-in 3.99.0.4\0"
-            VALUE "ProductVersion", "3, 99, 0, 4\0"
+            VALUE "ProductName", "X2GoClient Plug-in 3.99.0.5\0"
+            VALUE "ProductVersion", "3, 99, 0, 5\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/xsettingsui.ui b/xsettingsui.ui
index fa06cbf..2f85125 100644
--- a/xsettingsui.ui
+++ b/xsettingsui.ui
@@ -24,7 +24,7 @@
       </font>
      </property>
      <property name="text">
-      <string>You must restart the X2go Client for the changes to take effect</string>
+      <string>You must restart the X2Go Client for the changes to take effect</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
diff --git a/xsettingswidget.cpp b/xsettingswidget.cpp
index 7cd117b..a76fa61 100644
--- a/xsettingswidget.cpp
+++ b/xsettingswidget.cpp
@@ -1,6 +1,6 @@
 /*
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2011  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+    Copyright (C) 2005-2012 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/xsettingswidget.h b/xsettingswidget.h
index 0a441cf..0627350 100644
--- a/xsettingswidget.h
+++ b/xsettingswidget.h
@@ -1,6 +1,6 @@
 /*
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 2011  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+    Copyright (C) 2005-2012 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by


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).




More information about the x2go-commits mailing list