[X2Go-Commits] x2godesktopsharing.git - master (branch) updated: 3.1.0.6-6-gecdee93

X2Go dev team git-admin at x2go.org
Sat Jun 8 01:06:26 CEST 2013


The branch, master has been updated
       via  ecdee936ba5417aeab8e3528e1f9ec0847943922 (commit)
      from  05d1deeed592ada615eb0c6a253c3f53ee84c11a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ecdee936ba5417aeab8e3528e1f9ec0847943922
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Jun 8 01:06:22 2013 +0200

    Add cmd line parameter: --activate-desktop-sharing. Use this option to launch x2godesktopsharing applet in already-activate mode.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog              |    4 +++-
 man/man1/x2godesktopsharing.1 |   15 +++++++++------
 sharetray.cpp                 |   25 +++++++++++++++++++++++--
 sharetray.h                   |    1 +
 4 files changed, 36 insertions(+), 9 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ac4f6ae..c66c55e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,9 @@ x2godesktopsharing (3.1.1.0-0~x2go1) UNRELEASED; urgency=low
     - Add French translation file.
 
   [ Mike Gabriel ]
-  * Continue development...
+  * New upstream version (3.1.1.0):
+    - Add cmd line parameter: --activate-desktop-sharing. Use this option
+      to launch x2godesktopsharing applet in already-activate mode.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 10 Jan 2013 10:06:02 +0100
 
diff --git a/man/man1/x2godesktopsharing.1 b/man/man1/x2godesktopsharing.1
index eb154a1..d059d04 100644
--- a/man/man1/x2godesktopsharing.1
+++ b/man/man1/x2godesktopsharing.1
@@ -5,21 +5,24 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH x2godesktopsharing 1 "14 Apr 2011" "Version 3.0.1.x" "X2go Application"
+.TH x2godesktopsharing 1 "Jun 2013" "Version 3.0.1.x" "X2go Application"
 .SH NAME
-x2godesktopsharing \- Share an X2go desktop with other clients and users.
+x2godesktopsharing \- Share an X2Go desktop with other clients and users.
 .SH SYNOPSIS
 'nh
 .fi
 .ad l
-\fBx2godesktopsharing\fR 
+\fBx2godesktopsharing\fR \fI[options]\fR
 
 .SH DESCRIPTION
-\fBx2godesktopsharing\fR is a system tray tool that allows a user to give/control access to his/her X/X2go
-session (via shadow session support in NX libraries).
+\fBx2godesktopsharing\fR is a system tray tool that allows a user to give other users (i.e. helpdesk staff)
+control/access to his/her X/X2Go desktop session.
 .PP
 .SH OPTIONS
-\fBx2godesktopsharing\fR has no known options.
+\fBx2godesktopsharing\fR accepts the following options:
+.TP
+\*(T<\fB\-\-activate-desktop-sharing\fR\*(T>
+Activate desktop sharing on applet startup. The default is: desktop sharing is disabled.
 .PP
 .SH AUTHOR
 This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
diff --git a/sharetray.cpp b/sharetray.cpp
index 7c74d24..ffc07d0 100644
--- a/sharetray.cpp
+++ b/sharetray.cpp
@@ -173,8 +173,6 @@ ShareTray::ShareTray()
 	connect ( actStop,SIGNAL ( triggered ( bool ) ),this,
 	          SLOT ( slotStopSharing() ) );
 
-
-
 	actStop->setEnabled ( false );
 
 	// unix signals (TERM, INT) are piped into a unix socket and will raise Qt events
@@ -202,6 +200,17 @@ ShareTray::ShareTray()
 	QTimer *timer = new QTimer ( this );
 	connect ( timer, SIGNAL ( timeout() ), this, SLOT ( slotTimer() ) );
 	timer->start ( 5000 );
+
+	QStringList args=QCoreApplication::arguments();
+	for ( int i=1; i<args.size(); ++i )
+	{
+		if ( !parseParameter ( args[i] ) )
+		{
+			close();
+			exit (-1);
+		}
+	}
+
 	loadSettings();
 	setTrayIcon();
 	trayIcon->show();
@@ -219,6 +228,18 @@ ShareTray::~ShareTray()
 	qDebug() <<"settings saved";
 }
 
+
+bool ShareTray::parseParameter( QString param )
+{
+	if ( param == "--activate-desktop-sharing" )
+	{
+		slotStartSharing();
+		return true;
+	}
+	return false;
+}
+
+
 void ShareTray::handleSigKeybInt()
 {
 	snKeybInt->setEnabled(false);
diff --git a/sharetray.h b/sharetray.h
index bc4ec19..1a2c8c5 100644
--- a/sharetray.h
+++ b/sharetray.h
@@ -44,6 +44,7 @@ public:
 	bool acceptConnections();
 private:
 	enum {BLACK,WHITE} current_list;
+	bool parseParameter(QString param);
 	QMenu* menu;
 	QWidget* mainWnd;
 	QAction* actStart;


hooks/post-receive
-- 
x2godesktopsharing.git (Desktop Sharing for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2godesktopsharing.git" (Desktop Sharing for X2Go).




More information about the x2go-commits mailing list