Update interface name

pull/15/head
reionwong 4 years ago
parent 58601e62ab
commit f242d0bcd4

@ -26,7 +26,7 @@ int main(int argc, char *argv[])
QApplication a(argc, argv);
a.setQuitOnLastWindowClosed(true);
// if (!QDBusConnection::sessionBus().registerService("org.cutefish.Chotkeys")) {
// if (!QDBusConnection::sessionBus().registerService("com.cutefish.Chotkeys")) {
// return -1;
// }

@ -14,10 +14,10 @@ target_link_libraries(${TARGET}
)
configure_file(
org.cutefish.cpufreq.pkexec.policy.in
org.cutefish.cpufreq.pkexec.policy
com.cutefish.cpufreq.pkexec.policy.in
com.cutefish.cpufreq.pkexec.policy
@ONLY
)
install(TARGETS ${TARGET} DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.cutefish.cpufreq.pkexec.policy DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions/)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/com.cutefish.cpufreq.pkexec.policy DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions/)

@ -2,7 +2,7 @@
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
<policyconfig>
<action id="org.cutefish.cpufreq.pkexec">
<action id="com.cutefish.cpufreq.pkexec">
<message>Authentication is required to Change CPU configuration</message>
<icon_name>battery</icon_name>
<defaults>

@ -46,7 +46,7 @@ int main(int argc, char *argv[])
PolKitAgentListener listener;
PolkitQt1::UnixSessionSubject session(getpid());
if (!listener.registerListener(session, QStringLiteral("/org/cutefishos/PolicyKit1/AuthenticationAgent")))
if (!listener.registerListener(session, QStringLiteral("/com/cutefish/PolicyKit1/AuthenticationAgent")))
return -1;
return app.exec();

@ -10,7 +10,7 @@ set(SOURCES
)
qt5_add_dbus_adaptor(DBUS_SOURCES
cpu/org.cutefish.CPUManagement.xml
cpu/com.cutefish.CPUManagement.xml
cpu/cpumanagement.h CPUManagement)
set_source_files_properties(${DBUS_SOURCES} PROPERTIES SKIP_AUTOGEN ON)

@ -25,5 +25,5 @@ Application::Application(QObject *parent)
, m_lidWatcher(new LidWatcher)
, m_cpuManagement(new CPUManagement)
{
QDBusConnection::sessionBus().registerService(QStringLiteral("org.cutefish.PowerManager"));
QDBusConnection::sessionBus().registerService(QStringLiteral("com.cutefish.PowerManager"));
}

@ -1,6 +1,6 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.cutefish.CPUManagement">
<interface name="com.cutefish.CPUManagement">
<property name="mode" type="i" access="read"/>
<method name="setMode">

@ -18,10 +18,10 @@ target_link_libraries(${PROJECT_NAME}
)
configure_file(
org.cutefish.brightness.pkexec.policy.in
org.cutefish.brightness.pkexec.policy
com.cutefish.brightness.pkexec.policy.in
com.cutefish.brightness.pkexec.policy
@ONLY
)
install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.cutefish.brightness.pkexec.policy DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions/)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/com.cutefish.brightness.pkexec.policy DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions/)

@ -2,7 +2,7 @@
"-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
<policyconfig>
<action id="org.cutefish.brightness.pkexec">
<action id="com.cutefish.brightness.pkexec">
<message>Authentication is required to Change Brightness</message>
<icon_name>battery</icon_name>
<defaults>

@ -12,7 +12,7 @@ set(SOURCES
)
qt5_add_dbus_adaptor(DBUS_SOURCES
org.cutefish.Session.xml
com.cutefish.Session.xml
application.h Application
sessionadaptor SessionAdaptor)
set_source_files_properties(${DBUS_SOURCES} PROPERTIES SKIP_AUTOGEN ON)

@ -89,7 +89,7 @@ Application::Application(int &argc, char **argv)
new SessionAdaptor(this);
// connect to D-Bus and register as an object:
QDBusConnection::sessionBus().registerService(QStringLiteral("org.cutefish.Session"));
QDBusConnection::sessionBus().registerService(QStringLiteral("com.cutefish.Session"));
QDBusConnection::sessionBus().registerObject(QStringLiteral("/Session"), this);
QCommandLineParser parser;

@ -1,6 +1,6 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.cutefish.Session">
<interface name="com.cutefish.Session">
<method name="logout">
<annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
</method>

@ -31,25 +31,25 @@ set(FORMS "")
set(RESOURCES "")
qt5_add_dbus_adaptor(DBUS_SOURCES
audio/org.cutefish.Audio.xml
audio/com.cutefish.Audio.xml
audio/audiomanager.h AudioManager)
qt5_add_dbus_adaptor(DBUS_SOURCES
brightness/org.cutefish.Brightness.xml
brightness/com.cutefish.Brightness.xml
brightness/brightnessmanager.h BrightnessManager)
qt5_add_dbus_adaptor(DBUS_SOURCES
theme/org.cutefish.Theme.xml
theme/com.cutefish.Theme.xml
theme/thememanager.h ThemeManager)
qt5_add_dbus_adaptor(DBUS_SOURCES
battery/org.cutefish.PrimaryBattery.xml
battery/com.cutefish.PrimaryBattery.xml
battery/battery.h Battery)
qt5_add_dbus_adaptor(DBUS_SOURCES
language/org.cutefish.Language.xml
language/com.cutefish.Language.xml
language/language.h Language)
qt5_add_dbus_adaptor(DBUS_SOURCES
dock/org.cutefish.Dock.xml
dock/com.cutefish.Dock.xml
dock/dock.h Dock)
qt5_add_dbus_adaptor(DBUS_SOURCES
mouse/org.cutefish.Mouse.xml
mouse/com.cutefish.Mouse.xml
mouse/mousemanager.h Mouse)
set_source_files_properties(${DBUS_SOURCES} PROPERTIES SKIP_AUTOGEN ON)

@ -41,7 +41,7 @@ Application::Application(int &argc, char **argv)
{
new DBusAdaptor(this);
// connect to D-Bus and register as an object:
QDBusConnection::sessionBus().registerService(QStringLiteral("org.cutefish.Settings"));
QDBusConnection::sessionBus().registerService(QStringLiteral("com.cutefish.Settings"));
// m_kwinTimer->setSingleShot(false);
// m_kwinTimer->setInterval(50);
@ -66,7 +66,7 @@ Application::Application(int &argc, char **argv)
void Application::invokeDesktopProcess()
{
// Start desktop UI component.
QDBusInterface sessionInterface("org.cutefish.Session", "/Session", "org.cutefish.Session",
QDBusInterface sessionInterface("com.cutefish.Session", "/Session", "com.cutefish.Session",
QDBusConnection::sessionBus());
if (sessionInterface.isValid()) {

@ -1,6 +1,6 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.cutefish.Audio">
<interface name="com.cutefish.Audio">
<method name="setVolume">
<arg name="volume" type="i" direction="in"/>
</method>

@ -1,6 +1,6 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.cutefish.PrimaryBattery">
<interface name="com.cutefish.PrimaryBattery">
<method name="refresh"></method>
<property name="chargeState" type="i" access="read"/>

@ -1,6 +1,6 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.cutefish.Brightness">
<interface name="com.cutefish.Brightness">
<method name="setValue">
<arg name="value" type="i" direction="in"/>
</method>

@ -1,6 +1,6 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.cutefish.Dock">
<interface name="com.cutefish.Dock">
<property name="iconSize" type="i" access="read"/>
<method name="setIconSize">
<arg name="value" type="i" direction="in"/>

@ -1,6 +1,6 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.cutefish.Language">
<interface name="com.cutefish.Language">
<method name="setLanguage">
<arg name="value" type="s" direction="in"/>
</method>

@ -1,6 +1,6 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.cutefish.Mouse">
<interface name="com.cutefish.Mouse">
<method name="setLeftHanded"><arg name="value" type="b" direction="in"/></method>
<property name="leftHanded" type="b" access="read"/>
<signal name="leftHandedChanged"></signal>

@ -1,6 +1,6 @@
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
<node>
<interface name="org.cutefish.Theme">
<interface name="com.cutefish.Theme">
<method name="setDarkMode">
<arg name="darkMode" type="b" direction="in"/>
</method>

@ -23,9 +23,9 @@
#include <QApplication>
#include <QProcess>
const static QString s_dbusName = "org.cutefish.Session";
const static QString s_dbusName = "com.cutefish.Session";
const static QString s_pathName = "/Session";
const static QString s_interfaceName = "org.cutefish.Session";
const static QString s_interfaceName = "com.cutefish.Session";
Actions::Actions(QObject *parent)
: QObject(parent)

@ -34,7 +34,7 @@ int main(int argc, char *argv[])
QGuiApplication app(argc, argv);
if (!QDBusConnection::sessionBus().registerService("org.cutefish.ShutdownUI")) {
if (!QDBusConnection::sessionBus().registerService("com.cutefish.ShutdownUI")) {
return -1;
}

Loading…
Cancel
Save