diff options
| -rw-r--r-- | data/com.canonical.indicator.session | 10 | ||||
| -rw-r--r-- | data/session.indicator | 4 | ||||
| -rw-r--r-- | src/service.c | 3 | ||||
| -rw-r--r-- | tests/test-service.cc | 6 |
4 files changed, 14 insertions, 9 deletions
diff --git a/data/com.canonical.indicator.session b/data/com.canonical.indicator.session new file mode 100644 index 0000000..fce3554 --- /dev/null +++ b/data/com.canonical.indicator.session @@ -0,0 +1,10 @@ +[Indicator Service] +Name=indicator-session +ObjectPath=/com/canonical/indicator/session + +[desktop] +ObjectPath=/com/canonical/indicator/session/desktop + +[greeter] +ObjectPath=/com/canonical/indicator/session/greeter + diff --git a/data/session.indicator b/data/session.indicator deleted file mode 100644 index b5f6802..0000000 --- a/data/session.indicator +++ /dev/null @@ -1,4 +0,0 @@ -[Indicator Service] -Name=indicator-session -BusName=com.canonical.indicator.session-test -ObjectPath=/com/canonical/indicator/session diff --git a/src/service.c b/src/service.c index 7852adf..862028b 100644 --- a/src/service.c +++ b/src/service.c @@ -23,8 +23,7 @@ #include "backend.h" #include "service.h" -/* FIXME: remove -test */ -#define BUS_NAME "com.canonical.indicator.session-test" +#define BUS_NAME "com.canonical.indicator.session" #define BUS_PATH "/com/canonical/indicator/session" #define ICON_DEFAULT "system-devices-panel" diff --git a/tests/test-service.cc b/tests/test-service.cc index 058fc3d..76dcd75 100644 --- a/tests/test-service.cc +++ b/tests/test-service.cc @@ -170,7 +170,7 @@ class ServiceTest: public GTestDBusFixture // wait for the service to show up on the bus const guint watch_id = g_bus_watch_name_on_connection (conn, - "com.canonical.indicator.session-test", + "com.canonical.indicator.session", G_BUS_NAME_WATCHER_FLAGS_NONE, on_name_appeared, // quits the loop NULL, this, NULL); @@ -182,10 +182,10 @@ class ServiceTest: public GTestDBusFixture // get the actions & menus that the service exported. action_group = g_dbus_action_group_get (conn, - "com.canonical.indicator.session-test", + "com.canonical.indicator.session", "/com/canonical/indicator/session"); menu_model = g_dbus_menu_model_get (conn, - "com.canonical.indicator.session-test", + "com.canonical.indicator.session", "/com/canonical/indicator/session/desktop"); // the actions are added asynchronously, so wait for the actions if (!g_action_group_has_action (G_ACTION_GROUP(action_group), "about")) |