Skip to content

Commit d0f8c74

Browse files
committed
gnome-idle-monitor.c: Fix some dbus names Mutter->Muffin.
The session manager uses this to get notifications about idle state changes now - instead of its own idle-monitor code (which only worked with x11), it now relies on muffin to notify on changes from various sources (xorg, wayland, upower).
1 parent 9822c17 commit d0f8c74

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

libcinnamon-desktop/gnome-idle-monitor.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ G_DEFINE_TYPE_WITH_CODE (GnomeIdleMonitor, gnome_idle_monitor, G_TYPE_OBJECT,
6767
G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
6868
gnome_idle_monitor_initable_iface_init))
6969

70-
#define IDLE_MONITOR_PATH "/org/gnome/Mutter/IdleMonitor/Core"
70+
#define IDLE_MONITOR_PATH "/org/cinnamon/Muffin/IdleMonitor/Core"
7171

7272
static void
7373
on_watch_fired (MetaDBusIdleMonitor *proxy,
@@ -256,7 +256,7 @@ on_name_appeared (GDBusConnection *connection,
256256
meta_dbus_object_manager_client_new (connection,
257257
G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE,
258258
name_owner,
259-
"/org/gnome/Mutter/IdleMonitor",
259+
"/org/cinnamon/Muffin/IdleMonitor",
260260
monitor->priv->cancellable,
261261
on_object_manager_ready,
262262
monitor);
@@ -296,7 +296,7 @@ gnome_idle_monitor_initable_init (GInitable *initable,
296296
monitor = GNOME_IDLE_MONITOR (initable);
297297

298298
monitor->priv->name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
299-
"org.gnome.Mutter.IdleMonitor",
299+
"org.cinnamon.Muffin.IdleMonitor",
300300
G_BUS_NAME_WATCHER_FLAGS_NONE,
301301
on_name_appeared,
302302
on_name_vanished,

libcinnamon-desktop/idle-monitor.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
'http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd'>
44
<node>
55
<!--
6-
org.gnome.Mutter.IdleMonitor:
6+
org.cinnamon.Muffin.IdleMonitor:
77
@short_description: idle monitor interface
88
99
This interface is used by gnome-desktop to implement
1010
user activity monitoring.
1111
-->
1212

13-
<interface name="org.gnome.Muffin.IdleMonitor">
13+
<interface name="org.cinnamon.Muffin.IdleMonitor">
1414
<method name="GetIdletime">
1515
<arg name="idletime" direction="out" type="t"/>
1616
</method>

libcinnamon-desktop/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dbus_idle_built_sources = gnome.gdbus_codegen('meta-dbus-idle-monitor',
22
'idle-monitor.xml',
33
namespace: 'MetaDBus',
4-
interface_prefix: 'org.gnome.Muffin',
4+
interface_prefix: 'org.cinnamon.Muffin',
55
object_manager: true
66
)
77

0 commit comments

Comments
 (0)