[X2Go-Commits] [x2goclient] 277/281: src/mediawidget.cpp: unify some redundant code.

git-admin at x2go.org git-admin at x2go.org
Thu Jan 19 13:06:26 CET 2017


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit ef62c5006787a4aed6bea2f3d3c15e3c83706ca5
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Dec 31 01:38:10 2016 +0100

    src/mediawidget.cpp: unify some redundant code.
---
 debian/changelog    |    1 +
 src/mediawidget.cpp |    9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b8dc55c..5621c1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -533,6 +533,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - src/onmainwindow.cpp: convert piece of code to non-Windows and
       non-Darwin, so that not only Linux but other operating systems are
       covered as well.
+    - src/mediawidget.cpp: unify some redundant code.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/src/mediawidget.cpp b/src/mediawidget.cpp
index c937ba4..16d837a 100644
--- a/src/mediawidget.cpp
+++ b/src/mediawidget.cpp
@@ -155,16 +155,13 @@ void MediaWidget::slot_sndSysSelected ( int system )
     }
     case ESD:
     {
+        rbStartSnd->hide ();
+        rbNotStartSnd->hide ();
+        cbSndSshTun->show ();
 #ifdef Q_OS_WIN
-        rbStartSnd->hide();
-        rbNotStartSnd->hide();
-        cbSndSshTun->show();
         cbSndSshTun->setEnabled ( false );
         cbSndSshTun->setChecked ( true );
 #elif defined (Q_OS_DARWIN)
-        rbStartSnd->hide ();
-        rbNotStartSnd->hide ();
-        cbSndSshTun->show ();
         cbSndSshTun->setEnabled (true);
 #endif /* defined (Q_OS_WIN) */
         sbSndPort->setValue ( 16001 );

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list