Commit 5ddd59af authored by Alf Gaida's avatar Alf Gaida

New snapshot: 2018.01.07~2018.01.06-21-ga448091-1

parent 0bd567ba
......@@ -307,13 +307,17 @@ ControlBox::ControlBox(const QCommandLineParser& parser, QWidget *parent)
ui.groupBox_process->setVisible(ui.checkBox_advanced->isChecked() );
enableRunOnStartup(ui.checkBox_runonstartup->isChecked() );
// Create the notifyclient, make four tries; first immediately in constructor, then
// at 1/2 second, 2 seconds and finally at 8 seconds
// Create the notifyclient.
notifyclient = new NotifyClient(this);
this->connectNotifyClient();
QTimer::singleShot(500, this, SLOT(connectNotifyClient()));
QTimer::singleShot(2 * 1000, this, SLOT(connectNotifyClient()));
QTimer::singleShot(8 * 1000, this, SLOT(connectNotifyClient()));
// Only try to connect to the notifyclient if we actually need it
if(this->settings->value("enable_daemon_notifications").toBool()) {
// Make four tries; first immediately, then
// at 1/2 second, 2 seconds and finally at 8 seconds
this->connectNotifyClient();
QTimer::singleShot(500, this, SLOT(connectNotifyClient()));
QTimer::singleShot(2 * 1000, this, SLOT(connectNotifyClient()));
QTimer::singleShot(8 * 1000, this, SLOT(connectNotifyClient()));
}
// setup the dbus interface to connman.manager
con_manager = NULL;
......@@ -489,7 +493,6 @@ void ControlBox::aboutCMST()
"<center>Jianfeng Zhang (Chinese)"
"<center>sqozz (German)"
"<center>Ilya Shestopalov (Russian)"
"<center>Micrococo (Spanish)"
"<br><center><b>Build Information:</b>"
"<center>Compiled using QT version %5"
/*"<center>Built %6 - %7"*/) .arg(TranslateStrings::cmtr("cmst"))
......
......@@ -59,9 +59,6 @@ NotifyClient::NotifyClient(QObject* parent)
// Create our client and try to connect to the notify server
if (! QDBusConnection::sessionBus().isConnected() )
qCritical("CMST - Cannot connect to the session bus.");
// else try to connect to a notification server
else
connectToServer();
// Signals and slots
connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(cleanUp()));
......@@ -77,7 +74,7 @@ void NotifyClient::connectToServer()
{
// return now if we already have a valid connection
if (b_validconnection) return;
notifyclient = new QDBusInterface(DBUS_NOTIFY_SERVICE, DBUS_NOTIFY_PATH, DBUS_NOTIFY_INTERFACE, QDBusConnection::sessionBus(), this);
if (notifyclient->isValid() ) {
b_validconnection = true;
......
cmst (2018.01.07~2018.01.06-21-ga448091-1) experimental-snapshots; urgency=medium
* New snapshot: cmst-2018.01.06-21-ga448091
-- Alf Gaida <agaida@siduction.org> Tue, 01 Jan 2019 18:20:45 +0100
cmst (2018.01.07~2018.01.06-18-ga109778-1) experimental-snapshots; urgency=medium
* New snapshot: cmst-2018.01.06-18-ga109778
......
ource: cmst
Source: cmst
Section: net
Priority: optional
Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment