[X2Go-Commits] [x2goclient] 03/31: x2goclient.cpp: wrap X2Go Client main function and use that.

[git-admin at x2go.org]

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

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

commit 7b782097c3f6b71a0ff502db577dd633f697a2c9
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Mar 15 00:03:42 2015 +0100

    x2goclient.cpp: wrap X2Go Client main function and use that.
---
 debian/changelog   |    1 +
 src/x2goclient.cpp |    6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7e83ab0..0dd8e59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -247,6 +247,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
       were not correctly updated. Fixes: #828.
     - {unixhelper.{cpp,h},x2goclient.pro{,.maemo}}: add unixhelper stub.
     - unixhelper.{cpp,h}: implement cleanup program for process group.
+    - x2goclient.cpp: wrap X2Go Client main function and use that.
 
   [ Fernando Pedemonte ]
   * New upstream release (4.0.4.0):
diff --git a/src/x2goclient.cpp b/src/x2goclient.cpp
index a619cd7..80fd967 100644
--- a/src/x2goclient.cpp
+++ b/src/x2goclient.cpp
@@ -17,7 +17,11 @@
 
 #include "ongetpass.h"
 
+int wrap_x2go_main (int argc, char **argv) {
+  return (x2goMain (argc, argv));
+}
+
 int main(int argc, char *argv[])
 {
-	return x2goMain(argc,argv);
+	return (wrap_x2go_main (argc, argv));
 }

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