Upgrading to GitLab 11.10.0. Expect errors and see debian-infrastructure-announce@lists.debian.org for further information.

Commit f14e3dcf authored by Alf Gaida's avatar Alf Gaida

Cherry-picking upstream version 2017.03.18.

* Cherry-picking upstream version 2017.03.18.
* Bump Standards to 4.0.0
* Bumped years in copyright
* Fixed link to copyright format
* Dropped the outdated debian/README
* Removed obsolete dbus-policy.patch, applied upstream
* Removed obsolete keywords.patch, applied upstream
* Removed obsolete surpress-vpn-warning.patch, applied upstream
parent 78125424
......@@ -4,7 +4,7 @@
Code for the user agent registered on DBus. When the connman daemon
needs to communicate with the user it does so through this agent.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......@@ -59,6 +59,7 @@ ConnmanAgent::ConnmanAgent(QObject* parent)
// Create Adaptor and register this Agent on the system bus.
new AgentAdaptor(this);
QDBusConnection::systemBus().registerObject(AGENT_OBJECT, this);
}
/////////////////////////////////////// PUBLIC Q_SLOTS////////////////////////////////
......
......@@ -3,7 +3,7 @@
Code for the user agent registered on DBus. When the connman daemon
needs to communicate with the user it does so through this agent.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -5,7 +5,7 @@ needs to communicate with the user it does so through the agent. The
agent has a QDialog as a class member, and agent_dialog.cpp manages
that dialog.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......@@ -50,7 +50,7 @@ AgentDialog::AgentDialog(QWidget* parent)
cli_browsers.clear();
cli_browsers << "lynx" << "w3m" << "links" << "elinks";
gui_browsers.clear();
gui_browsers << "google-chrome" << "google-chrome-unstable" << "chromium" << "opera"; // blink based
gui_browsers << "google-chrome" << "google-chrome-unstable" << "chromium" << "opera" << "brave"; // blink based
gui_browsers << "firefox" << "seamonkey"; // gecko based
gui_browsers << "qupzilla" << "luakit" << "dwb" << "jumanji" << "midoir" << "surf" << "vimprobable"; // webkit based
gui_browsers << "konqueror" << "dillo" << "xdg-open"; // other
......@@ -250,6 +250,7 @@ void AgentDialog::updateBrowserChoice(const QModelIndex & current, const QModelI
ui.lineEdit_browser->setText(current.data().toString());
}
//
// Slot to clear selection in the browser list view
// Called when ui.lineEdit_browser textEdited() signal is emitted
......@@ -257,6 +258,7 @@ void AgentDialog::enteringBrowser()
{
ui.listView_browsers->selectionModel()->clearSelection();
}
//
// Slot to launch the selected browser
// Called when ui.pushButton_launch_browser is pressed
......@@ -300,4 +302,6 @@ void AgentDialog::launchBrowser()
} else {
process->startDetached(chosenBrowser, QStringList(ui.lineEdit_url->text()) );
}
return;
}
......@@ -5,7 +5,7 @@ needs to communicate with the user it does so through the agent. The
agent has a QDialog as a class member, and agent_dialog.cpp manages
that dialog.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>386</width>
<height>642</height>
<width>450</width>
<height>587</height>
</rect>
</property>
<property name="windowTitle">
......@@ -324,7 +324,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_browser_url">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Connman is requesting that you open a web browser to complete the login process.&lt;/p&gt;&lt;p&gt;We have scanned your PATH for browsers and any browsers found are shown in the list below. You may select any one browser to use it for the login. If your web browser is not shown in the list you may enter it directly in the&lt;span style=&quot; font-weight:600;&quot;&gt; Choose or enter a browser box&lt;/span&gt;.&lt;/p&gt;&lt;p&gt;To launch the browser click the &lt;span style=&quot; font-weight:600;&quot;&gt;Launch Browser&lt;/span&gt; button. &lt;/p&gt;&lt;p&gt;If you wish to login manually close this dialog, start your web browser and proceed to the URL shown in the &lt;span style=&quot; font-weight:600;&quot;&gt;Login URL&lt;/span&gt; box.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;ConnMan is requesting that you open a web browser to complete the login process.&lt;/p&gt;&lt;p&gt;We have scanned your PATH for browsers and any browsers found are shown in the list below. You may select any one browser to use it for the login. If your web browser is not shown in the list you may enter it directly in the&lt;span style=&quot; font-weight:600;&quot;&gt; Choose or enter a browser box&lt;/span&gt;.&lt;/p&gt;&lt;p&gt;To launch the browser click the &lt;span style=&quot; font-weight:600;&quot;&gt;Launch Browser&lt;/span&gt; button. &lt;/p&gt;&lt;p&gt;If you wish to login manually close this dialog, start your web browser and proceed to the URL shown in the &lt;span style=&quot; font-weight:600;&quot;&gt;Login URL&lt;/span&gt; box.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Brave Browser Users:&lt;/span&gt; Note that Brave does not seem to accept a URL to start with. After the browser starts you will need to enter the URL manually. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
......
......@@ -3,7 +3,7 @@
Code to manage the primary user interface to include the QDialog the
user interfaces with and the system tray icon.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......@@ -56,7 +56,6 @@ DEALINGS IN THE SOFTWARE.
# include "./code/iconman/iconman.h"
# include "./code/vpn_agent/vpnagent.h"
// Two of the connman.Manager query functions will return an array of structures.
// This struct provides a receiving element we can use to collect the return data.
struct arrayElement
......@@ -162,7 +161,7 @@ class ControlBox : public QDialog
bool getServices();
bool getArray(QList<arrayElement>&, const QDBusMessage&);
bool getMap(QMap<QString,QVariant>&, const QDBusMessage&);
void logErrors(const quint8&);
void logErrors(const quint16&);
QString readResourceText(const char*);
void clearCounters();
QString getNickName(const QDBusObjectPath&);
......
......@@ -3,7 +3,7 @@
Code for the connection counter registered on DBus. When registered the
connman daemon will communicate to this object with signals.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -3,7 +3,7 @@
Code for the connection counter registered on DBus. When registered the
connman daemon will communicate to this object with signals.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -3,7 +3,7 @@
Class to manage icons and allow the user to provide substitutions based
on the the system theme.
Copyright (C) 2015-2016
Copyright (C) 2015-2017
by: Andrew J. Bibb
License: MIT
......@@ -39,6 +39,7 @@ DEALINGS IN THE SOFTWARE.
# include <QSettings>
# include <QMessageBox>
# include <QProcessEnvironment>
# include <QDirIterator>
// Constructor
IconManager::IconManager(QObject* parent) : QObject(parent)
......@@ -132,7 +133,7 @@ QIcon IconManager::getIcon(const QString& name)
}
//
// Function to return a QString containing the icon theme name or resource path
// Function to return a QString containing the fully qualified icon name or resource path
QString IconManager::getIconName(const QString& name)
{
// Data members
......@@ -141,7 +142,7 @@ QString IconManager::getIconName(const QString& name)
// If the internal theme is being used (and the user has not
// messed up the local config file) use that first.
if (QIcon::themeName() == INTERNAL_THEME ) {
const QString res_path = ie.resource_path.section('|', 0, 0).simplified();
const QString res_path = ie.resource_path.section(' ', 0, 0).simplified();
if (QFileInfo(res_path).exists() )
return res_path;
} // if using internal theme
......@@ -150,27 +151,35 @@ QString IconManager::getIconName(const QString& name)
if (ie.theme_names.size() > 0 ) {
for (int i = 0; i < ie.theme_names.size(); ++i) {
QString theme_icon = ie.theme_names.at(i).section('|', 0, 0).simplified();
if (QIcon::hasThemeIcon(theme_icon) )
return theme_icon;
if (QIcon::hasThemeIcon(theme_icon) ) {
QStringList filter_list;
filter_list << "24x24" << "22x22" << "16x16";
QString rtn = findQualifiedName(theme_icon, filter_list);
if (! rtn.isEmpty() ) return rtn;
} // if has ThemeIcon
} // for
} // if namelist contains entries
// Next look for a freedesktop.org named icon
if (! ie.fdo_name.isEmpty() ) {
QString theme_icon = ie.fdo_name.section('|', 0, 0).simplified();
if (QIcon::hasThemeIcon(theme_icon) )
return theme_icon;
if (QIcon::hasThemeIcon(theme_icon) ) {
QStringList filter_list;
filter_list << "24x24" << "22x22" << "16x16";
QString rtn = findQualifiedName(theme_icon, filter_list);
if (! rtn.isEmpty() ) return rtn;
} // if has ThemeIcon
} // if freedesktop name not empty
// Then look for hardcoded name in the users config dir
if (! ie.resource_path.isEmpty() ) {
const QString res_path = ie.fdo_name.section('|', 0, 0).simplified();
const QString res_path = ie.fdo_name.section(' ', 0, 0).simplified();
if (QFileInfo(res_path).exists() )
return res_path;
}
// Last stop is our fallback hard coded into the program
const QString res_path = getFallback(name).section('|', 0, 0).simplified();
const QString res_path = getFallback(name).section(' ', 0, 0).simplified();
return res_path;
}
......@@ -464,3 +473,43 @@ QPixmap IconManager::processArt(const QString& res, const QColor& color)
return QPixmap::fromImage(dest);
}
//
// Function to find an icon file somewhere in the system. Return value is
// the fully qualified path to the icon file if found, a null string otherwise.
//
// iconname - the icon name to search for
// filter - a string list containing an order preference for subdirectory names to return
// to search for,
//
// Called from the getIconName function
QString IconManager::findQualifiedName(const QString& iconname, const QStringList& sl_filter)
{
// variables
QStringList sl_results = QStringList();
// get search paths
QStringList sl_dirs = QIcon::themeSearchPaths();
if (sl_dirs.size() < 1) return QString();
// iterate over the search paths
for (int i = 0; i < sl_dirs.size(); ++i) {
QDirIterator dit(QString(sl_dirs.at(i) + '/' + QIcon::themeName()) , QDirIterator::Subdirectories);
while (dit.hasNext()) {
QFileInfo fi(dit.next());
if (fi.completeBaseName() == iconname) sl_results << fi.canonicalFilePath();
} // while
} // for
// search the list for icons matching the filter list and return first found
if (sl_results.size() < 1) return QString();
if (sl_filter.size() < 1) return sl_results.at(0);
for (int i = 0; i < sl_filter.size(); ++i) {
for (int j = 0; j < sl_results.size(); ++j) {
if (sl_results.at(j).contains(sl_filter.at(i)) ) return sl_results.filter(sl_filter.at(i)).at(0);
} // j for
} // i for
// if no filter matches
return sl_results.at(0);
}
......@@ -3,7 +3,7 @@
Class to manage icons and allow the user to provide substitutions based
on the the system theme.
Copyright (C) 2015-2016
Copyright (C) 2015-2017
by: Andrew J. Bibb
License: MIT
......@@ -74,6 +74,7 @@ class IconManager : public QObject
QString extractValue(const QString&);
QString extractKey(const QString&);
QPixmap processArt(const QString&, const QColor&);
QString findQualifiedName(const QString&, const QStringList& = QStringList() );
};
#endif
......@@ -2,7 +2,7 @@
C++ main routine.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -3,7 +3,7 @@
Code for a notify client to interface with a desktop notification
server.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -3,7 +3,7 @@
Code for a notify client to interface with a desktop notification
server.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -2,7 +2,7 @@
Code to manage the Properties Editor dialog.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -2,7 +2,7 @@
Code to manage the Properties Editor dialog.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -2,7 +2,7 @@
Code to manage the Provisioning Editor dialog.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -2,7 +2,7 @@
Code to manage the Provisioning Editor dialog.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -3,7 +3,7 @@
Dialog to display text to the user. Kind of like a neutered QMessageBox
except it has scroll bars built in.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -3,7 +3,7 @@
Dialog to display text to the user. Kind of like a neutered QMessageBox
except it has scroll bars built in.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
/**************************** shared.cpp ***************************
Functions shared across various classes
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -2,7 +2,7 @@
/**************************** shared.h ***************************
Functions shared across various classes
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -4,7 +4,7 @@ Class to manage and present strings that need to be translated. These
are typically not inline strings, rather strings used globally or strings
returned by third parties, for instance, Connman.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -4,7 +4,7 @@ Class to manage and present strings that need to be translated. These
are typically not inline strings, rather strings used globally or strings
returned by third parties, for instance, Connman.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -4,7 +4,7 @@
Code for the user agent registered on DBus. When the connman vpn daemon
needs to communicate with the user it does so through this agent.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -3,7 +3,7 @@
Code for the user agent registered on DBus. When the connman vpn daemon
needs to communicate with the user it does so through this agent.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -5,7 +5,7 @@ needs to communicate with the user it does so through the agent. The
agent has a QDialog as a class member, and agent_dialog.cpp manages
that dialog.
Copyright (C) 2016
Copyright (C) 2017
by: Andrew J. Bibb
License: MIT
......
......@@ -5,7 +5,7 @@ needs to communicate with the user it does so through the agent. The
agent has a QDialog as a class member, and agent_dialog.cpp manages
that dialog.
Copyright (C) 2016
Copyright (C) 2017
by: Andrew J. Bibb
License: MIT
......
......@@ -2,7 +2,7 @@
Code to manage the VPN Provisioning Editor dialog.
Copyright (C) 2016
Copyright (C) 2017
by: Andrew J. Bibb
License: MIT
......
......@@ -2,7 +2,7 @@
Code to manage the VPN Provisioning Editor dialog.
Copyright (C) 2016
Copyright (C) 2017
by: Andrew J. Bibb
License: MIT
......
......@@ -6,7 +6,7 @@ we've moved a lot of that to txt files inside the /text directory which
are compiled in as a resource. This seems to result in a faster
compile, but we now have manage information in two locations.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......@@ -35,10 +35,10 @@ DEALINGS IN THE SOFTWARE.
///////////////////////////////// Program Values ///////////////////////
//
// Program Info (may be visible, but don't mark for tranalation)
#define VERSION "2016.10.03-1"
#define VERSION "2017.03.18-1"
#define RELEASE_DATE "3 October 2016"
#define COPYRIGHT_DATE "2013-2016"
#define RELEASE_DATE "18 March 2017"
#define COPYRIGHT_DATE "2013-2017"
// Program Values:
// QApplication (not user visible)
......
......@@ -2,7 +2,7 @@
main program for the roothelper application
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -6,7 +6,7 @@ name implies roothelper is run as the root user, since we need to read
and write to /var/lib/connman. This program is started by DBus and the
configuration files necessary to make that happen are in the system dir.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -6,7 +6,7 @@ name implies roothelper is run as the root user, since we need to read
and write to /var/lib/connman. This program is started by DBus and the
configuration files necessary to make that happen are in the system dir.
Copyright (C) 2013-2016
Copyright (C) 2013-2017
by: Andrew J. Bibb
License: MIT
......
......@@ -6,11 +6,11 @@
<!-- Only root can own roothelper -->
<policy user="root">
<allow own="org.cmst.roothelper"/>
<allow send_destination="org.cmst.roothelper"/>
<allow send_interface="org.cmst.roothelper"/>
<allow send_destination="org.cmst.roothelper"
send_interface="org.cmst.roothelper"/>
</policy>
<policy group="network">
<allow send_destination="org.cmst.roothelper"/>
<allow send_interface="org.cmst.roothelper"/>
<allow send_destination="org.cmst.roothelper"
send_interface="org.cmst.roothelper"/>
</policy>
</busconfig>
......@@ -6,11 +6,11 @@
<!-- Only root can own roothelper -->
<policy user="root">
<allow own="org.cmst.roothelper"/>
<allow send_destination="org.cmst.roothelper"/>
<allow send_interface="org.cmst.roothelper"/>
<allow send_destination="org.cmst.roothelper"
send_interface="org.cmst.roothelper"/>
</policy>
<policy group="netdev">
<allow send_destination="org.cmst.roothelper"/>
<allow send_interface="org.cmst.roothelper"/>
<policy group="network">
<allow send_destination="org.cmst.roothelper"
send_interface="org.cmst.roothelper"/>
</policy>
</busconfig>
<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
<busconfig>
<!-- Only root can own roothelper -->
<policy user="root">
<allow own="org.cmst.roothelper"/>
<allow send_destination="org.cmst.roothelper"
send_interface="org.cmst.roothelper"/>
</policy>
<policy group="wheel">
<allow send_destination="org.cmst.roothelper"
send_interface="org.cmst.roothelper"/>
</policy>
</busconfig>
......@@ -6,11 +6,11 @@
<!-- Only root can own roothelper -->
<policy user="root">
<allow own="org.cmst.roothelper"/>
<allow send_destination="org.cmst.roothelper"/>
<allow send_interface="org.cmst.roothelper"/>
<allow send_destination="org.cmst.roothelper"
send_interface="org.cmst.roothelper"/>
</policy>
<policy group="netdev">
<allow send_destination="org.cmst.roothelper"/>
<allow send_interface="org.cmst.roothelper"/>
<policy group="network">
<allow send_destination="org.cmst.roothelper"
send_interface="org.cmst.roothelper"/>
</policy>
</busconfig>
......@@ -56,8 +56,11 @@ INSTALLS += appdata
# desktop file
desktop.path = /usr/share/applications
desktop.files = ./misc/desktop/cmst.desktop
!isEmpty(DESTDIR) {
desktop.extra = gtk-update-icon-cache /usr/share/icons/hicolor
}
INSTALLS += desktop
# autostart desktop file
autostart.path = /usr/share/cmst/autostart
autostart.files = ./misc/desktop/cmst-autostart.desktop
......
......@@ -10,7 +10,6 @@
<file>text/license.txt</file>
</qresource>
<qresource prefix="stylesheets">
<file>stylesheets/signal_bar.qss</file>
<file>stylesheets/vpn_connecting.qss</file>
</qresource>
<qresource prefix="translations">
......@@ -22,6 +21,7 @@
<file>translations/cmst_en_US.qm</file>
</qresource>
<qresource prefix="icons">
<file>images/raw_art/blank.png</file>
<file>images/raw_art/network-vpn-acquiring.png</file>
<file>images/raw_art/stock_lock.png</file>
<file>images/interface/golfball_green.png</file>
......
cmst (2017.03.18-1) unstable; urgency=medium
* Cherry-picking upstream version 2017.03.18.
* Bump Standards to 4.0.0
* Bumped years in copyright
* Fixed link to copyright format
* Dropped the outdated debian/README
* Removed obsolete dbus-policy.patch, applied upstream
* Removed obsolete keywords.patch, applied upstream
* Removed obsolete surpress-vpn-warning.patch, applied upstream
-- Alf Gaida <agaida@siduction.org> Mon, 19 Jun 2017 01:05:33 +0200
cmst (2016.10.03-2) unstable; urgency=medium
* Added dbus-policy.patch (already applied upstream)
......
......@@ -8,7 +8,7 @@ Uploaders: Unit 193 <unit193@ubuntu.com>,
Build-Depends: debhelper (>= 10),
qtbase5-dev,
qt5-qmake
Standards-Version: 3.9.8
Standards-Version: 4.0.0
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/cmst.git/?h=debian/sid
Vcs-Git: https://anonscm.debian.org/cgit/pkg-lxqt/cmst.git -b debian/sid
Homepage: https://github.com/andrew-bibb/cmst
......
Description: Dbus policy
Add missing send_destination to roothelper dbus policy file
Author: Kristian Klausen <klausenbusk@hotmail.com>
--- a/apps/rootapp/system/distro/arch/org.cmst.roothelper.conf
+++ b/apps/rootapp/system/distro/arch/org.cmst.roothelper.conf
@@ -6,11 +6,11 @@
<!-- Only root can own roothelper -->
<policy user="root">
<allow own="org.cmst.roothelper"/>
- <allow send_destination="org.cmst.roothelper"/>
- <allow send_interface="org.cmst.roothelper"/>
+ <allow send_destination="org.cmst.roothelper"
+ send_interface="org.cmst.roothelper"/>
</policy>
<policy group="network">
- <allow send_destination="org.cmst.roothelper"/>
- <allow send_interface="org.cmst.roothelper"/>
+ <allow send_destination="org.cmst.roothelper"
+ send_interface="org.cmst.roothelper"/>
</policy>
</busconfig>
--- a/apps/rootapp/system/distro/debian/org.cmst.roothelper.conf
+++ b/apps/rootapp/system/distro/debian/org.cmst.roothelper.conf
@@ -6,11 +6,11 @@
<!-- Only root can own roothelper -->
<policy user="root">
<allow own="org.cmst.roothelper"/>
- <allow send_destination="org.cmst.roothelper"/>
- <allow send_interface="org.cmst.roothelper"/>
+ <allow send_destination="org.cmst.roothelper"
+ send_interface="org.cmst.roothelper"/>
</policy>
- <policy group="netdev">
- <allow send_destination="org.cmst.roothelper"/>
- <allow send_interface="org.cmst.roothelper"/>
+ <policy group="network">
+ <allow send_destination="org.cmst.roothelper"
+ send_interface="org.cmst.roothelper"/>
</policy>
</busconfig>
--- a/apps/rootapp/system/distro/slackware/org.cmst.roothelper.conf
+++ b/apps/rootapp/system/distro/slackware/org.cmst.roothelper.conf
@@ -6,11 +6,11 @@
<!-- Only root can own roothelper -->
<policy user="root">
<allow own="org.cmst.roothelper"/>
- <allow send_destination="org.cmst.roothelper"/>
- <allow send_interface="org.cmst.roothelper"/>
+ <allow send_destination="org.cmst.roothelper"
+ send_interface="org.cmst.roothelper"/>
</policy>
- <policy group="netdev">
- <allow send_destination="org.cmst.roothelper"/>
- <allow send_interface="org.cmst.roothelper"/>
+ <policy group="network">
+ <allow send_destination="org.cmst.roothelper"
+ send_interface="org.cmst.roothelper"/>
</policy>
</busconfig>
Description: Keywords
Add some keywords to the desktop file
Author: Kristian Klausen <klausenbusk@hotmail.com>
--- a/misc/desktop/cmst-autostart.desktop
+++ b/misc/desktop/cmst-autostart.desktop
@@ -10,6 +10,7 @@ Exec=cmst -w5
Terminal=false
StartupNotify=false
X-GNOME-Autostart-enabled=true
+Keywords=Network;Wireless;Wi-Fi;Wifi;IP;LAN;Proxy;WAN;Broadband;Bluetooth;vpn;DNS;
Name[de]=Netzwerk-Konfiguration