[X2Go-Commits] [x2goclient] 03/138: x2goclient.cpp: wrap X2Go Client main function and use that.
git-admin at x2go.org
git-admin at x2go.org
Mon Jan 18 22:48:04 CET 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 07b3e5351d9f378c400aa6cc2264ef39d32962d5
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 b8d5ae9..a186fcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
know what you're doing. If you ponder using this, you probably don't.
- {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.
* debian/control:
- Change apache2-dev | libc6-dev build dependency back to apache2-dev
only. Otherwise, apache2-dev is not installed at all, even though
diff --git a/src/x2goclient.cpp b/src/x2goclient.cpp
index 015bbce..fb63fe5 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
More information about the x2go-commits
mailing list