[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.2.2-50-g795c6a2

[X2Go dev team]

The branch, master has been updated
       via  795c6a2a57077e7d09cc0bf9e8bdca9e6a4b9f95 (commit)
      from  f33832a96043e4445ac4cbf1492da65f44011787 (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 795c6a2a57077e7d09cc0bf9e8bdca9e6a4b9f95
Author: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
Date:   Mon Sep 24 14:51:52 2012 +0200

    disable check box "use default sound port" if sound disabled

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

Summary of changes:
 debian/changelog   |    1 +
 settingswidget.cpp |   13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 00d0dea..f0e871c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,6 +54,7 @@ x2goclient (3.99.3.0-0~x2go1) UNRELEASED; urgency=low
     - Show "Advanced Options" button only if RDP session chosen
     - Fixing kbd focus issue for all kinds of sessions in thinclient mode 
     - Add command line parameter --ssh-key and --autologin 
+    - disable check box "use default sound port" if sound disabled
 
   [ Ricardo Diaz ]
   * New upstream version (3.99.3.0):
diff --git a/settingswidget.cpp b/settingswidget.cpp
index ed1b49b..6d35cd8 100644
--- a/settingswidget.cpp
+++ b/settingswidget.cpp
@@ -30,7 +30,7 @@
 
 SettingsWidget::SettingsWidget ( QString id, ONMainWindow * mw,
                                  QWidget * parent, Qt::WindowFlags f )
-        : ConfigWidget ( id,mw,parent,f )
+    : ConfigWidget ( id,mw,parent,f )
 {
     multiDisp=(QApplication::desktop()->screenCount()>1);
 #ifdef Q_WS_HILDON
@@ -359,7 +359,7 @@ void SettingsWidget::slot_identDisplays()
 {
     pbIdentDisp->setEnabled(false);
     identWins.clear();
-    for (int i=0;i<QApplication::desktop()->screenCount();++i)
+    for (int i=0; i<QApplication::desktop()->screenCount(); ++i)
     {
         QMainWindow *mw=new QMainWindow(
             this, Qt::FramelessWindowHint|Qt::X11BypassWindowManagerHint|Qt::WindowStaysOnTopHint);
@@ -467,7 +467,7 @@ void SettingsWidget::slot_sndStartClicked()
     {
         lSndPort->setEnabled ( true );
         sbSndPort->setEnabled ( true );
-        cbDefSndPort->setEnabled ( true );
+        cbDefSndPort->setEnabled ( true &&sound->isChecked());
     }
     else
     {
@@ -538,9 +538,9 @@ void SettingsWidget::readConfig()
     maxRes->setChecked(st.setting()->value ( sessionId+"/maxdim", false).toBool());
     QString client=st.setting()->value ( sessionId+"/rdpclient","rdesktop").toString();
     if(client=="rdesktop")
-      rRdesktop->setChecked(true);
+        rRdesktop->setChecked(true);
     else
-      rXfreeRDP->setChecked(true);
+        rXfreeRDP->setChecked(true);
     params->setText(st.setting()->value ( sessionId+"/directrdpsettings","").toString());
 #endif
 
@@ -620,6 +620,9 @@ void SettingsWidget::readConfig()
     slot_sndToggled ( snd );
     slot_sndStartClicked();
 
+    if(!sound)
+        cbDefSndPort->setEnabled(false);
+
     cbClientPrint->setChecked ( st.setting()->value ( sessionId+"/print",
                                 true ).toBool() );
 }


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