This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2godesktopsharing. from b5bbdb0 debian/copyright: Update copyright attributions. new c3dc4b4 debian/changelog: whitespace fixup. new 2aa9bc9 accessdialog.cpp: fix connect () calls. new c6dd307 sharetray.cpp: fix misleading if indentation warning. The 3 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 | 4 ++-- debian/changelog | 4 +++- sharetray.cpp | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) -- 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 c3dc4b4f1b0e5d1f5f7776f9b25e7d8802b27412 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 12 15:15:14 2018 +0100 debian/changelog: whitespace fixup. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 42abdb6..9e55a6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,7 +35,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium .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. + for building the executable. * debian/x2godesktopsharing.menu: + Drop file. The menu file is not allowed if a .desktop file is present. * debian/<config>: -- 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 2aa9bc9b9d46911ffabfa3b81ef67d03d85f3ec0 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 12 15:31:40 2018 +0100 accessdialog.cpp: fix connect () calls. --- accessdialog.cpp | 4 ++-- debian/changelog | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/accessdialog.cpp b/accessdialog.cpp index 723decb..fc2e156 100644 --- a/accessdialog.cpp +++ b/accessdialog.cpp @@ -42,10 +42,10 @@ AccessWindow::AccessWindow(QString uname, QString hname, QWidget *parent) /* 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); + connect(buttonBox, SIGNAL(accepted), this, SLOT(accept)); buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Deny access")); buttonBox->button(QDialogButtonBox::Cancel)->setDefault(true); - connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); + connect(buttonBox, SIGNAL(rejected), this, SLOT(reject)); hbox->addWidget(buttonBox, 1, Qt::AlignRight | Qt::AlignBottom); /* modality */ diff --git a/debian/changelog b/debian/changelog index 9e55a6d..896e316 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * New upstream version (3.1.1.5): + - accessdialog.cpp: fix connect () calls. * x2godesktopsharing.spec: + Pull in redhat-rpm-config manually. This should probably be done by something else, like... gcc or qmake or qt(4)-dev, but it isn't. -- 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 c6dd3077f6e8f57b6357082468b471b53ad9565d Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Nov 12 15:33:34 2018 +0100 sharetray.cpp: fix misleading if indentation warning. --- debian/changelog | 1 + sharetray.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 896e316..1529988 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium [ Mihai Moldovan ] * New upstream version (3.1.1.5): - accessdialog.cpp: fix connect () calls. + - sharetray.cpp: fix misleading if indentation warning. * x2godesktopsharing.spec: + Pull in redhat-rpm-config manually. This should probably be done by something else, like... gcc or qmake or qt(4)-dev, but it isn't. diff --git a/sharetray.cpp b/sharetray.cpp index a975004..2889f27 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -240,8 +240,10 @@ ShareTray::~ShareTray() qDebug() <<"stopping desktop sharing"; slotStopSharing(); if ( QFile::exists ( lockFname ) ) + { QFile::remove ( lockFname ); qDebug() <<"lock file removed"; + } saveUserSettings(); qDebug() <<"settings saved"; } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git
-
git-admin＠x2go.org