[X2Go-Dev] [X2Go-Commits] [x2goclient] 01/02: Reformat onmainwindow.cpp

[Michael DePaulo]

On Tue, Feb 17, 2015 at 6:18 AM,  <git-admin at x2go.org> wrote:
> This is an automated email from the git hooks/post-receive script.
>
> x2go pushed a commit to branch master
> in repository x2goclient.
>
> commit 2b105f11d73998111956b9964292ff23583d29f4
> Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
> Date:   Tue Feb 17 12:15:18 2015 +0100
>
>     Reformat onmainwindow.cpp
> ---
>  debian/changelog |    1 +
>  onmainwindow.cpp |    6 +++---
>  2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/debian/changelog b/debian/changelog
> index c40f3ab..14c1bca 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -5,6 +5,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
>      - Reformat onmainwindow.cpp
>      - Fix placement of session folders in session card column. (Fixes: #681).
>      - Send empty message in x2gohelper to stop AppStarting cursor. (Fixes: #616).
> +    - Reformat onmainwindow.cpp
>
>    [ Mike Gabriel ]
>    * New upstream release (4.0.3.2):
> diff --git a/onmainwindow.cpp b/onmainwindow.cpp
> index 6dadd87..5bb4210 100644
> --- a/onmainwindow.cpp
> +++ b/onmainwindow.cpp
> @@ -3032,7 +3032,7 @@ void ONMainWindow::slotSessEnter()
>
>      if(brokerMode)
>      {
> -       if (config.brokerNoAuth && brokerNoauthWithSessionUsername) {
> +        if (config.brokerNoAuth && brokerNoauthWithSessionUsername) {
>              config.brokerUser = login->text();
>          }
>          broker->selectUserSession(sessionExplorer->getLastSession()->id());
> @@ -9723,8 +9723,8 @@ void ONMainWindow::startPulsed()
>      else
>      {
>          pulseCookieArg="auth-cookie="+
> -            QDir::toNativeSeparators (wapiShortFileName( pulseBaseDir))+
> -            "\\.pulse-cookie";
> +                       QDir::toNativeSeparators (wapiShortFileName( pulseBaseDir))+
> +                       "\\.pulse-cookie";
>          // Double backslashes are required in config.pa
>          pulseCookieArg.replace("\\", "\\\\");
>          out << "load-module module-native-protocol-tcp port="+
>
> --
> Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

Hi Alex,

Did I mess up the whitespace with those last 2 lines?

I am asking because I want to avoid making the same mistake in the future.

-Mike