Home
Reading
Searching
Subscribe
Sponsors
Statistics
Posting
Contact
Spam
Lists
Links
About
Hosting
Filtering
Features Download
Marketing
Archives
FAQ
Blog
 
Gmane
From: X2Go dev team <git-admin-P0WSJaAXTow <at> public.gmane.org>
Subject: x2goclient.git - master (branch) updated: 4.0.0.0-29-g459bdd8
Newsgroups: gmane.linux.terminal-server.x2go.scm
Date: Friday 15th March 2013 15:26:57 UTC (over 3 years ago)
The branch, master has been updated
       via  459bdd89fcd867c68a3c48e99a50bd8a27538b29 (commit)
      from  bfa63c366057f870f71fa0686aa913db6525df0b (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 459bdd89fcd867c68a3c48e99a50bd8a27538b29
Author: Oleksandr Shneyder

Date:   Fri Mar 15 16:26:46 2013 +0100

    support for recent cygwin API on Windows

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    1 +
 onmainwindow.cpp |  205
++++++------------------------------------------------
 onmainwindow.h   |    3 -
 wapi.cpp         |   18 +++--
 wapi.h           |    2 +-
 5 files changed, 39 insertions(+), 190 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 74ef78e..4d537a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x2goclient (4.0.1.0-0~x2go1) UNRELEASED; urgency=low
     - fix ONMainWindow layout in broker mode
     - set passphrase for key to reverse ssh connection
       fix closing client after getting passphrase (Fixes #137) 
+    - support for recent cygwin API on Windows 
 
   [ Mike Gabriel ]
   * New upstream version (4.0.1.0):
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index c9741f8..e717c47 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -1399,10 +1399,6 @@ void ONMainWindow::closeClient()
         {
             removeCygwinEntry();
         }
-        if ( !cySolEntry )
-        {
-            removeCySolEntry();
-        }
 #endif
         cleanPortable();
     }
@@ -8419,7 +8415,7 @@ void ONMainWindow::startX2goMount()
     cuser="user";
 #endif
 #ifdef Q_OS_WIN
-    cuser="sshuser";
+    cuser=wapiGetUserName();
 #endif
     QString cmd;
     QString dirs=dir->dirList;
@@ -8854,20 +8850,10 @@ void ONMainWindow::startWinServers()
 // #endif
 }
 
-
-bool ONMainWindow::haveCySolEntry()
-{
-    QSettings CySolSt ( "HKEY_CURRENT_USER\\Software"
-                        "\\Cygnus Solutions",
-                        QSettings::NativeFormat );
-    return ( CySolSt.childGroups().count() > 0 ||
-             CySolSt.childKeys().count() > 0 );
-}
-
 bool ONMainWindow::haveCygwinEntry()
 {
     QSettings CygwSt ( "HKEY_CURRENT_USER\\Software"
-                       "\\Cygnus Solutions\\Cygwin",
+                       "\\Cygwin",
                        QSettings::NativeFormat );
     return ( CygwSt.childGroups().count() >0||CygwSt.childKeys().count()
);
 }
@@ -8878,17 +8864,6 @@ void ONMainWindow::saveCygnusSettings()
 {
     if ( ONMainWindow::portable )
     {
-        if ( haveCySolEntry() )
-        {
-            x2goDebug<<"Cygnus Solutions entry exist";
-            cySolEntry=true;
-        }
-        else
-        {
-            cySolEntry=false;
-            x2goDebug<<"Cygnus Solutions entry not exist";
-        }
-
         if ( haveCygwinEntry() )
         {
             x2goDebug<<"Cygwin entry exist";
@@ -8900,139 +8875,30 @@ void ONMainWindow::saveCygnusSettings()
             cyEntry=false;
         }
     }
-
-    QSettings etcst ( "HKEY_CURRENT_USER\\Software"
-                      "\\Cygnus Solutions\\Cygwin\\mounts v2\\/etc",
-                      QSettings::NativeFormat );
-    oldEtcDir=QString::null;
-    oldEtcDir=etcst.value ( "native",oldEtcDir ).toString();
-    x2goDebug<<"old etc:"<
				
			
 
CD: 17ms