change dbus paths/interfaces to #defines
SVN revision: 49383
This commit is contained in:
parent
10e3855431
commit
016e891f29
|
@ -140,9 +140,9 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
|
||||||
if (conn)
|
if (conn)
|
||||||
{
|
{
|
||||||
namech_h = e_dbus_signal_handler_add(conn,
|
namech_h = e_dbus_signal_handler_add(conn,
|
||||||
"org.freedesktop.DBus",
|
E_DBUS_FDO_BUS,
|
||||||
"/org/freedesktop/DBus",
|
E_DBUS_FDO_PATH,
|
||||||
"org.freedesktop.DBus",
|
E_DBUS_FDO_INTERFACE,
|
||||||
"NameOwnerChanged",
|
"NameOwnerChanged",
|
||||||
name_changed, inst);
|
name_changed, inst);
|
||||||
changed_h = e_dbus_signal_handler_add(conn,
|
changed_h = e_dbus_signal_handler_add(conn,
|
||||||
|
@ -161,9 +161,9 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
|
||||||
if (conn_system)
|
if (conn_system)
|
||||||
{
|
{
|
||||||
namech_system_h = e_dbus_signal_handler_add(conn_system,
|
namech_system_h = e_dbus_signal_handler_add(conn_system,
|
||||||
"org.freedesktop.DBus",
|
E_DBUS_FDO_BUS,
|
||||||
"/org/freedesktop/DBus",
|
E_DBUS_FDO_PATH,
|
||||||
"org.freedesktop.DBus",
|
E_DBUS_FDO_INTERFACE,
|
||||||
"NameOwnerChanged",
|
"NameOwnerChanged",
|
||||||
name_changed, inst);
|
name_changed, inst);
|
||||||
changed_fso_h = e_dbus_signal_handler_add(conn_system,
|
changed_fso_h = e_dbus_signal_handler_add(conn_system,
|
||||||
|
|
|
@ -50,19 +50,19 @@ e_mod_kbd_device_init(void)
|
||||||
|
|
||||||
/* setup dbus signal handlers for when a device gets added/removed/changed */
|
/* setup dbus signal handlers for when a device gets added/removed/changed */
|
||||||
_dev_add =
|
_dev_add =
|
||||||
e_dbus_signal_handler_add(_dbus_conn, "org.freedesktop.Hal",
|
e_dbus_signal_handler_add(_dbus_conn, E_HAL_SENDER,
|
||||||
"/org/freedesktop/Hal/Manager",
|
E_HAL_MANAGER_PATH,
|
||||||
"org.freedesktop.Hal.Manager",
|
E_HAL_MANAGER_INTERFACE,
|
||||||
"DeviceAdded", _e_mod_kbd_device_dbus_add, NULL);
|
"DeviceAdded", _e_mod_kbd_device_dbus_add, NULL);
|
||||||
_dev_del =
|
_dev_del =
|
||||||
e_dbus_signal_handler_add(_dbus_conn, "org.freedesktop.Hal",
|
e_dbus_signal_handler_add(_dbus_conn, E_HAL_SENDER,
|
||||||
"/org/freedesktop/Hal/Manager",
|
E_HAL_MANAGER_PATH,
|
||||||
"org.freedesktop.Hal.Manager",
|
E_HAL_MANAGER_INTERFACE,
|
||||||
"DeviceRemoved", _e_mod_kbd_device_dbus_del, NULL);
|
"DeviceRemoved", _e_mod_kbd_device_dbus_del, NULL);
|
||||||
_dev_chg =
|
_dev_chg =
|
||||||
e_dbus_signal_handler_add(_dbus_conn, "org.freedesktop.Hal",
|
e_dbus_signal_handler_add(_dbus_conn, E_HAL_SENDER,
|
||||||
"/org/freedesktop/Hal/Manager",
|
E_HAL_MANAGER_PATH,
|
||||||
"org.freedesktop.Hal.Manager",
|
E_HAL_MANAGER_INTERFACE,
|
||||||
"NewCapability", _e_mod_kbd_device_dbus_chg, NULL);
|
"NewCapability", _e_mod_kbd_device_dbus_chg, NULL);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue