aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xexamples/exportactiongroup.py8
-rwxr-xr-xexamples/exportmenu.py8
-rw-r--r--examples/info-menumodel.cpp4
-rw-r--r--examples/render-menumodel.qml8
-rw-r--r--examples/unityqmlmenumodel.qml8
-rw-r--r--libqmenumodel/QMenuModel/plugin.h2
-rw-r--r--libqmenumodel/src/qdbusactiongroup.cpp4
-rw-r--r--libqmenumodel/src/qdbusmenumodel.cpp4
-rw-r--r--libqmenumodel/src/qstateaction.cpp4
-rw-r--r--tests/script/dbusmenuscript.h6
-rw-r--r--tests/script/menuscript.py6
11 files changed, 31 insertions, 31 deletions
diff --git a/examples/exportactiongroup.py b/examples/exportactiongroup.py
index b1237a8..df05b0d 100755
--- a/examples/exportactiongroup.py
+++ b/examples/exportactiongroup.py
@@ -18,8 +18,8 @@
"""
This example script exports an action group on the session bus under the name
-com.canonical.testactiongroup and at the object path
-/com/canonical/testactiongroup.
+org.ayatana.testactiongroup and at the object path
+/org/ayatana/testactiongroup.
"""
import sys
@@ -28,8 +28,8 @@ from gi.repository import Gio
from gi.repository import GLib
-BUS_NAME = 'com.canonical.testactiongroup'
-BUS_OBJECT_PATH = '/com/canonical/testactiongroup'
+BUS_NAME = 'org.ayatana.testactiongroup'
+BUS_OBJECT_PATH = '/org/ayatana/testactiongroup'
def action_activated(action, data):
diff --git a/examples/exportmenu.py b/examples/exportmenu.py
index b7c37b1..ed996e2 100755
--- a/examples/exportmenu.py
+++ b/examples/exportmenu.py
@@ -18,7 +18,7 @@
"""
This example script exports a menu model on the session bus under the name
-com.canonical.testmenu and at the object path /com/canonical/testmenu.
+org.ayatana.testmenu and at the object path /org/ayatana/testmenu.
The menu model contains items that have attributes with custom values, as well
as sub-menus.
"""
@@ -29,8 +29,8 @@ from gi.repository import Gio
from gi.repository import GLib
-BUS_NAME = 'com.canonical.testmenu'
-BUS_OBJECT_PATH = '/com/canonical/testmenu'
+BUS_NAME = 'org.ayatana.testmenu'
+BUS_OBJECT_PATH = '/org/ayatana/testmenu'
def bus_acquired(bus, name):
menu = Gio.Menu()
@@ -42,7 +42,7 @@ def bus_acquired(bus, name):
bar = Gio.MenuItem.new('bar', 'bar')
bar.set_attribute_value('x-defaultvalue',
GLib.Variant.new_string('Hello World!'))
- bar.set_attribute_value('x-canonical-currentvalue',
+ bar.set_attribute_value('x-ayatana-currentvalue',
GLib.Variant.new_string('awesome'))
bar.set_attribute_value('x-velocity', GLib.Variant.new_uint64(83374))
menu.append_item(bar)
diff --git a/examples/info-menumodel.cpp b/examples/info-menumodel.cpp
index a0bdb0a..d4fd0a7 100644
--- a/examples/info-menumodel.cpp
+++ b/examples/info-menumodel.cpp
@@ -33,8 +33,8 @@
#include <QtCore/QObject>
-#define BUS_NAME "com.canonical.testmenu"
-#define BUS_OBJECT_PATH "/com/canonical/testmenu"
+#define BUS_NAME "org.ayatana.testmenu"
+#define BUS_OBJECT_PATH "/org/ayatana/testmenu"
class MenuModelMonitor : public QDBusMenuModel
diff --git a/examples/render-menumodel.qml b/examples/render-menumodel.qml
index 7d8e0a1..5458eeb 100644
--- a/examples/render-menumodel.qml
+++ b/examples/render-menumodel.qml
@@ -18,8 +18,8 @@
*/
// This example QML application renders a menu model exposed on the session bus
-// under the well-known name com.canonical.testmenu and at the object path
-// /com/canonical/testmenu.
+// under the well-known name org.ayatana.testmenu and at the object path
+// /org/ayatana/testmenu.
import QtQuick 2.0
import QMenuModel 0.1
@@ -32,8 +32,8 @@ Item {
QDBusMenuModel {
id: menuModel
busType: DBus.SessionBus
- busName: "com.canonical.testmenu"
- objectPath: "/com/canonical/testmenu"
+ busName: "org.ayatana.testmenu"
+ objectPath: "/org/ayatana/testmenu"
onStatusChanged: {
if (status == DBus.Connecting) {
view.reset()
diff --git a/examples/unityqmlmenumodel.qml b/examples/unityqmlmenumodel.qml
index c0e5adc..e7360e0 100644
--- a/examples/unityqmlmenumodel.qml
+++ b/examples/unityqmlmenumodel.qml
@@ -25,9 +25,9 @@ Item {
UnityMenuModel {
id: menu
- busName: "com.canonical.indicator.sound"
- actions: { "indicator": "/com/canonical/indicator/sound" }
- menuObjectPath: "/com/canonical/indicator/sound/desktop"
+ busName: "org.ayatana.indicator.sound"
+ actions: { "indicator": "/org/ayatana/indicator/sound" }
+ menuObjectPath: "/org/ayatana/indicator/sound/desktop"
}
ListView {
@@ -42,7 +42,7 @@ Item {
if (isSeparator) {
return separator;
}
- else if (type == "com.canonical.unity.slider") {
+ else if (type == "org.ayatana.indicator.slider") {
listview.model.loadExtendedAttributes(index, {'min-icon': 'icon',
'max-icon': 'icon'});
return slider;
diff --git a/libqmenumodel/QMenuModel/plugin.h b/libqmenumodel/QMenuModel/plugin.h
index 3474139..2d06eb8 100644
--- a/libqmenumodel/QMenuModel/plugin.h
+++ b/libqmenumodel/QMenuModel/plugin.h
@@ -25,7 +25,7 @@
class QMenuModelQmlPlugin : public QQmlExtensionPlugin
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "com.canonical.qmenumodel")
+ Q_PLUGIN_METADATA(IID "org.ayatana.qmenumodel")
public:
void initializeEngine(QQmlEngine *engine, const char *uri);
diff --git a/libqmenumodel/src/qdbusactiongroup.cpp b/libqmenumodel/src/qdbusactiongroup.cpp
index edbb073..0ff734b 100644
--- a/libqmenumodel/src/qdbusactiongroup.cpp
+++ b/libqmenumodel/src/qdbusactiongroup.cpp
@@ -43,8 +43,8 @@
QDBusActionGroup {
id: actionGroup
busType: 1
- busName: "com.ubuntu.menu"
- objectPath: "com/ubuntu/menu/actions"
+ busName: "org.ayatana.menu"
+ objectPath: "org/ayatana/menu/actions"
}
Button {
diff --git a/libqmenumodel/src/qdbusmenumodel.cpp b/libqmenumodel/src/qdbusmenumodel.cpp
index 207584e..8f70a1b 100644
--- a/libqmenumodel/src/qdbusmenumodel.cpp
+++ b/libqmenumodel/src/qdbusmenumodel.cpp
@@ -38,8 +38,8 @@
QDBusMenuModel {
id: menuModel
busType: 1
- busName: "com.ubuntu.menu"
- objectPath: "com/ubuntu/menu"
+ busName: "org.ayatana.menu"
+ objectPath: "org/ayatana/menu"
}
ListView {
diff --git a/libqmenumodel/src/qstateaction.cpp b/libqmenumodel/src/qstateaction.cpp
index fcffa44..e9736e8 100644
--- a/libqmenumodel/src/qstateaction.cpp
+++ b/libqmenumodel/src/qstateaction.cpp
@@ -36,8 +36,8 @@
QDBusActionGroup {
id: actionGroup
busType: 1
- busName: "com.ubuntu.menu"
- objectPath: "com/ubuntu/menu/actions"
+ busName: "org.ayatana.menu"
+ objectPath: "org/ayatana/menu/actions"
}
Button {
diff --git a/tests/script/dbusmenuscript.h b/tests/script/dbusmenuscript.h
index 862686c..03c5ad3 100644
--- a/tests/script/dbusmenuscript.h
+++ b/tests/script/dbusmenuscript.h
@@ -24,9 +24,9 @@
#include <QDBusInterface>
#include <QPair>
-#define SCRIPT_SERVICE_NAME "com.canonical.test"
-#define SCRIPT_OBJECT_PATH "/com/canonical/test/menuscript"
-#define SCRIPT_INTERFACE_NAME "com.canonical.test.menuscript"
+#define SCRIPT_SERVICE_NAME "org.ayatana.test"
+#define SCRIPT_OBJECT_PATH "/org/ayatana/test/menuscript"
+#define SCRIPT_INTERFACE_NAME "org.ayatana.test.menuscript"
#define MENU_SERVICE_NAME SCRIPT_SERVICE_NAME ".menu"
#define MENU_OBJECT_PATH SCRIPT_OBJECT_PATH "/menu"
diff --git a/tests/script/menuscript.py b/tests/script/menuscript.py
index db71c08..caa96e2 100644
--- a/tests/script/menuscript.py
+++ b/tests/script/menuscript.py
@@ -21,9 +21,9 @@ from gi.repository import GObject
from gi.repository import GLib
from gi.repository import Gio
-SERVICE_NAME = "com.canonical.test"
-INTERFACE_NAME = "com.canonical.test.menuscript"
-OBJECT_PATH = "/com/canonical/test/menuscript"
+SERVICE_NAME = "org.ayatana.test"
+INTERFACE_NAME = "org.ayatana.test.menuscript"
+OBJECT_PATH = "/org/ayatana/test/menuscript"
MENU_SERVICE_NAME= SERVICE_NAME + ".menu"
MENU_OBJECT_PATH = OBJECT_PATH + "/menu"
bus = None
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 20:24:46 +0000