Commit d4cbf105 authored by Alf Gaida's avatar Alf Gaida

New snapshot: cmst-2018.01.06-9-g195c36f

parent 84ad98e8
...@@ -317,6 +317,8 @@ ControlBox::ControlBox(const QCommandLineParser& parser, QWidget *parent) ...@@ -317,6 +317,8 @@ ControlBox::ControlBox(const QCommandLineParser& parser, QWidget *parent)
QTimer::singleShot(8 * 1000, this, SLOT(connectNotifyClient())); QTimer::singleShot(8 * 1000, this, SLOT(connectNotifyClient()));
// setup the dbus interface to connman.manager // setup the dbus interface to connman.manager
con_manager = NULL;
vpn_manager = NULL;
if (! QDBusConnection::systemBus().isConnected() ) logErrors(CMST::Err_No_DBus); if (! QDBusConnection::systemBus().isConnected() ) logErrors(CMST::Err_No_DBus);
else { else {
con_manager = new QDBusInterface(DBUS_CON_SERVICE, DBUS_PATH, DBUS_CON_MANAGER, QDBusConnection::systemBus(), this); con_manager = new QDBusInterface(DBUS_CON_SERVICE, DBUS_PATH, DBUS_CON_MANAGER, QDBusConnection::systemBus(), this);
...@@ -352,7 +354,6 @@ ControlBox::ControlBox(const QCommandLineParser& parser, QWidget *parent) ...@@ -352,7 +354,6 @@ ControlBox::ControlBox(const QCommandLineParser& parser, QWidget *parent)
this->clearCounters(); this->clearCounters();
// VPN manager. Disable if commandline or option is set // VPN manager. Disable if commandline or option is set
vpn_manager = NULL;
if (parser.isSet("disable-vpn") ? true : (b_so && ui.checkBox_disablevpn->isChecked()) ) { if (parser.isSet("disable-vpn") ? true : (b_so && ui.checkBox_disablevpn->isChecked()) ) {
ui.tabWidget->setTabEnabled(ui.tabWidget->indexOf(ui.VPN), false); ui.tabWidget->setTabEnabled(ui.tabWidget->indexOf(ui.VPN), false);
ui.pushButton_vpn_editor->setDisabled(true); ui.pushButton_vpn_editor->setDisabled(true);
...@@ -1148,7 +1149,7 @@ void ControlBox::dbsServicePropertyChanged(QString property, QDBusVariant dbvalu ...@@ -1148,7 +1149,7 @@ void ControlBox::dbsServicePropertyChanged(QString property, QDBusVariant dbvalu
} }
else { else {
notifyclient->setSummary(QString(tr("VPN Disengaged")) ); notifyclient->setSummary(QString(tr("VPN Disengaged")) );
notifyclient->setIcon(iconman->getIconName("onnection_not_ready") ); notifyclient->setIcon(iconman->getIconName("connection_not_ready") );
} }
notifyclient->setBody(QString(tr("Object Path: %1")).arg(s_path) ); notifyclient->setBody(QString(tr("Object Path: %1")).arg(s_path) );
notifyclient->setUrgency(Nc::UrgencyNormal); notifyclient->setUrgency(Nc::UrgencyNormal);
......
...@@ -35,7 +35,7 @@ DEALINGS IN THE SOFTWARE. ...@@ -35,7 +35,7 @@ DEALINGS IN THE SOFTWARE.
///////////////////////////////// Program Values /////////////////////// ///////////////////////////////// Program Values ///////////////////////
// //
// Program Info (may be visible, but don't mark for tranalation) // Program Info (may be visible, but don't mark for tranalation)
#define VERSION "2018.01.21-1" #define VERSION "2018.03.29-1"
#define RELEASE_DATE "6 January 2018" #define RELEASE_DATE "6 January 2018"
#define COPYRIGHT_DATE "2013-2018" #define COPYRIGHT_DATE "2013-2018"
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<allow send_destination="org.cmst.roothelper" <allow send_destination="org.cmst.roothelper"
send_interface="org.cmst.roothelper"/> send_interface="org.cmst.roothelper"/>
</policy> </policy>
<policy group="network"> <policy group="netdev">
<allow send_destination="org.cmst.roothelper" <allow send_destination="org.cmst.roothelper"
send_interface="org.cmst.roothelper"/> send_interface="org.cmst.roothelper"/>
</policy> </policy>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<allow send_destination="org.cmst.roothelper" <allow send_destination="org.cmst.roothelper"
send_interface="org.cmst.roothelper"/> send_interface="org.cmst.roothelper"/>
</policy> </policy>
<policy group="network"> <policy group="netdev">
<allow send_destination="org.cmst.roothelper" <allow send_destination="org.cmst.roothelper"
send_interface="org.cmst.roothelper"/> send_interface="org.cmst.roothelper"/>
</policy> </policy>
......
cmst (2018.01.07~9-g195c36f-1) experimental-snapshots; urgency=medium
* New snapshot: cmst-2018.01.06-9-g195c36f
-- Alf Gaida <agaida@siduction.org> Wed, 04 Apr 2018 20:32:06 +0200
cmst (2018.01.07~2-g495ab94-1) experimental-snapshots; urgency=medium cmst (2018.01.07~2-g495ab94-1) experimental-snapshots; urgency=medium
* New snapshot: cmst-2018.01.06-2-g495ab94 * New snapshot: cmst-2018.01.06-2-g495ab94
......
...@@ -5,7 +5,7 @@ Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org> ...@@ -5,7 +5,7 @@ Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
Uploaders: Unit 193 <unit193@ubuntu.com>, Uploaders: Unit 193 <unit193@ubuntu.com>,
ChangZhuo Chen (陳昌倬) <czchen@debian.org>, ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
Alf Gaida <agaida@siduction.org> Alf Gaida <agaida@siduction.org>
Build-Depends: debhelper (>= 10), Build-Depends: debhelper (>= 11~),
qtbase5-dev, qtbase5-dev,
qt5-qmake, qt5-qmake,
quilt quilt
......
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
<b> In Progress</b> <b> In Progress</b>
<ul> <ul>
<li>Fixed segfaul on close when running without Connman.</li> <li>Fixed segfaul on close when running without Connman.</li>
<li>Revert network group to "netdev" in Slackware and Debian.</li>
<li>Pull request #183 (fixed typo in notification icon name)</li>
</ul> </ul>
<b> 2018.01.06</b> <b> 2018.01.06</b>
<ul> <ul>
......
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