[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.1.1-12-g2016373

X2Go dev team git-admin at x2go.org
Wed Mar 21 14:23:10 CET 2012


The branch, master has been updated
       via  2016373e77172c9bea8990319244363b82df9f17 (commit)
      from  8e54131c45359c54d8241dda25ffaa2f69e8e249 (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 2016373e77172c9bea8990319244363b82df9f17
Author: Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>
Date:   Wed Mar 21 14:22:48 2012 +0100

    Some improvements when using pgp card.

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

Summary of changes:
 debian/changelog       |    1 +
 onmainwindow_part2.cpp |    5 +++--
 onmainwindow_part3.cpp |    2 +-
 onmainwindow_part4.cpp |   19 +++++++------------
 4 files changed, 12 insertions(+), 15 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c840c86..ebc326b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ x2goclient (3.99.2.0-0~x2go1) UNRELEASED; urgency=low
       "Terminate" with icons to fit in dialog window.
     - Support for SVG icons for published applications
     - Set "nofocus" policy for tool buttons.
+    - Some improvements when using pgp card.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 07 Mar 2012 21:02:15 +0100
 
diff --git a/onmainwindow_part2.cpp b/onmainwindow_part2.cpp
index f71648f..9412f9d 100644
--- a/onmainwindow_part2.cpp
+++ b/onmainwindow_part2.cpp
@@ -279,8 +279,9 @@ bool ONMainWindow::startSession ( const QString& sid )
         user=st.setting()->value ( sid+"/user",
                                    ( QVariant ) QString::null ).toString();
         login->setText(user);
-        sshPort=st.setting()->value ( sid+"/sshport",
-                                      ( QVariant ) "22" ).toString();
+        sshPort=config.sshport;
+        /*        sshPort=st.setting()->value ( sid+"/sshport",
+                                              ( QVariant ) "22" ).toString();*/
     }
     if (sshConnection)
         sshConnection->disconnectSession();
diff --git a/onmainwindow_part3.cpp b/onmainwindow_part3.cpp
index bac846f..f71311b 100644
--- a/onmainwindow_part3.cpp
+++ b/onmainwindow_part3.cpp
@@ -2135,7 +2135,7 @@ void ONMainWindow::slotGpgAgentFinished ( int , QProcess::ExitStatus )
 
     if ( !useLdap )
     {
-        if ( passForm->isVisible() )
+        if ( passForm->isVisible() && !brokerMode)
         {
             if ( passForm->isEnabled() )
             {
diff --git a/onmainwindow_part4.cpp b/onmainwindow_part4.cpp
index 1e55628..731937a 100644
--- a/onmainwindow_part4.cpp
+++ b/onmainwindow_part4.cpp
@@ -2526,18 +2526,13 @@ void ONMainWindow::slotGetBrokerSession(const QString& sinfo)
     int keyStartPos=sinfo.indexOf("-----BEGIN DSA PRIVATE KEY-----");
     QString endStr="-----END DSA PRIVATE KEY-----";
     int keyEndPos=sinfo.indexOf(endStr);
-    if (keyEndPos == -1 || keyStartPos == -1 || lst.size()==0)
-    {
-        //throw error
-        QMessageBox::critical (
-            0,tr ( "Error" ),
-            tr ("Invalid reply from broker") +"<br>"+sinfo);
-
-        close();
-        return;
-    }
-    config.server=(lst[1].split("\n"))[0];
-    config.key=sinfo.mid(keyStartPos, keyEndPos+endStr.length()-keyStartPos);
+    if (! (keyEndPos == -1 || keyStartPos == -1 || lst.size()==0))
+        config.key=sinfo.mid(keyStartPos, keyEndPos+endStr.length()-keyStartPos);
+    QString serverLine=(lst[1].split("\n"))[0];
+    QStringList words=serverLine.split(":",QString::SkipEmptyParts);
+    config.server=words[0];
+    if (words.count()>1)
+        config.sshport=words[1];
 //    x2goDebug<<"server: "<<config.server<<endl<<" key: "<<config.key;
     if (sinfo.indexOf("SESSION_INFO")!=-1)
     {


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