summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <sandmann@daimi.au.dk>2009-04-19 15:07:24 -0400
committerSøren Sandmann Pedersen <sandmann@daimi.au.dk>2009-04-19 15:07:24 -0400
commitfd2997f92d1f40e0f519c1b8ed5a7efe665e2366 (patch)
treebc83babd073c52d2862034615737cbd48e27ccb7
parenta732af4e1f0e12032cf8ada034409d5e56cd53ef (diff)
Use correct type for the object array
-rw-r--r--dbus.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/dbus.c b/dbus.c
index 03490c5..0bd0ad9 100644
--- a/dbus.c
+++ b/dbus.c
@@ -28,7 +28,7 @@
struct nul_dbus_service_t
{
char *name;
- nul_ptr_t *objects;
+ nul_dbus_object_t **objects;
DBusConnection *connection;
gboolean running;
DBusBusType type;
@@ -805,7 +805,7 @@ make_service (const char *name,
service->name = g_strdup (name);
- service->objects = make_ptr_array (object1, args);
+ service->objects = (nul_dbus_object_t **)make_ptr_array (object1, args);
service->type = type;
@@ -901,14 +901,14 @@ nul_dbus_service_start (nul_dbus_service_t *service)
void
nul_dbus_service_stop (nul_dbus_service_t *service)
{
- nul_ptr_t *p;
+ nul_dbus_object_t **obj;
if (!service->running)
return;
- for (p = service->objects; *p != NULL; ++p)
+ for (obj = service->objects; *obj != NULL; ++obj)
{
- nul_dbus_object_t *object = *p;
+ nul_dbus_object_t *object = *obj;
dbus_connection_unregister_object_path (
service->connection, object->name);
@@ -1247,11 +1247,11 @@ decode_method_desc (const char *method_desc,
static nul_dbus_object_t *
find_object (nul_dbus_service_t *service, const char *name)
{
- nul_ptr_t *p;
+ nul_dbus_object_t **obj;
- for (p = service->objects; *p != NULL; ++p)
+ for (obj = service->objects; *obj != NULL; ++obj)
{
- nul_dbus_object_t *object = *p;
+ nul_dbus_object_t *object = *obj;
if (strcmp (object->name, name) == 0)
return object;