[X2Go-Commits] x2godesktopsharing.git - build-main (branch) updated: 3.0.1.2-17-g3c4601b

[X2Go dev team]

The branch, build-main has been updated
       via  3c4601b7ec0af5717bdd9e6983e451efd1c4b67f (commit)
      from  0720d15908712b9f3c3390e46515bdd3fcd8b550 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 sharetray.h |   78 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

The diff of changes is:
diff --git a/sharetray.h b/sharetray.h
index d2c2531..4119244 100644
--- a/sharetray.h
+++ b/sharetray.h
@@ -29,7 +29,7 @@ class QSocketNotifier;
 */
 class ShareTray : public QMainWindow
 {
-    Q_OBJECT
+	Q_OBJECT
 public:
 	ShareTray();
 	~ShareTray();
@@ -42,52 +42,52 @@ public:
 	// entry point for incoming connections
 	bool acceptConnections();
 private:
-    enum {BLACK,WHITE} current_list;
-    QMenu* menu;
-    QWidget* mainWnd;
-    QAction* actStart;
-    QAction* actStop;
-    QAction* actWhite;
-    QAction* actBlack;
-    QSystemTrayIcon* trayIcon;
-    QLocalServer* serverSocket;
-    QString socketFname;
-    QString lockFname;
-    MessageBox* mbox;
-    QStringList whiteList;
-    QStringList blackList;
-    Ui::mwnd ui;
-    bool menuClose;
+	enum {BLACK,WHITE} current_list;
+	QMenu* menu;
+	QWidget* mainWnd;
+	QAction* actStart;
+	QAction* actStop;
+	QAction* actWhite;
+	QAction* actBlack;
+	QSystemTrayIcon* trayIcon;
+	QLocalServer* serverSocket;
+	QString socketFname;
+	QString lockFname;
+	MessageBox* mbox;
+	QStringList whiteList;
+	QStringList blackList;
+	Ui::mwnd ui;
+	bool menuClose;
 protected:
-    void closeEvent ( QCloseEvent* event );
+	void closeEvent ( QCloseEvent* event );
 
 public slots:
 	// Qt signal handlers.
 	void handleSigKeybInt();
 	void handleSigTerm();
 private slots:
-    void slotStopSharing();
-    void slotStartSharing();
-    void slotServerConnection();
-    void slotCloseConnection(AccessAction* action);
-    void slotTimer();
-    void slotWhiteList();
-    void slotBlackList();
-    void slotAboutQt();
-    void slotAbout();
-    void slotMsgClose(QAbstractButton*);
-    void slotMsgOkCancel(QAbstractButton* button);
-    void slotDelListItem();
-    void slotMenuClose();
-    void slotUpdateLockFile();
+	void slotStopSharing();
+	void slotStartSharing();
+	void slotServerConnection();
+	void slotCloseConnection(AccessAction* action);
+	void slotTimer();
+	void slotWhiteList();
+	void slotBlackList();
+	void slotAboutQt();
+	void slotAbout();
+	void slotMsgClose(QAbstractButton*);
+	void slotMsgOkCancel(QAbstractButton* button);
+	void slotDelListItem();
+	void slotMenuClose();
+	void slotUpdateLockFile();
 private:
-    int getAccess(QString user, QString host);
-    void trayMessage(QString title, QString text);
-    bool isProcessRunning(QString pid);
-    void loadSettings();
-    void saveSettings();
-    void setTrayIcon();
-    void showList();
+	int getAccess(QString user, QString host);
+	void trayMessage(QString title, QString text);
+	bool isProcessRunning(QString pid);
+	void loadSettings();
+	void saveSettings();
+	void setTrayIcon();
+	void showList();
 	// unix file sockets for signal handler communication (unix <-> Qt)
 	static int sigkeybintFd[2];
 	static int sigtermFd[2];


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).