fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 14:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2004-07-29 Dan Williams <dcbw@redhat.com>

Browse source 
* info-daemon/NetworkManagerInfoDbus.c
	  src/NetworkManagerDbus.c
		- Update to current DBus (ie don't use decomposed paths when registering
			object paths/fallbacks)


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@32 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2004-07-30 18:21:46 +00:00
parent e37ba613bf
commit 8336b11023
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2004-07-29 Dan Williams <dcbw@redhat.com>
* info-daemon/NetworkManagerInfoDbus.c
src/NetworkManagerDbus.c
- Update to current DBus (ie don't use decomposed paths when registering
object paths/fallbacks)
2004-07-27 Dan Williams <dcbw@redhat.com>
* Remove various Makefile.in files

3
info-daemon/NetworkManagerInfoDbus.c
View file

@ -438,7 +438,6 @@ int nmi_dbus_service_init (DBusConnection *dbus_connection, NMIAppInfo *info)
{
DBusError dbus_error;
DBusObjectPathVTable nmi_vtable = { &nmi_dbus_nmi_unregister_handler, &nmi_dbus_nmi_message_handler, NULL, NULL, NULL, NULL };
const char *nmi_path[] = { "org", "freedesktop", "NetworkManagerInfo", NULL };
dbus_error_init (&dbus_error);
dbus_bus_acquire_service (dbus_connection, NMI_DBUS_NMI_NAMESPACE, 0, &dbus_error);
@ -448,7 +447,7 @@ int nmi_dbus_service_init (DBusConnection *dbus_connection, NMIAppInfo *info)
return (-1);
}
if (!dbus_connection_register_object_path (dbus_connection, nmi_path, &nmi_vtable, info))
if (!dbus_connection_register_object_path (dbus_connection, NMI_DBUS_NMI_OBJECT_PATH_PREFIX, &nmi_vtable, info))
{
fprintf (stderr, "nmi_dbus_service_init() could not register a handler for NetworkManagerInfo. Not enough memory?\n");
return (-1);

6
src/NetworkManagerDbus.c
View file

@ -1017,9 +1017,7 @@ DBusConnection *nm_dbus_init (NMData *data)
dbus_bool_t success;
DBusConnection *connection;
DBusObjectPathVTable nm_vtable = { &nm_dbus_nm_unregister_handler, &nm_dbus_nm_message_handler, NULL, NULL, NULL, NULL };
const char *nm_path[] = { "org", "freedesktop", "NetworkManager", NULL };
DBusObjectPathVTable devices_vtable = { &nm_dbus_devices_unregister_handler, &nm_dbus_devices_message_handler, NULL, NULL, NULL, NULL };
const char *devices_path[] = { "org", "freedesktop", "NetworkManager", "Devices", NULL };
dbus_connection_set_change_sigpipe (TRUE);
@ -1040,14 +1038,14 @@ DBusConnection *nm_dbus_init (NMData *data)
return (NULL);
}
success = dbus_connection_register_object_path (connection, nm_path, &nm_vtable, data);
success = dbus_connection_register_object_path (connection, NM_DBUS_NM_OBJECT_PATH_PREFIX, &nm_vtable, data);
if (!success)
{
NM_DEBUG_PRINT ("nm_dbus_init() could not register a handler for NetworkManager. Not enough memory?\n");
return (NULL);
}
success = dbus_connection_register_fallback (connection, devices_path, &devices_vtable, data);
success = dbus_connection_register_fallback (connection, NM_DBUS_DEVICES_OBJECT_PATH_PREFIX, &devices_vtable, data);
if (!success)
{
NM_DEBUG_PRINT ("nm_dbus_init() could not register a handler for NetworkManager devices. Not enough memory?\n");