[X2Go-Commits] [x2goclient] 01/02: misc: whitespace only.
git-admin at x2go.org
git-admin at x2go.org
Thu Jan 28 22:40:19 CET 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goclient.
commit d1b9f60c4838a296ae35fa70562fa3ae74622c65
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Jan 28 22:39:30 2016 +0100
misc: whitespace only.
---
Doxyfile | 72 +++++++++++------------
debian/changelog | 28 ++++-----
examples/x2goclient-cli | 14 ++---
man/man1/x2goclient.1 | 4 +-
portable/stopu3client.cpp | 2 +-
provider/share/x2goplugin.html | 8 +--
src/clicklineedit.cpp | 4 +-
src/configwidget.h | 2 +-
src/cupsprintersettingsdialog.h | 4 +-
src/editconnectiondialog.cpp | 6 +-
src/imgframe.cpp | 2 +-
x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri | 4 +-
x2goclient.spec | 2 +-
13 files changed, 76 insertions(+), 76 deletions(-)
diff --git a/Doxyfile b/Doxyfile
index 75d629d..b28a913 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -5,7 +5,7 @@
#---------------------------------------------------------------------------
PROJECT_NAME = x2goclient
PROJECT_NUMBER = $VERSION$
-OUTPUT_DIRECTORY =
+OUTPUT_DIRECTORY =
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
USE_WINDOWS_ENCODING = NO
@@ -26,7 +26,7 @@ ALWAYS_DETAILED_SEC = NO
INLINE_INHERITED_MEMB = NO
FULL_PATH_NAMES = YES
STRIP_FROM_PATH = /home/admin/
-STRIP_FROM_INC_PATH =
+STRIP_FROM_INC_PATH =
SHORT_NAMES = NO
JAVADOC_AUTOBRIEF = NO
MULTILINE_CPP_IS_BRIEF = NO
@@ -34,7 +34,7 @@ DETAILS_AT_TOP = NO
INHERIT_DOCS = YES
DISTRIBUTE_GROUP_DOC = NO
TAB_SIZE = 8
-ALIASES =
+ALIASES =
OPTIMIZE_OUTPUT_FOR_C = NO
OPTIMIZE_OUTPUT_JAVA = NO
SUBGROUPING = YES
@@ -62,11 +62,11 @@ GENERATE_TODOLIST = YES
GENERATE_TESTLIST = YES
GENERATE_BUGLIST = YES
GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS =
+ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = YES
SHOW_DIRECTORIES = NO
-FILE_VERSION_FILTER =
+FILE_VERSION_FILTER =
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
@@ -76,7 +76,7 @@ WARN_IF_UNDOCUMENTED = YES
WARN_IF_DOC_ERROR = YES
WARN_NO_PARAMDOC = NO
WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE =
+WARN_LOGFILE =
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
@@ -128,15 +128,15 @@ FILE_PATTERNS = *.c \
*.xpm \
*.dox
RECURSIVE = yes
-EXCLUDE =
+EXCLUDE =
EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS =
-EXAMPLE_PATH =
+EXCLUDE_PATTERNS =
+EXAMPLE_PATH =
EXAMPLE_PATTERNS = *
EXAMPLE_RECURSIVE = NO
-IMAGE_PATH =
-INPUT_FILTER =
-FILTER_PATTERNS =
+IMAGE_PATH =
+INPUT_FILTER =
+FILTER_PATTERNS =
FILTER_SOURCE_FILES = NO
#---------------------------------------------------------------------------
# configuration options related to source browsing
@@ -152,20 +152,20 @@ VERBATIM_HEADERS = YES
#---------------------------------------------------------------------------
ALPHABETICAL_INDEX = NO
COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
+IGNORE_PREFIX =
#---------------------------------------------------------------------------
# configuration options related to the HTML output
#---------------------------------------------------------------------------
GENERATE_HTML = YES
HTML_OUTPUT = .build_doxygen/doxygen/html
HTML_FILE_EXTENSION = .html
-HTML_HEADER =
-HTML_FOOTER =
-HTML_STYLESHEET =
+HTML_HEADER =
+HTML_FOOTER =
+HTML_STYLESHEET =
HTML_ALIGN_MEMBERS = YES
GENERATE_HTMLHELP = NO
-CHM_FILE =
-HHC_LOCATION =
+CHM_FILE =
+HHC_LOCATION =
GENERATE_CHI = NO
BINARY_TOC = NO
TOC_EXPAND = NO
@@ -182,8 +182,8 @@ LATEX_CMD_NAME = latex
MAKEINDEX_CMD_NAME = makeindex
COMPACT_LATEX = NO
PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
+EXTRA_PACKAGES =
+LATEX_HEADER =
PDF_HYPERLINKS = NO
USE_PDFLATEX = NO
LATEX_BATCHMODE = NO
@@ -195,8 +195,8 @@ GENERATE_RTF = NO
RTF_OUTPUT = .build_doxygen/doxygen/rtf
COMPACT_RTF = NO
RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
#---------------------------------------------------------------------------
# configuration options related to the man page output
#---------------------------------------------------------------------------
@@ -209,8 +209,8 @@ MAN_LINKS = NO
#---------------------------------------------------------------------------
GENERATE_XML = NO
XML_OUTPUT = .build_doxygen/doxygen/xml
-XML_SCHEMA =
-XML_DTD =
+XML_SCHEMA =
+XML_DTD =
XML_PROGRAMLISTING = YES
#---------------------------------------------------------------------------
# configuration options for the AutoGen Definitions output
@@ -222,29 +222,29 @@ GENERATE_AUTOGEN_DEF = NO
GENERATE_PERLMOD = NO
PERLMOD_LATEX = NO
PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
+PERLMOD_MAKEVAR_PREFIX =
#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
+# Configuration options related to the preprocessor
#---------------------------------------------------------------------------
ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = NO
EXPAND_ONLY_PREDEF = NO
SEARCH_INCLUDES = YES
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED =
-EXPAND_AS_DEFINED =
+INCLUDE_PATH =
+INCLUDE_FILE_PATTERNS =
+PREDEFINED =
+EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration::additions related to external references
#---------------------------------------------------------------------------
-TAGFILES =
+TAGFILES =
GENERATE_TAGFILE = x2goclient.tag
ALLEXTERNALS = NO
EXTERNAL_GROUPS = YES
PERL_PATH = /usr/bin/perl
#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
+# Configuration options related to the dot tool
#---------------------------------------------------------------------------
CLASS_DIAGRAMS = YES
HIDE_UNDOC_RELATIONS = YES
@@ -260,8 +260,8 @@ CALL_GRAPH = NO
GRAPHICAL_HIERARCHY = YES
DIRECTORY_GRAPH = YES
DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
+DOT_PATH =
+DOTFILE_DIRS =
MAX_DOT_GRAPH_WIDTH = 1024
MAX_DOT_GRAPH_HEIGHT = 1024
MAX_DOT_GRAPH_DEPTH = 1000
@@ -270,6 +270,6 @@ DOT_MULTI_TARGETS = NO
GENERATE_LEGEND = YES
DOT_CLEANUP = YES
#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
+# Configuration::additions related to the search engine
#---------------------------------------------------------------------------
SEARCHENGINE = NO
diff --git a/debian/changelog b/debian/changelog
index 24053a2..d8d113a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1019,7 +1019,7 @@ x2goclient (4.0.2.1-0x2go1) unstable; urgency=low
session is disconnected.
- Don't start pulse on Windows, until we really have to start a session
that requires pulse support.
- - Check if sound is activated before starting pulse.
+ - Check if sound is activated before starting pulse.
- Fix starting sshd on Win XP. (Fixes: #421).
- Fix "fullscreen" mode on Windows 7 with multiple monitors.
@@ -1046,7 +1046,7 @@ x2goclient (4.0.2.1-0x2go1) unstable; urgency=low
CVEs announced on 2014-06-05.
(Win32 OpenSSL was also updated to 1.0.1h in 4.0.2.0+build3.)
- Windows: VcXsrv (XP Compatible) updated from 1.14.3.1 to 1.14.3.2.
- Fixes CVE-2014-0209, CVE-2014-0210, and CVE-2014-0211
+ Fixes CVE-2014-0209, CVE-2014-0210, and CVE-2014-0211
(VcXsrv was also updated to 1.14.3.2 in 4.0.2.0+build2.)
- Windows: Switch from regular NSIS 2.46 to Unicode NSIS 2.46.5
(Fixes: #528)
@@ -1058,7 +1058,7 @@ x2goclient (4.0.2.0-0x2go1) unstable; urgency=low
[ Oleksandr Shneyder ]
* New upstream version (4.0.2.0):
- Revrite SSH Classes to support libssh fix.
- - Add Class HelpDialog to show options in scroll area.
+ - Add Class HelpDialog to show options in scroll area.
- Fix authentication on SSH Broker with key + passphrase.
- Set modmap timer timeout to 10 sec on Mac.
- Fix running xmodmap if X2Go Client not started from terminal.
@@ -1174,7 +1174,7 @@ x2goclient (4.0.1.3-0x2go1) unstable; urgency=low
* New upstream version (4.0.1.3):
- changed keyboard settings. Supported modes: auto, none and config with
model/layout(variant)
- - Enables forwarding (delegation) of GSSAPI credentials to the server.
+ - Enables forwarding (delegation) of GSSAPI credentials to the server.
- Make GSSAPI delegation configurable.
- Update Russian translation file.
- Rewrite SSH Classes to support libssh fix.
@@ -1278,14 +1278,14 @@ x2goclient (4.0.1.2-0x2go2) unstable; urgency=low
- Support for GSSApi(Kerberos 5) authentication. Using ssh/scp commands
on Linux and Mac and plink/pscp on Windows.
- Support for ChallengeResponseAuthentication (Google Authenticator)
- - Setting main window focus on mac (Fixes: #139).
- - Additional check if authentication with GSSApi successfull
+ - Setting main window focus on mac (Fixes: #139).
+ - Additional check if authentication with GSSApi successfull
- c121b7e2d3d83abdc2d7a29637bc3294e38b2ec3 broke checking if remote
command produce only stderr and not stdout. It made x2goclient crash
- if x2gostartagent send LIMIT error. Current commit fixes this issue.
+ if x2gostartagent send LIMIT error. Current commit fixes this issue.
- SshMasterConnection should use current user name if no user name is
specified in session settings
- - GSSApi(Kerberos 5) authentication for sshproxy and sshbroker
+ - GSSApi(Kerberos 5) authentication for sshproxy and sshbroker
- fixed GSSApi(Kerberos 5) authentication for sshproxy and sshbroker
on windows
@@ -1315,8 +1315,8 @@ x2goclient (4.0.1.1-0~x2go1) unstable; urgency=low
- Use "127.0.0.1" instead of localhost to avoid wrong IPv6 hostname
resolution. (Fixes: #151).
- Wait for x2gocmdexitmessage to return before closing in hidden mode.
- - Support for published applications in X2Go Plugin
- - Support for "shadow" mode in X2Go Plugin
+ - Support for published applications in X2Go Plugin
+ - Support for "shadow" mode in X2Go Plugin
[ Mike Gabriel ]
* New upstream version (4.0.1.1):
@@ -1957,7 +1957,7 @@ x2goclient (3.01-12) unstable; urgency=low
x2goclient (3.01-11) unstable; urgency=low
- * plugin config options sound, exportfs, adsl, compression, quality, dpi, kbdlayout, kbdtype
+ * plugin config options sound, exportfs, adsl, compression, quality, dpi, kbdlayout, kbdtype
-- Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de> Tue, 29 Jun 2010 18:12:48 +0200
@@ -2011,8 +2011,8 @@ x2goclient (3.01-4) unstable; urgency=low
* session limit error message
* warning by terminating session
* fixed help message
- * save pulseaudio client.conf and cookie on server
- * in session directory not in ~/.pulse/client.conf
+ * save pulseaudio client.conf and cookie on server
+ * in session directory not in ~/.pulse/client.conf
* (do not owerwrite local pulse settings for remote user)
* copy pulse cookie-file to remote system
* try to load module-native-protocol-tcp
@@ -2189,7 +2189,7 @@ x2goclient (2.0.1-9) unstable; urgency=low
-- Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de> Fri, 21 Sep 2007 19:31:59 +0200
x2goclient (2.0.1-8) unstable; urgency=low
-
+
* Fixed export directories with " " in path
* Fixed SessionButton frame size by empty session
* Compare session and display color depth
diff --git a/examples/x2goclient-cli b/examples/x2goclient-cli
index 15c323d..3b29206 100755
--- a/examples/x2goclient-cli
+++ b/examples/x2goclient-cli
@@ -192,7 +192,7 @@ exit;
}
sub printpack
-{
+{
my $m=$pack_methods;
$m=~s/%/[0-9]/g;
print "$m\n";
@@ -210,7 +210,7 @@ sub check_pack
my $pm=$pack_methods;
if(@arr>1)
- {
+ {
my $qa=@arr[@arr-1];
my @vals=unpack('cc',$qa);
if($qa ge '0' && $qa le '9' && @vals == 1)
@@ -533,16 +533,16 @@ else
sleep 2;
$dirpath="$nxroot/S-$sname";
-eval
-{
- mkpath($dirpath)
+eval
+{
+ mkpath($dirpath)
};
-if ($@)
+if ($@)
{
print "Couldn't create $dirpath: $@";
hidepass $askpass;
exit;
-}
+}
my $nx_host="nx/nx,composite=1,root=$nxroot,connect=localhost,cookie=$cookie,port=$gr_port,errors=$dirpath/session";
diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1
index 3a11198..087120d 100644
--- a/man/man1/x2goclient.1
+++ b/man/man1/x2goclient.1
@@ -222,7 +222,7 @@ Specify the <URL> of the X2Go Session Broker. X2Go Client can access http:// and
Syntax of <URL> for HTTP brokerage:
-http(s)://<user>:<password>@<hostname>:<port>/path/to/broker
+http(s)://<user>:<password>@<hostname>:<port>/path/to/broker
Syntax of <URL> for SSH brokerage:
@@ -266,7 +266,7 @@ Send a change-password request to an X2Go Session Broker. Not supported by all b
Informs the broker to use the username you entered for X2Go Server authentication when selecting a server/session. Only has functionality if --broker-noauth is used.
.SH LDAP OPTIONS (deprecated)
-NOTE: LDAP support won't be continued in X2Go Client 2 (next generation of X2Go Client).
+NOTE: LDAP support won't be continued in X2Go Client 2 (next generation of X2Go Client).
.PP
A slightly different approach than X2Go Client's LDAP functionality is available via the X2Go Session Brokerage feature.
.PP
diff --git a/portable/stopu3client.cpp b/portable/stopu3client.cpp
index d9826d2..bd84c64 100644
--- a/portable/stopu3client.cpp
+++ b/portable/stopu3client.cpp
@@ -17,7 +17,7 @@
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-/*
+/*
this is helper program to stop running in "portable" mode X2Go Client
before U3 USB-drive will be unmounted
diff --git a/provider/share/x2goplugin.html b/provider/share/x2goplugin.html
index d2a9474..0c0f058 100644
--- a/provider/share/x2goplugin.html
+++ b/provider/share/x2goplugin.html
@@ -9,10 +9,10 @@
src="location"
type="application/x2go"
name="x2goplugin"
- palette="background"
- height="100%"
- hspace="0"
- vspace="0"
+ palette="background"
+ height="100%"
+ hspace="0"
+ vspace="0"
width="100%"
x2goconfig="
session=X2Go-Demo-Session
diff --git a/src/clicklineedit.cpp b/src/clicklineedit.cpp
index 3695a85..660d4d6 100644
--- a/src/clicklineedit.cpp
+++ b/src/clicklineedit.cpp
@@ -23,7 +23,7 @@
ClickLineEdit::ClickLineEdit(QWidget * parent)
: QLineEdit(parent)
{
-
+
}
@@ -43,7 +43,7 @@ void ClickLineEdit::mouseReleaseEvent ( QMouseEvent * event )
// QLineEdit::focusInEvent(event);
// x2goDebug<<"focus in";
// }
-//
+//
// void ClickLineEdit::focusOutEvent ( QFocusEvent * event )
// {
// QLineEdit::focusOutEvent(event);
diff --git a/src/configwidget.h b/src/configwidget.h
index 8eed84a..ff715c9 100644
--- a/src/configwidget.h
+++ b/src/configwidget.h
@@ -28,7 +28,7 @@ class ONMainWindow;
class ConfigWidget : public QFrame
{
public:
- ConfigWidget ( QString id, ONMainWindow * mv,
+ ConfigWidget ( QString id, ONMainWindow * mv,
QWidget * parent = 0, Qt::WindowFlags f = 0 );
~ConfigWidget();
diff --git a/src/cupsprintersettingsdialog.h b/src/cupsprintersettingsdialog.h
index 03ce2a8..2b676c9 100644
--- a/src/cupsprintersettingsdialog.h
+++ b/src/cupsprintersettingsdialog.h
@@ -49,9 +49,9 @@ class CUPSPrinterSettingsDialog : public QDialog
void changeGeneralOption ( const QString& option,
const QString& val );
private slots:
- void slot_optionSelected ( QTreeWidgetItem * current,
+ void slot_optionSelected ( QTreeWidgetItem * current,
QTreeWidgetItem * previous );
- void slot_valueSelected ( QTreeWidgetItem * current,
+ void slot_valueSelected ( QTreeWidgetItem * current,
QTreeWidgetItem * previous );
void slot_reloadValues();
void slot_changePSize ( int ind );
diff --git a/src/editconnectiondialog.cpp b/src/editconnectiondialog.cpp
index 6c8e75a..6301def 100644
--- a/src/editconnectiondialog.cpp
+++ b/src/editconnectiondialog.cpp
@@ -86,9 +86,9 @@ EditConnectionDialog::EditConnectionDialog ( bool newSession, QString id, QWidge
SLOT ( slot_changeCaption ( const QString& ) ) );
connect ( this,SIGNAL ( accepted() ),this,SLOT ( slot_accepted() ) );
connect (sessSet, SIGNAL(directRDP(bool)), this, SLOT(slot_directRDP(bool)));
-
- connect (sessSet,
- SIGNAL(settingsChanged(QString,QString,QString)), otherSet,
+
+ connect (sessSet,
+ SIGNAL(settingsChanged(QString,QString,QString)), otherSet,
SLOT(setServerSettings(QString,QString,QString)));
ok->setDefault ( true );
diff --git a/src/imgframe.cpp b/src/imgframe.cpp
index 68977e5..4bca5f8 100644
--- a/src/imgframe.cpp
+++ b/src/imgframe.cpp
@@ -37,7 +37,7 @@ void IMGFrame::setBg(QImage* img)
setAutoFillBackground(true);
QPalette pal=palette();
pal.setBrush(QPalette::Window,QBrush(QPixmap::fromImage(*img)));
- setPalette(pal);
+ setPalette(pal);
}
}
diff --git a/x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri
index 14570b7..6b5f08d 100644
--- a/x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri
+++ b/x2gobrowserplugin-2.4_1/src/qtbrowserplugin.pri
@@ -1,7 +1,7 @@
TEMPLATE = lib
CONFIG += dll
win32-* {
- # Uncomment the following line to build a plugin that can be used also in
+ # Uncomment the following line to build a plugin that can be used also in
# Internet Explorer, through ActiveX.
# CONFIG += qaxserver
} else {
@@ -56,7 +56,7 @@ win32-* {
} else {
SOURCES += $$PWD/qtbrowserplugin_x11.cpp
INCLUDEPATH += /usr/include/X11
-
+
# Avoiding symbol clash with other instances of the Qt library
# (ref. developingplugins.html in the doc.):
#
diff --git a/x2goclient.spec b/x2goclient.spec
index f433d7d..b142974 100644
--- a/x2goclient.spec
+++ b/x2goclient.spec
@@ -206,7 +206,7 @@ fi
%files
%defattr(-,root,root)
-%doc AUTHORS COPYING LICENSE
+%doc AUTHORS COPYING LICENSE
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%dir %{_datadir}/icons/hicolor
--
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