This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2godesktopsharing. from e31b9e6 debian/rules: Add dh_clean override, so that the build dir gets tidied up properly after build (this really needs to go into the qmake .pro file, but debian/rules is easier...). new 3657d1d Add possibility to have a system-wide settings file in /etc/x2godesktopsharing/settings. new cf816df Make the desktop sharing group configurable system-wide and by the user. new 9320515 debian/<config>: Add debconf configuration dialogs that facilitate setting the system-wide default desktop sharing user. new 1e7e2a6 debian/control: Use https:// URLs in Vcs-Browser: and Homepage: fields. new 09574e0 debian/control: Drop empty R field. new 96fb857 debian/copyright: Turn into DEP-5 copyright file format style. new dd08460 debian/rules: Pass-through of compiler flags to qmake call. new 5ef0b28 man/man8/x2goterminate-desktopsharing.8: Grammar fix. new d7e1290 debian/rules: Run lrelease during auto-configure. Makes sure all resources are available for building the executable. new 6930477 resources.qrc: Rename file from resources.rcc. new 582b04c debian/x2godesktopsharing.install: Add EOL at EOF. new ef3dfac Replace QMessageBox based access dialog by a QDialog based access dialog. QMessageBox in Qt5 is not suitable for adding a QCheckBox widget into it anymore. new b5bbdb0 debian/copyright: Update copyright attributions. The 13 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: accessdialog.cpp | 62 +++++++++++ accessdialog.h | 36 +++++++ debian/changelog | 22 ++++ debian/control | 5 +- debian/copyright | 138 +++++++++++++++++++----- debian/po/POTFILES.in | 1 + debian/po/templates.pot | 124 +++++++++++++++++++++ debian/rules | 7 +- debian/settings | 2 + debian/x2godesktopsharing.config | 65 +++++++++++ debian/x2godesktopsharing.dirs | 1 + debian/x2godesktopsharing.install | 3 +- debian/x2godesktopsharing.postinst | 67 +++++++++--- debian/x2godesktopsharing.postrm | 40 +++++++ debian/x2godesktopsharing.templates | 61 +++++++++++ icons/svg/dialog-question.svg | 185 ++++++++++++++++++++++++++++++++ man/man8/x2goterminate-desktopsharing.8 | 2 +- messagebox.cpp | 38 ------- messagebox.h | 31 ------ resources.rcc => resources.qrc | 1 + sharetray.cpp | 150 ++++++++++++++++++++------ sharetray.h | 13 ++- x2godesktopsharing.pro | 7 +- 23 files changed, 900 insertions(+), 161 deletions(-) create mode 100644 accessdialog.cpp create mode 100644 accessdialog.h create mode 100644 debian/po/POTFILES.in create mode 100644 debian/po/templates.pot create mode 100644 debian/settings create mode 100755 debian/x2godesktopsharing.config create mode 100755 debian/x2godesktopsharing.postrm create mode 100644 debian/x2godesktopsharing.templates create mode 100644 icons/svg/dialog-question.svg delete mode 100644 messagebox.cpp delete mode 100644 messagebox.h rename resources.rcc => resources.qrc (96%) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 3657d1d62d097c98ffca3b47de1d8ecba7127d59 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Nov 11 18:08:13 2018 +0100 Add possibility to have a system-wide settings file in /etc/x2godesktopsharing/settings. The user preferences always supersede the system-wide settings, so system-wide settings can act as a default set of settings, but not as a limitation to the user. --- debian/changelog | 4 +++ sharetray.cpp | 93 ++++++++++++++++++++++++++++++++++++++++---------------- sharetray.h | 12 +++++--- 3 files changed, 79 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index b61b68c..2505da0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,10 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium - simplelocalsocket.cpp: Stop using deprecated QString::toAscii() function (replace it by toLatin1()). - Drop build cruft (moc_listdialog.cpp). + - Add possibility to have a system-wide settings file in + /etc/x2godesktopsharing/settings. The user preferences always + supersede the system-wide settings, so system-wide settings can + act as a default set of settings, but not as a limitation to the user. * debian/*: + Convert to DH packaging style. Build against Qt5. * debian/control: diff --git a/sharetray.cpp b/sharetray.cpp index 0a9acfe..445eb7c 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -5,6 +5,7 @@ // // // Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2009-2015 +// Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, (C) 2011-2018 // // Copyright: See COPYING file that comes with this distribution // @@ -34,6 +35,7 @@ #include <QDateTime> #include <grp.h> #include <QProcess> +#include <QFileInfo> #include <stdint.h> #define STAT_ACT_COUNT 10 @@ -45,6 +47,16 @@ int ShareTray::sigtermFd[2]; int ShareTray::sigabortFd[2]; int ShareTray::sighupFd[2]; +bool fileExists(QString path) { + QFileInfo check_file(path); + // check if file exists and if yes: Is it really a file and no directory? + if (check_file.exists() && check_file.isFile()) { + return true; + } else { + return false; + } +} + ShareTray::ShareTray() : QMainWindow() { @@ -212,7 +224,8 @@ ShareTray::ShareTray() } } - loadSettings(); + loadSystemSettings(); + loadUserSettings(); setTrayIcon(); trayIcon->show(); } @@ -225,7 +238,7 @@ ShareTray::~ShareTray() if ( QFile::exists ( lockFname ) ) QFile::remove ( lockFname ); qDebug() <<"lock file removed"; - saveSettings(); + saveUserSettings(); qDebug() <<"settings saved"; } @@ -457,21 +470,29 @@ void ShareTray::slotCloseConnection ( AccessAction* action ) int ShareTray::getAccess ( QString remote_user, QString host ) { - if ( whiteList.contains ( remote_user ) ) + + // user preferences always supercede system-wide preferences + if ( userWhiteList.contains ( remote_user ) ) return QMessageBox::Yes; - if ( blackList.contains ( remote_user ) ) + if ( userBlackList.contains ( remote_user ) ) return QMessageBox::No; + // system-wide preferences act as defaults for all users, but can be overriden by the user... + if ( systemwideWhiteList.contains ( remote_user ) ) + return QMessageBox::Yes; + if ( systemwideBlackList.contains ( remote_user ) ) + return QMessageBox::Yes; + MessageBox m ( remote_user, host, this ); m.activateWindow(); m.raise(); int res=m.exec(); if ( m.isChecked() &&res==QMessageBox::Yes ) - whiteList<<remote_user; + userWhiteList<<remote_user; if ( m.isChecked() &&res==QMessageBox::No ) - blackList<<remote_user; - actBlack->setEnabled ( blackList.size() >0 ); - actWhite->setEnabled ( whiteList.size() >0 ); + userBlackList<<remote_user; + actBlack->setEnabled ( userBlackList.size() >0 ); + actWhite->setEnabled ( userWhiteList.size() >0 ); return res; } @@ -488,7 +509,7 @@ void ShareTray::closeEvent ( QCloseEvent* ev ) if ( QFile::exists ( lockFname ) ) QFile::remove ( lockFname ); qDebug() <<"lock file removed"; - saveSettings(); + saveUserSettings(); qDebug() <<"settings saved"; } @@ -560,36 +581,56 @@ void ShareTray::showList() QStringList* lst; if ( current_list==BLACK ) - lst=&blackList; + lst=&userBlackList; else - lst=&whiteList; + lst=&userWhiteList; lst->sort(); ui.box->clear(); ui.box->insertItems ( 0,*lst ); } -void ShareTray::loadSettings() +void ShareTray::loadSystemSettings() { - QSettings st ( QDir::homePath() +"/.x2godesktopsharing/settings", - QSettings::NativeFormat ); + if (fileExists ("/etc/x2godesktopsharing/settings") ) { + + QSettings st ( "/etc/x2godesktopsharing/settings", + QSettings::NativeFormat ); + + systemwideBlackList= st.value ( "blacklist" ).toStringList(); + systemwideWhiteList= st.value ( "whitelist" ).toStringList(); - blackList= st.value ( "blacklist" ).toStringList(); - whiteList= st.value ( "whitelist" ).toStringList(); + actBlack->setEnabled ( systemwideBlackList.size() >0 ); + actWhite->setEnabled ( systemwideWhiteList.size() >0 ); - actBlack->setEnabled ( blackList.size() >0 ); - actWhite->setEnabled ( whiteList.size() >0 ); + } } -void ShareTray::saveSettings() +void ShareTray::loadUserSettings() +{ + + if (fileExists (QDir::homePath() + +"/.x2godesktopsharing/settings") ) { + + QSettings st ( QDir::homePath() +"/.x2godesktopsharing/settings", + QSettings::NativeFormat ); + + userBlackList= st.value ( "blacklist" ).toStringList(); + userWhiteList= st.value ( "whitelist" ).toStringList(); + + actBlack->setEnabled ( userBlackList.size() >0 ); + actWhite->setEnabled ( userWhiteList.size() >0 ); + + } +} + +void ShareTray::saveUserSettings() { QSettings st ( QDir::homePath() +"/.x2godesktopsharing/settings", QSettings::NativeFormat ); - st.setValue ( "blacklist",blackList ); - st.setValue ( "whitelist",whiteList ); + st.setValue ( "blacklist",userBlackList ); + st.setValue ( "whitelist",userWhiteList ); } - void ShareTray::setTrayIcon() { if ( !acceptConnections() ) @@ -633,17 +674,17 @@ void ShareTray::slotMsgOkCancel ( QAbstractButton* button ) { QStringList* lst; if ( current_list==BLACK ) - lst=&blackList; + lst=&userBlackList; else - lst=&whiteList; + lst=&userWhiteList; lst->clear(); for ( int i=ui.box->count()-1;i>=0;--i ) { *lst<<ui.box->item ( i )->text(); } } - actBlack->setEnabled ( blackList.size() >0 ); - actWhite->setEnabled ( whiteList.size() >0 ); + actBlack->setEnabled ( userBlackList.size() >0 ); + actWhite->setEnabled ( userWhiteList.size() >0 ); hide(); } diff --git a/sharetray.h b/sharetray.h index 2b54022..e96a2bb 100644 --- a/sharetray.h +++ b/sharetray.h @@ -5,6 +5,7 @@ // // // Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2009-2015 +// Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, (C) 2011-2018 // // Copyright: See COPYING file that comes with this distribution // @@ -56,8 +57,10 @@ private: QString socketFname; QString lockFname; MessageBox* mbox; - QStringList whiteList; - QStringList blackList; + QStringList userWhiteList; + QStringList userBlackList; + QStringList systemwideWhiteList; + QStringList systemwideBlackList; Ui::mwnd ui; bool menuClose; protected: @@ -88,8 +91,9 @@ private: int getAccess(QString user, QString host); void trayMessage(QString title, QString text); bool isProcessRunning(QString pid); - void loadSettings(); - void saveSettings(); + void loadSystemSettings(); + void loadUserSettings(); + void saveUserSettings(); void setTrayIcon(); void showList(); // unix file sockets for signal handler communication (unix <-> Qt) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit cf816dff95903e0a157627039e14c2a4954f3ef5 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Nov 11 18:28:22 2018 +0100 Make the desktop sharing group configurable system-wide and by the user. --- debian/changelog | 1 + sharetray.cpp | 53 ++++++++++++++++++++++++++++++++++++++++++++++------- sharetray.h | 1 + 3 files changed, 48 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2505da0..8433556 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium /etc/x2godesktopsharing/settings. The user preferences always supersede the system-wide settings, so system-wide settings can act as a default set of settings, but not as a limitation to the user. + - Make the desktop sharing group configurable system-wide and by the user. * debian/*: + Convert to DH packaging style. Build against Qt5. * debian/control: diff --git a/sharetray.cpp b/sharetray.cpp index 445eb7c..c7e96bb 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -64,6 +64,9 @@ ShareTray::ShareTray() menuClose=false; current_list=BLACK; + /* only hard-coded default... */ + sharingGroup= "x2godesktopsharing"; + ui.setupUi ( this ); ui.box->setSelectionMode ( QAbstractItemView::ExtendedSelection ); @@ -358,7 +361,7 @@ void ShareTray::slotStartSharing() if ( serverSocket->listen ( socketFname ) ) { - chown ( socketFname.toLatin1(),getuid(),getgrnam ( "x2godesktopsharing" )->gr_gid ); + chown ( socketFname.toLatin1(),getuid(),getgrnam ( sharingGroup.toLatin1() )->gr_gid ); QFile::setPermissions ( socketFname, QFile::ReadOwner|QFile::WriteOwner|QFile::ReadGroup|QFile::WriteGroup ); connect ( serverSocket,SIGNAL ( newConnection() ), @@ -591,14 +594,33 @@ void ShareTray::showList() void ShareTray::loadSystemSettings() { - if (fileExists ("/etc/x2godesktopsharing/settings") ) { + QString settings_file = "/etc/x2godesktopsharing/settings"; + if ( fileExists (settings_file) ) { + + qDebug() << "loading system-wide settings: "<<settings_file; - QSettings st ( "/etc/x2godesktopsharing/settings", - QSettings::NativeFormat ); + QSettings st ( settings_file, QSettings::NativeFormat ); systemwideBlackList= st.value ( "blacklist" ).toStringList(); systemwideWhiteList= st.value ( "whitelist" ).toStringList(); + /* the system-wide settings will be loaded on first usage and + * copied into the user settings' "group" parameter and further-on + * loaded from there... + */ + sharingGroup= (QString) st.value ( "group" ).toString(); + + if (sharingGroup != "") { + + qDebug() << "system-wide desktop sharing POSIX group is: "<<sharingGroup; + + } + else { + + qDebug() << "using hard-coded default for desktop sharing POSIX group is: " << sharingGroup; + + } + actBlack->setEnabled ( systemwideBlackList.size() >0 ); actWhite->setEnabled ( systemwideWhiteList.size() >0 ); @@ -607,15 +629,31 @@ void ShareTray::loadSystemSettings() void ShareTray::loadUserSettings() { + QString userSharingGroup; - if (fileExists (QDir::homePath() + +"/.x2godesktopsharing/settings") ) { + QString settings_file = QDir::homePath() +"/.x2godesktopsharing/settings"; + if ( fileExists ( settings_file ) ) { - QSettings st ( QDir::homePath() +"/.x2godesktopsharing/settings", - QSettings::NativeFormat ); + qDebug() << "loading user settings: "<<settings_file; + + QSettings st ( settings_file, QSettings::NativeFormat ); userBlackList= st.value ( "blacklist" ).toStringList(); userWhiteList= st.value ( "whitelist" ).toStringList(); + /* after first usage of x2godesktopsharing, the system-wide settings + * get ignored, as they are always loaded + */ + userSharingGroup= st.value ( "group" ).toString(); + if (userSharingGroup != "") { + + qDebug() << "user-defined desktop sharing POSIX group is: "<<sharingGroup<<"; using this!"; + sharingGroup=userSharingGroup; + } + else { + qDebug() << "user-defined desktop sharing POSIX group unset, using system-wide configured group: "<<sharingGroup; + } + actBlack->setEnabled ( userBlackList.size() >0 ); actWhite->setEnabled ( userWhiteList.size() >0 ); @@ -627,6 +665,7 @@ void ShareTray::saveUserSettings() QSettings st ( QDir::homePath() +"/.x2godesktopsharing/settings", QSettings::NativeFormat ); + st.setValue ( "group",sharingGroup ); st.setValue ( "blacklist",userBlackList ); st.setValue ( "whitelist",userWhiteList ); } diff --git a/sharetray.h b/sharetray.h index e96a2bb..8a76b78 100644 --- a/sharetray.h +++ b/sharetray.h @@ -56,6 +56,7 @@ private: QLocalServer* serverSocket; QString socketFname; QString lockFname; + QString sharingGroup; MessageBox* mbox; QStringList userWhiteList; QStringList userBlackList; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 9320515d7b777b55e3240cd6e1f32755f4a4ab0d Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Nov 11 18:29:36 2018 +0100 debian/<config>: Add debconf configuration dialogs that facilitate setting the system-wide default desktop sharing user. --- debian/changelog | 3 + debian/po/POTFILES.in | 1 + debian/po/templates.pot | 124 ++++++++++++++++++++++++++++++++++++ debian/settings | 2 + debian/x2godesktopsharing.config | 65 +++++++++++++++++++ debian/x2godesktopsharing.dirs | 1 + debian/x2godesktopsharing.install | 3 +- debian/x2godesktopsharing.postinst | 67 ++++++++++++++----- debian/x2godesktopsharing.postrm | 40 ++++++++++++ debian/x2godesktopsharing.templates | 61 ++++++++++++++++++ 10 files changed, 351 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8433556..0aeaf79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,9 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium .pro file, but debian/rules is easier...). * debian/x2godesktopsharing.menu: + Drop file. The menu file is not allowed if a .desktop file is present. + * debian/<config>: + + Add debconf configuration dialogs that facilitate setting the system-wide + default desktop sharing user. -- X2Go Release Manager <git-admin@x2go.org> Wed, 15 Nov 2017 22:00:53 +0100 diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in new file mode 100644 index 0000000..94e567d --- /dev/null +++ b/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] x2godesktopsharing.templates diff --git a/debian/po/templates.pot b/debian/po/templates.pot new file mode 100644 index 0000000..0462062 --- /dev/null +++ b/debian/po/templates.pot @@ -0,0 +1,124 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the x2godesktopsharing package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: x2godesktopsharing\n" +"Report-Msgid-Bugs-To: x2godesktopsharing@packages.debian.org\n" +"POT-Creation-Date: 2018-11-11 21:03+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../x2godesktopsharing.templates:3001 +msgid "Create group for X2Go Desktop Sharing now?" +msgstr "" + +#. Type: boolean +#. Description +#: ../x2godesktopsharing.templates:3001 +msgid "" +"X2Go Desktop Sharing requires that users with the privilege to share X2Go/" +"X11 desktop sessions with other users are placed into a specific group " +"(default: system group \"x2godesktopsharing\")." +msgstr "" + +#. Type: boolean +#. Description +#: ../x2godesktopsharing.templates:3001 +msgid "" +"In X2Go Desktop Sharing's user configuration you can adjust that group later " +"on. Here, you are asked for the system-wide default." +msgstr "" + +#. Type: boolean +#. Description +#: ../x2godesktopsharing.templates:3001 +msgid "" +"If this group is not created now, you should assign this desktop sharing " +"privilege to an already existing group on the next screen." +msgstr "" + +#. Type: boolean +#. Description +#: ../x2godesktopsharing.templates:3001 +msgid "" +"If this group is not created / not assigned, you will not be able to share " +"X2Go/X11 desktop sessions among different users." +msgstr "" + +#. Type: boolean +#. Description +#: ../x2godesktopsharing.templates:4001 +msgid "Use already existing groups for X2Go Desktop Sharing?" +msgstr "" + +#. Type: boolean +#. Description +#: ../x2godesktopsharing.templates:4001 +msgid "" +"If a group appropriate for being assigned the desktop sharing privilege has " +"already been created (e.g. in an LDAP user/group database) then you can " +"specify this group name on the next screen." +msgstr "" + +#. Type: string +#. Description +#: ../x2godesktopsharing.templates:5001 +msgid "Group with X2Go Desktop Sharing privilege:" +msgstr "" + +#. Type: string +#. Description +#: ../x2godesktopsharing.templates:5001 +msgid "Please specify the group name for X2Go Desktop Sharing privilege." +msgstr "" + +#. Type: string +#. Description +#: ../x2godesktopsharing.templates:5001 +msgid "If you leave this empty, the \"root\" group will be used." +msgstr "" + +#. Type: boolean +#. Description +#: ../x2godesktopsharing.templates:6001 +msgid "Delete the group that was formerly used for this?" +msgstr "" + +#. Type: boolean +#. Description +#: ../x2godesktopsharing.templates:6001 +msgid "The group for the X2Go Desktop Sharing privilege has been modified." +msgstr "" + +#. Type: boolean +#. Description +#: ../x2godesktopsharing.templates:6001 +msgid "" +"Please specify whether the old group should be deleted. If unsure, keep the " +"formerly used group and manually investigate later." +msgstr "" + +#. Type: error +#. Description +#: ../x2godesktopsharing.templates:7001 +msgid "Non-existing group" +msgstr "" + +#. Type: error +#. Description +#: ../x2godesktopsharing.templates:7001 +msgid "" +"The given group does not exist on this system. You should specify an already " +"existing group." +msgstr "" diff --git a/debian/settings b/debian/settings new file mode 100644 index 0000000..fc4f7d0 --- /dev/null +++ b/debian/settings @@ -0,0 +1,2 @@ +[General] +group=x2godesktopsharing diff --git a/debian/x2godesktopsharing.config b/debian/x2godesktopsharing.config new file mode 100755 index 0000000..a77cb95 --- /dev/null +++ b/debian/x2godesktopsharing.config @@ -0,0 +1,65 @@ +#!/bin/sh + +set -e + +# Source debconf library. +. /usr/share/debconf/confmodule + +# remember the formerly used (or default) group names, if any +db_get x2godesktopsharing/group-sharing && db_set x2godesktopsharing/last-group-sharing $RET || true + +# set the confirmation questions for group deletions always to false before we begin... +db_set x2godesktopsharing/del-last-group-sharing false + +db_input high x2godesktopsharing/create-group-for-sharing || true +db_go +db_get x2godesktopsharing/create-group-for-sharing +create_group=$RET + +# always allow usage of existing group (also when $create_group is set) +db_set x2godesktopsharing/use-existing-group-for-sharing true +if [ "$create_group" = "false" ]; then + + db_get x2godesktopsharing/group-sharing + if [ -z "$RET" ] || ! getent group $RET 1>/dev/null; then + db_set x2godesktopsharing/group-sharing "root" + fi + + db_input high x2godesktopsharing/use-existing-group-for-sharing || true + db_go +fi + +db_get x2godesktopsharing/use-existing-group-for-sharing +use_existing_group=$RET + +if [ "$create_group" = "true" ] || [ "$use_existing_group" = "true" ]; then + + loop=1 + while [ $loop -eq 1 ]; do + db_input high x2godesktopsharing/group-sharing || true + db_go + + db_get x2godesktopsharing/group-sharing + group_sharing=$RET + if getent group $group_sharing 1>/dev/null; then + loop=0 + else + if [ "$create_group" = "true" ]; then + loop=0 + else + db_input critical x2godesktopsharing/no-such-group || true + db_go + continue + fi + fi + + db_get x2godesktopsharing/last-group-sharing + if [ -z "$RET" ] || ! getent group $RET 1>/dev/null; then + RET="root" + fi + if [ "$RET" != "$group_sharing" ] && [ $(getent group $RET | cut -d ":" -f 3) -ge 100 ]; then + db_input critical x2godesktopsharing/del-last-group-sharing || true + db_go + fi + done +fi diff --git a/debian/x2godesktopsharing.dirs b/debian/x2godesktopsharing.dirs index 7e4dcd7..64b1d6c 100644 --- a/debian/x2godesktopsharing.dirs +++ b/debian/x2godesktopsharing.dirs @@ -1,3 +1,4 @@ +etc/x2godesktopsharing usr/bin usr/share/applications usr/share/x2godesktopsharing diff --git a/debian/x2godesktopsharing.install b/debian/x2godesktopsharing.install index 1e51109..27dbb08 100644 --- a/debian/x2godesktopsharing.install +++ b/debian/x2godesktopsharing.install @@ -1,3 +1,4 @@ VERSION.x2godesktopsharing usr/share/x2go/versions bin/* usr/bin/ -share/* usr/share/x2go/ \ No newline at end of file +share/* usr/share/x2go/ +debian/settings etc/x2godesktopsharing/ \ No newline at end of file diff --git a/debian/x2godesktopsharing.postinst b/debian/x2godesktopsharing.postinst index 6fd8a1a..6374ca9 100755 --- a/debian/x2godesktopsharing.postinst +++ b/debian/x2godesktopsharing.postinst @@ -19,23 +19,60 @@ set -e # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package +# Source debconf library. +. /usr/share/debconf/confmodule case "$1" in - configure) - X2GOGRP=`getent group | grep x2godesktopsharing || true` - if [ "x$X2GOGRP"="x" ] - then - addgroup --system x2godesktopsharing - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; + configure) + + # fetch debconf-variables for x2godesktopsharing + db_get x2godesktopsharing/create-group-for-sharing && x2godesktopsharing_create_group_for_sharing=$RET + db_get x2godesktopsharing/use-existing-group-for-sharing && x2godesktopsharing_use_existing_group_for_sharing=$RET + + # remove previously used sharing group + + db_get x2godesktopsharing/del-last-group-sharing + del_last_group="$RET" + + if [ "$del_last_group" = "true" ]; then + db_get x2godesktopsharing/last-group-sharing + last_group=$(echo $RET | cut -d" " -f1) + + # try to remove the formerly used sharing group; on failure, ignore it + getent group $last_group 1>/dev/null && delgroup "$last_group" || \ + echo "Removing Posix previous X2Go Desktop Sharing group »$last_group« failed." + fi + + # create debconf-configured sharing group + + db_get x2godesktopsharing/group-sharing + # for sanity: we take everything as a group name until we find a blank... + group=$(echo $RET | cut -d" " -f1) + + if [ "$x2godesktopsharing_create_group_for_sharing" = "true" ] && [ "x$group" != "x" ]; then + if echo "$group" | egrep '^[[:digit:]]{1,5}$' 1>/dev/null; then + echo "Specified sharing group is a gidNumber, not creating any group." 1>&2 + elif ! getent group $group >/dev/null; then + echo "Creating $group group." 1>&2 + addgroup --system $group + else + echo "Group »$group« already exists." 1>&2 + fi + fi + + # finally tweak X2Go Desktop Sharing's configuration file and adapt the group parameter + if [ -n "$group" ]; then + sed -i /etc/x2godesktopsharing/settings -e "s/group=.*/group=$group/" + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; esac # dh_installdeb will replace this with shell code automatically diff --git a/debian/x2godesktopsharing.postrm b/debian/x2godesktopsharing.postrm new file mode 100755 index 0000000..60c06b6 --- /dev/null +++ b/debian/x2godesktopsharing.postrm @@ -0,0 +1,40 @@ +#!/bin/sh +# postrm script for x2godesktopsharing + +set -e + +# summary of how this script can be called: +# * <postrm> `remove' +# * <postrm> `purge' +# * <old-postrm> `upgrade' <new-version> +# * <new-postrm> `failed-upgrade' <old-version> +# * <new-postrm> `abort-install' +# * <new-postrm> `abort-install' <old-version> +# * <new-postrm> `abort-upgrade' <old-version> +# * <disappearer's-postrm> `disappear' <overwriter> +# <overwriter-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +set -e + +case "${1}" in + 'purge') + getent 'group' 'x2godesktopsharing' >'/dev/null' && delgroup 'x2godesktopsharing' + ;; + + 'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear') + ;; + + *) + echo "postrm called with unknown argument '${1}'" >&2 + exit '1' + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit '0' diff --git a/debian/x2godesktopsharing.templates b/debian/x2godesktopsharing.templates new file mode 100644 index 0000000..8b453ee --- /dev/null +++ b/debian/x2godesktopsharing.templates @@ -0,0 +1,61 @@ +# These templates have been reviewed by the debian-l10n-english +# team +# +# If modifications/additions/rewording are needed, please ask +# debian-l10n-english@lists.debian.org for advice. +# +# Even minor modifications require translation updates and such +# changes should be coordinated with translators and reviewers. + +Template: x2godesktopsharing/last-group-sharing +Type: string +Default: +Description: for internal use + +Template: x2godesktopsharing/create-group-for-sharing +Type: boolean +Default: true +_Description: Create group for X2Go Desktop Sharing now? + X2Go Desktop Sharing requires that users with the privilege to share + X2Go/X11 desktop sessions with other users are placed into a specific + group (default: system group "x2godesktopsharing"). + . + In X2Go Desktop Sharing's user configuration you can adjust that group + later on. Here, you are asked for the system-wide default. + . + If this group is not created now, you should assign this desktop sharing + privilege to an already existing group on the next screen. + . + If this group is not created / not assigned, you will not be able to share + X2Go/X11 desktop sessions among different users. + +Template: x2godesktopsharing/use-existing-group-for-sharing +Type: boolean +Default: false +_Description: Use already existing groups for X2Go Desktop Sharing? + If a group appropriate for being assigned the desktop sharing privilege has + already been created (e.g. in an LDAP user/group database) then you can + specify this group name on the next screen. + +Template: x2godesktopsharing/group-sharing +Type: string +Default: x2godesktopsharing +_Description: Group with X2Go Desktop Sharing privilege: + Please specify the group name for X2Go Desktop Sharing privilege. + . + If you leave this empty, the "root" group will be used. + +Template: x2godesktopsharing/del-last-group-sharing +Type: boolean +Default: false +_Description: Delete the group that was formerly used for this? + The group for the X2Go Desktop Sharing privilege has been modified. + . + Please specify whether the old group should be deleted. If unsure, + keep the formerly used group and manually investigate later. + +Template: x2godesktopsharing/no-such-group +Type: error +_Description: Non-existing group + The given group does not exist on this system. You should specify an + already existing group. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 1e7e2a61c503ff22acd948eaa3b553fd57281fe6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Nov 11 19:52:52 2018 +0100 debian/control: Use https:// URLs in Vcs-Browser: and Homepage: fields. --- debian/changelog | 1 + debian/control | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0aeaf79..96643d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium + Convert to DH packaging style. Build against Qt5. * debian/control: + Bump Standards-Version: to 4.2.1. No changes needed. + + Use https:// URLs in Vcs-Browser: and Homepage: fields. * debian/rules: + Add dh_clean override, so that the build dir gets tidied up properly after build (this really needs to go into the qmake diff --git a/debian/control b/debian/control index f4a3e6e..c36d497 100644 --- a/debian/control +++ b/debian/control @@ -12,9 +12,9 @@ Build-Depends: qttools5-dev-tools, libqt5svg5-dev, Standards-Version: 4.2.1 -Homepage: http://code.x2go.org/releases/source/x2godesktopsharing +Homepage: https://code.x2go.org/releases/source/x2godesktopsharing Vcs-Git: git://code.x2go.org/x2godesktopsharing.git -Vcs-Browser: http://code.x2go.org/gitweb?p=x2godesktopsharing.git;a=summary +Vcs-Browser: https://code.x2go.org/gitweb?p=x2godesktopsharing.git;a=summary Package: x2godesktopsharing Architecture: any -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 09574e09e5c0b90b8103fbf34e2d460550a22121 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Nov 11 19:53:26 2018 +0100 debian/control: Drop empty R field. --- debian/changelog | 1 + debian/control | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 96643d3..bce97f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium * debian/control: + Bump Standards-Version: to 4.2.1. No changes needed. + Use https:// URLs in Vcs-Browser: and Homepage: fields. + + Drop empty R field. * debian/rules: + Add dh_clean override, so that the build dir gets tidied up properly after build (this really needs to go into the qmake diff --git a/debian/control b/debian/control index c36d497..18f5789 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,6 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, x2goserver (>= 4.0.0.0-0~), -Recommends: Description: Share X11 desktops with other users via X2Go X2Go is a server based computing environment with - session resuming -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 96fb857ebc5fa14aed4bf576e3eb4f830da7adad Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Nov 11 19:53:42 2018 +0100 debian/copyright: Turn into DEP-5 copyright file format style. --- debian/changelog | 2 + debian/copyright | 135 +++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 108 insertions(+), 29 deletions(-) diff --git a/debian/changelog b/debian/changelog index bce97f3..d813259 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,8 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium * debian/<config>: + Add debconf configuration dialogs that facilitate setting the system-wide default desktop sharing user. + * debian/copyright: + + Turn into DEP-5 copyright file format style. -- X2Go Release Manager <git-admin@x2go.org> Wed, 15 Nov 2017 22:00:53 +0100 diff --git a/debian/copyright b/debian/copyright index d18c933..f6f1c5c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,34 +1,111 @@ -This package was debianized by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> on -Thu, 1 Feb 2007 14:11:03 +0100. +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: X2Go Desktop Sharing +Upstream-Contact: Oleksandr Shneyder <o.schneydr@phoca-gmbh.de> +Source: https://code.x2go.org/releases/source/x2godesktopsharing/ -It was downloaded from www.obviously-nice.de +Files: Doxyfile + VERSION.x2godesktopsharing + dlg.ui + icons/svg/black-list.svg + icons/svg/display-allowed.svg + icons/svg/display-protected.svg + icons/svg/eye.svg + icons/svg/quit.svg + icons/svg/reconnect.svg + icons/svg/stop.svg + icons/svg/white-list.svg + icons/svg/x2go-plug.svg + icons/svg/x2godesktopsharing.svg + icons/x2godesktopsharing.xpm + icons/128x128/x2godesktopsharing.png + icons/16x16/x2godesktopsharing.png + icons/22x22/accept.png + icons/22x22/discard.png + icons/22x22/exit.png + icons/22x22/share.png + icons/22x22/stop.png + icons/22x22/view.png + icons/22x22/wlist.png + icons/22x22/x2godesktopsharing.png + icons/32x32/blist.png + icons/32x32/exit.png + icons/32x32/share.png + icons/32x32/stop.png + icons/32x32/view.png + icons/32x32/wlist.png + icons/32x32/x2godesktopsharing.png + icons/64x64/x2godesktopsharing.png + man/man1/x2godesktopsharing.1 + man/man8/x2goresume-desktopsharing.8 + man/man8/x2gosuspend-desktopsharing.8 + man/man8/x2goterminate-desktopsharing.8 + resources.rcc + rpm/x2godesktopsharing-rpmlintrc + x2godesktopsharing.desktop + x2godesktopsharing_da.ts + x2godesktopsharing_de.ts + x2godesktopsharing_es.ts + x2godesktopsharing_et.ts + x2godesktopsharing_fr.ts + x2godesktopsharing_fi.ts + x2godesktopsharing_nb_no.ts + x2godesktopsharing_nl.ts + x2godesktopsharing_pt.ts + x2godesktopsharing_ru.ts + x2godesktopsharing_sv.ts + x2godesktopsharing_tr.ts + x2godesktopsharing_zh_tw.ts +Copyright: 2007-2015, Oleksandr Shneyder + 2017-2015, X2Go Project +License: GPL-2+ +Comment: + Assuming license as found in COPYING file. + Assuming copyright holder from other code file. -Upstream Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +Files: main.cpp + accessaction.cpp + accessaction.h + listdialog.cpp + messagebox.cpp + messagebox.h + sharetray.cpp + sharetray.h + simplelocalsocket.cpp + simplelocalsocket.h +Copyright: 2009-2015, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> +License: GPL-2+ -Copyright (C) 2007-2015 obviously nice - http://www.obviouslynice.de +Files: bin/x2goresume-desktopsharing + bin/x2gosuspend-desktopsharing + bin/x2goterminate-desktopsharing + share/x2gofeature.d/x2godesktopsharing.features +Copyright: 2007-2015, X2Go Project - http:wiki.x2go.org + 2011-2015, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + 2011-2015, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> + 2011-2015, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +License: GPL-2+ -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the -Free Software Foundation, Inc., -51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - -Copyright (C) 2007-2015 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> - Heinz-M. Graesing <heinz-m.graesing@obviously-nice.de> - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. - -The Debian packaging is (C) 2007-2015, -Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> and -is licensed under the GPL, see above. +Files: debian/* +Copyright: 2007-2015, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + 2011-2018, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +License: GPL-2+ +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the + Free Software Foundation, Inc., + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit dd08460196b399bb34ecf1da7c922b45669eb8b3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Nov 11 19:54:24 2018 +0100 debian/rules: Pass-through of compiler flags to qmake call. --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d813259..3a75a24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium + Add dh_clean override, so that the build dir gets tidied up properly after build (this really needs to go into the qmake .pro file, but debian/rules is easier...). + + Pass-through of compiler flags to qmake call. * debian/x2godesktopsharing.menu: + Drop file. The menu file is not allowed if a .desktop file is present. * debian/<config>: diff --git a/debian/rules b/debian/rules index e0d7762..da63bb0 100755 --- a/debian/rules +++ b/debian/rules @@ -20,7 +20,7 @@ export QT_SELECT=qt5 override_dh_auto_build: lrelease x2godesktopsharing.pro - qmake x2godesktopsharing.pro + qmake QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" x2godesktopsharing.pro override_dh_install: install -m 644 x2godesktopsharing $(CURDIR)/debian/x2godesktopsharing/usr/bin/ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 5ef0b280183fd97e4d162190aaf06d50203ebb65 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Nov 11 19:54:47 2018 +0100 man/man8/x2goterminate-desktopsharing.8: Grammar fix. --- debian/changelog | 1 + man/man8/x2goterminate-desktopsharing.8 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3a75a24..ec559b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium supersede the system-wide settings, so system-wide settings can act as a default set of settings, but not as a limitation to the user. - Make the desktop sharing group configurable system-wide and by the user. + - man/man8/x2goterminate-desktopsharing.8: Grammar fix. * debian/*: + Convert to DH packaging style. Build against Qt5. * debian/control: diff --git a/man/man8/x2goterminate-desktopsharing.8 b/man/man8/x2goterminate-desktopsharing.8 index 5475884..beecef2 100644 --- a/man/man8/x2goterminate-desktopsharing.8 +++ b/man/man8/x2goterminate-desktopsharing.8 @@ -15,7 +15,7 @@ x2goterminate\-desktopsharing \- Cleanly Terminate Desktop Sharing for a given X \fBx2goterminate\-desktopsharing\fR \fI<session_id>\fR .SH DESCRIPTION -\fBx2goterminate\-desktopsharing\fR allows to detect a running and associated \fBx2godesktopsharing\fR +\fBx2goterminate\-desktopsharing\fR allows one to detect a running and associated \fBx2godesktopsharing\fR applet and to cleanly terminate this applet. .PP \fBx2goterminate\-desktopsharing\fR is run with normal user privileges and it is used from within X2Go Server. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit d7e12905b16aca125806ab4c8dee5dd397b59c62 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Nov 11 20:59:43 2018 +0100 debian/rules: Run lrelease during auto-configure. Makes sure all resources are available for building the executable. --- debian/changelog | 2 ++ debian/rules | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ec559b9..e05cef0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium properly after build (this really needs to go into the qmake .pro file, but debian/rules is easier...). + Pass-through of compiler flags to qmake call. + + Run lrelease during auto-configure. Make sure all resources are available + for building the executable. * debian/x2godesktopsharing.menu: + Drop file. The menu file is not allowed if a .desktop file is present. * debian/<config>: diff --git a/debian/rules b/debian/rules index da63bb0..bddc7fe 100755 --- a/debian/rules +++ b/debian/rules @@ -18,8 +18,11 @@ export QT_SELECT=qt5 %: dh $@ -override_dh_auto_build: +override_dh_auto_configure: lrelease x2godesktopsharing.pro + dh_auto_configure + +override_dh_auto_build: qmake QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" x2godesktopsharing.pro override_dh_install: -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 69304771e80ac96253a7b72a2dd138315e350616 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Nov 11 21:00:36 2018 +0100 resources.qrc: Rename file from resources.rcc. --- debian/changelog | 1 + resources.rcc => resources.qrc | 0 x2godesktopsharing.pro | 3 +-- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e05cef0..57d2aea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium act as a default set of settings, but not as a limitation to the user. - Make the desktop sharing group configurable system-wide and by the user. - man/man8/x2goterminate-desktopsharing.8: Grammar fix. + - resources.qrc: Rename file from resources.rcc. * debian/*: + Convert to DH packaging style. Build against Qt5. * debian/control: diff --git a/resources.rcc b/resources.qrc similarity index 100% rename from resources.rcc rename to resources.qrc diff --git a/x2godesktopsharing.pro b/x2godesktopsharing.pro index 2fe08ef..530e3ed 100644 --- a/x2godesktopsharing.pro +++ b/x2godesktopsharing.pro @@ -20,7 +20,6 @@ TRANSLATIONS += \ x2godesktopsharing_sv.ts \ x2godesktopsharing_tr.ts \ x2godesktopsharing_zh_tw.ts -RESOURCES += resources.rcc !isEmpty(TRANSLATIONS) { isEmpty(QMAKE_LRELEASE) { @@ -51,8 +50,8 @@ HEADERS += sharetray.h \ accessaction.h \ messagebox.h +RESOURCES += resources.qrc FORMS = dlg.ui QT += svg network DISTFILES += sharetraycpp - -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit 582b04cb328610c86b0d0b5f223e5cfc16d0738c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Nov 11 21:01:03 2018 +0100 debian/x2godesktopsharing.install: Add EOL at EOF. --- debian/changelog | 1 + debian/x2godesktopsharing.install | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 57d2aea..b55c7d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium default desktop sharing user. * debian/copyright: + Turn into DEP-5 copyright file format style. + * debian/x2godesktopsharing.install: Add EOL at EOF. -- X2Go Release Manager <git-admin@x2go.org> Wed, 15 Nov 2017 22:00:53 +0100 diff --git a/debian/x2godesktopsharing.install b/debian/x2godesktopsharing.install index 27dbb08..741eefa 100644 --- a/debian/x2godesktopsharing.install +++ b/debian/x2godesktopsharing.install @@ -1,4 +1,4 @@ VERSION.x2godesktopsharing usr/share/x2go/versions bin/* usr/bin/ share/* usr/share/x2go/ -debian/settings etc/x2godesktopsharing/ \ No newline at end of file +debian/settings etc/x2godesktopsharing/ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit ef3dfac2eae54c1a4138ff962d44371b9f30a813 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 12 14:18:12 2018 +0100 Replace QMessageBox based access dialog by a QDialog based access dialog. QMessageBox in Qt5 is not suitable for adding a QCheckBox widget into it anymore. --- accessdialog.cpp | 62 ++++++++++++++ accessdialog.h | 36 ++++++++ debian/changelog | 3 + icons/svg/dialog-question.svg | 185 ++++++++++++++++++++++++++++++++++++++++++ messagebox.cpp | 38 --------- messagebox.h | 31 ------- resources.qrc | 1 + sharetray.cpp | 16 ++-- x2godesktopsharing.pro | 4 +- 9 files changed, 297 insertions(+), 79 deletions(-) diff --git a/accessdialog.cpp b/accessdialog.cpp new file mode 100644 index 0000000..723decb --- /dev/null +++ b/accessdialog.cpp @@ -0,0 +1,62 @@ +// +// C++ Implementation: AccessDialog +// +// Description: +// +// +// Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, (C) 2018 +// +// Copyright: See COPYING file that comes with this distribution +// +// +#include "accessdialog.h" +#include <QCheckBox> +#include <QDialogButtonBox> +#include <QLabel> +#include <QPixmap> +#include <QPushButton> +#include <QHBoxLayout> +#include <QVBoxLayout> + +AccessWindow::AccessWindow(QString uname, QString hname, QWidget *parent) + : QDialog (parent) +{ + setWindowTitle(QString("%1 (%2)").arg(uname).arg(hname)); + + QVBoxLayout *hbox = new QVBoxLayout(this); + + /* question mark and text */ + QHBoxLayout *vtexticonbox = new QHBoxLayout(); + QLabel *icon = new QLabel(); + icon->setPixmap ( QPixmap (":icons/svg/dialog-question.svg") ); + vtexticonbox->addWidget(icon, 1, Qt::AlignLeft); + QLabel *text = new QLabel(); + text->setText(QString(tr("Accept %1 from %2 ?")).arg(uname).arg(hname)); + vtexticonbox->addWidget(text, 1, Qt::AlignLeft); + hbox->addLayout(vtexticonbox); + + /* the check box (remember this setting for user X) */ + checkBox=new QCheckBox(QString(tr("Save selection for %1")).arg(uname),this); + hbox->addWidget(checkBox, 1, Qt::AlignLeft); + + /* dialog buttons */ + QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); + buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Grant access")); + connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); + buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Deny access")); + buttonBox->button(QDialogButtonBox::Cancel)->setDefault(true); + connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); + hbox->addWidget(buttonBox, 1, Qt::AlignRight | Qt::AlignBottom); + + /* modality */ + setWindowModality(Qt::WindowModal); +} + +AccessWindow::~AccessWindow() +{ +} + +bool AccessWindow::isChecked() +{ + return checkBox->isChecked(); +} diff --git a/accessdialog.h b/accessdialog.h new file mode 100644 index 0000000..1dd01c8 --- /dev/null +++ b/accessdialog.h @@ -0,0 +1,36 @@ +// +// C++ Interface: AccessDialog +// +// Description: +// +// +// Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>, (C) 2018 +// +// Copyright: See COPYING file that comes with this distribution +// +// +#ifndef ACCESSDIALOG_H +#define ACCESSDIALOG_H + +/** + @author Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +*/ + +#include <QDialog> +#include <QCheckBox> + +/** + @author Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +*/ +class AccessWindow : public QDialog +{ + Q_OBJECT +public: + AccessWindow(QString uname, QString hname, QWidget *parent = NULL); + ~AccessWindow(); + bool isChecked(); +private: + QCheckBox* checkBox; +}; + +#endif diff --git a/debian/changelog b/debian/changelog index b55c7d7..057d4b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium - Make the desktop sharing group configurable system-wide and by the user. - man/man8/x2goterminate-desktopsharing.8: Grammar fix. - resources.qrc: Rename file from resources.rcc. + - Replace QMessageBox based access dialog by a QDialog based access dialog. + QMessageBox in Qt5 is not suitable for adding a QCheckBox widget into it + anymore. * debian/*: + Convert to DH packaging style. Build against Qt5. * debian/control: diff --git a/icons/svg/dialog-question.svg b/icons/svg/dialog-question.svg new file mode 100644 index 0000000..50123ac --- /dev/null +++ b/icons/svg/dialog-question.svg @@ -0,0 +1,185 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="48px" + height="48px" + id="svg7220" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="dialog-question.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + <defs + id="defs7222"> + <linearGradient + inkscape:collect="always" + id="linearGradient4873"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop4875" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop4877" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4873" + id="linearGradient2704" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.3440063,0,0,2.3440063,-121.79862,31.22942)" + x1="62.745731" + y1="-13.444987" + x2="62.608765" + y2="7.1072145" /> + <linearGradient + id="linearGradient3811"> + <stop + id="stop3813" + offset="0" + style="stop-color:#204a87;stop-opacity:1" /> + <stop + id="stop3815" + offset="1" + style="stop-color:#3465a4;stop-opacity:1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3811" + id="linearGradient3927" + x1="15.046636" + y1="44.787998" + x2="15.046636" + y2="3.8851264" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.0805272,0,0,1.0805026,-1.5082857,-3.3507604)" /> + <linearGradient + id="linearGradient5106"> + <stop + style="stop-color:#8fb3d9;stop-opacity:1" + offset="0" + id="stop5108" /> + <stop + id="stop8208" + offset="0.25288007" + style="stop-color:#729fcf;stop-opacity:1" /> + <stop + style="stop-color:#3465a4;stop-opacity:1" + offset="0.68271071" + id="stop8210" /> + <stop + style="stop-color:#204a87;stop-opacity:1" + offset="1" + id="stop5110" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5106" + id="radialGradient2707" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-7.565785,-6.219707e-7,3.9644633e-7,-4.8230546,494.60904,-26.555114)" + cx="62.202274" + cy="-5.7132163" + fx="62.202274" + fy="-5.7132163" + r="9.7552835" /> + <linearGradient + id="linearGradient10691" + inkscape:collect="always"> + <stop + id="stop10693" + offset="0" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + id="stop10695" + offset="1" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient10691" + id="radialGradient3080" + gradientUnits="userSpaceOnUse" + gradientTransform="scale(1.902215,0.525703)" + cx="6.702713" + cy="73.615715" + fx="6.702713" + fy="73.615715" + r="7.228416" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="7" + inkscape:cx="24" + inkscape:cy="24" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:grid-bbox="true" + inkscape:document-units="px" + inkscape:window-width="1680" + inkscape:window-height="1000" + inkscape:window-x="0" + inkscape:window-y="25" /> + <metadata + id="metadata7225"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + id="layer1" + inkscape:label="Layer 1" + inkscape:groupmode="layer"> + <path + transform="matrix(1.6,0,0,1.8421053,3.6000003,-30.289476)" + d="M 26.5,38.700001 A 13.75,3.8 0 1 1 -1,38.700001 A 13.75,3.8 0 1 1 26.5,38.700001 z" + sodipodi:ry="3.8" + sodipodi:rx="13.75" + sodipodi:cy="38.700001" + sodipodi:cx="12.75" + id="path2625" + style="opacity:0.5;fill:url(#radialGradient3080);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + sodipodi:type="arc" /> + <path + style="fill:url(#radialGradient2707);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3927);stroke-width:1.00004065;stroke-miterlimit:4;stroke-dasharray:none" + d="M 45.499979,22.999239 C 45.499979,34.87373 35.873401,44.49998 24.000271,44.49998 C 12.126053,44.49998 2.5000203,34.873621 2.5000203,22.999239 C 2.5000203,11.12529 12.126053,1.5000193 24.000271,1.5000193 C 35.873401,1.5000193 45.499979,11.12529 45.499979,22.999239 L 45.499979,22.999239 z" + id="path6495" /> + <path + id="path8655" + d="M 44.49904,22.999272 C 44.49904,34.321462 35.320423,43.499975 23.999791,43.499975 C 12.678124,43.499975 3.5000253,34.321356 3.5000253,22.999272 C 3.5000253,11.677606 12.678124,2.5000243 23.999791,2.5000243 C 35.320423,2.5000243 44.49904,11.677606 44.49904,22.999272 L 44.49904,22.999272 z" + style="opacity:0.6;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2704);stroke-width:1.00004995;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + id="path9053" + style="font-size:72px;font-style:normal;font-weight:bold;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Standard Symbols L" + d="M 25.499549,29.000001 C 25.500288,27.000001 24.999549,24.022899 27.499549,22.000001 C 29.987045,20.009725 32.016392,18.017155 31.999549,15.000001 C 32.036328,12.012312 28.999549,10.023333 25.999549,9.7499987 C 22.008774,9.4823727 17.999549,10.031438 15.999549,14.000001 C 15.707504,15.711192 15.898252,18.000001 17.999549,18.000001 C 18.983603,18.000001 19.999549,17.038081 19.999549,16.000001 L 19.999549,15.000001 C 19.999549,14.500001 20.028884,14.041648 20.999549,13.500001 C 22 [...] + sodipodi:nodetypes="cccccsssssssscc" /> + <path + sodipodi:type="arc" + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path8287" + sodipodi:cx="18.4417" + sodipodi:cy="34.547359" + sodipodi:rx="2.2272584" + sodipodi:ry="2.4054391" + d="M 20.668958,34.547359 A 2.2272584,2.4054391 0 1 1 16.214442,34.547359 A 2.2272584,2.4054391 0 1 1 20.668958,34.547359 z" + transform="matrix(0.8979649,0,0,0.831449,7.4395493,5.2756317)" /> + </g> +</svg> diff --git a/messagebox.cpp b/messagebox.cpp deleted file mode 100644 index 60e0075..0000000 --- a/messagebox.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// -// C++ Implementation: messagebox -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2009-2015 -// -// Copyright: See COPYING file that comes with this distribution -// -// -#include "messagebox.h" -#include <QCheckBox> -#include <QGridLayout> - -MessageBox::MessageBox(QString uname, QString hname, QWidget *parent) - : QMessageBox(parent) -{ - checkBox=new QCheckBox( - QString(tr("Save selection for %1")).arg(uname),this); - ((QGridLayout*)layout())->addWidget(checkBox,1,1); - setIcon(Question); - setWindowModality(Qt::WindowModal); - setText(QString(tr("Accept %1 from %2 ?")).arg(uname).arg(hname)); - setStandardButtons(Yes|No); - setWindowTitle(QString("%1(%2)").arg(uname).arg(hname)); -} - - -MessageBox::~MessageBox() -{ -} - -bool MessageBox::isChecked() -{ - return checkBox->isChecked(); -} - diff --git a/messagebox.h b/messagebox.h deleted file mode 100644 index a77ad1f..0000000 --- a/messagebox.h +++ /dev/null @@ -1,31 +0,0 @@ -// -// C++ Interface: messagebox -// -// Description: -// -// -// Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>, (C) 2009-2015 -// -// Copyright: See COPYING file that comes with this distribution -// -// -#ifndef MESSAGEBOX_H -#define MESSAGEBOX_H - -#include <QMessageBox> -/** - @author Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -*/ -class QCheckBox; -class MessageBox : public QMessageBox -{ - Q_OBJECT -public: - MessageBox(QString uname, QString hname, QWidget *parent = 0); - ~MessageBox(); - bool isChecked(); -private: - QCheckBox* checkBox; -}; - -#endif diff --git a/resources.qrc b/resources.qrc index 5e5a232..7cd4c6e 100644 --- a/resources.qrc +++ b/resources.qrc @@ -18,6 +18,7 @@ <file>icons/32x32/wlist.png</file> <file>icons/32x32/x2godesktopsharing.png</file> <file>icons/128x128/x2godesktopsharing.png</file> + <file>icons/svg/dialog-question.svg</file> <file>x2godesktopsharing_da.qm</file> <file>x2godesktopsharing_de.qm</file> <file>x2godesktopsharing_es.qm</file> diff --git a/sharetray.cpp b/sharetray.cpp index c7e96bb..a975004 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -18,18 +18,19 @@ #include <QDir> #include <QtDebug> #include <QMessageBox> +#include <QDialog> #include <QSocketNotifier> #include <sys/socket.h> #include <sys/unistd.h> #include "simplelocalsocket.h" #include "accessaction.h" +#include "accessdialog.h" #include <sys/types.h> #include <csignal> #include <errno.h> #include <QToolTip> #include <QTimer> #include <QSettings> -#include "messagebox.h" #include <QSystemTrayIcon> #include <QCloseEvent> #include <QDateTime> @@ -404,7 +405,7 @@ QString ShareTray::getSocketAnswer ( QString message ) QString client=lst[0]; QString user=params[1]; QString remote_user=lst[10]; - if ( getAccess ( remote_user, client ) ==QMessageBox::Yes ) + if ( getAccess ( remote_user, client ) ==QDialog::Accepted ) { trayMessage ( tr ( "Access granted" ),QString ( tr ( "%1(%2): access granted" ) ).arg (remote_user ).arg ( client ) ); //start agent @@ -486,13 +487,12 @@ int ShareTray::getAccess ( QString remote_user, QString host ) if ( systemwideBlackList.contains ( remote_user ) ) return QMessageBox::Yes; - MessageBox m ( remote_user, host, this ); - m.activateWindow(); - m.raise(); - int res=m.exec(); - if ( m.isChecked() &&res==QMessageBox::Yes ) + AccessWindow ad ( remote_user, host, this ); + ad.raise(); + int res=ad.exec(); + if ( ad.isChecked() &&res==QDialog::Accepted ) userWhiteList<<remote_user; - if ( m.isChecked() &&res==QMessageBox::No ) + if ( ad.isChecked() &&res==QDialog::Rejected ) userBlackList<<remote_user; actBlack->setEnabled ( userBlackList.size() >0 ); actWhite->setEnabled ( userWhiteList.size() >0 ); diff --git a/x2godesktopsharing.pro b/x2godesktopsharing.pro index 530e3ed..75a9556 100644 --- a/x2godesktopsharing.pro +++ b/x2godesktopsharing.pro @@ -44,11 +44,11 @@ SOURCES += main.cpp \ sharetray.cpp \ simplelocalsocket.cpp \ accessaction.cpp \ - messagebox.cpp + accessdialog.cpp HEADERS += sharetray.h \ simplelocalsocket.h \ accessaction.h \ - messagebox.h + accessdialog.h RESOURCES += resources.qrc FORMS = dlg.ui -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit b5bbdb015905678c9ddaaa2ede0fb341014c207a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 12 14:23:28 2018 +0100 debian/copyright: Update copyright attributions. --- debian/changelog | 1 + debian/copyright | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 057d4b3..42abdb6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium default desktop sharing user. * debian/copyright: + Turn into DEP-5 copyright file format style. + + Update copyright attributions. * debian/x2godesktopsharing.install: Add EOL at EOF. -- X2Go Release Manager <git-admin@x2go.org> Wed, 15 Nov 2017 22:00:53 +0100 diff --git a/debian/copyright b/debian/copyright index f6f1c5c..4de955f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -62,19 +62,26 @@ Comment: Assuming license as found in COPYING file. Assuming copyright holder from other code file. +Files: accessdialog.cpp + accessdialog.h +Copyright: 2018, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +License: GPL-2+ + Files: main.cpp accessaction.cpp accessaction.h listdialog.cpp - messagebox.cpp - messagebox.h - sharetray.cpp - sharetray.h simplelocalsocket.cpp simplelocalsocket.h Copyright: 2009-2015, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> License: GPL-2+ +Files: sharetray.cpp + sharetray.h +Copyright: 2009-2015, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + 2018, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +License: GPL-2+ + Files: bin/x2goresume-desktopsharing bin/x2gosuspend-desktopsharing bin/x2goterminate-desktopsharing -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
-
git-admin＠x2go.org