summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@codefactory.se>2003-03-17 02:26:41 +0000
committerAnders Carlsson <andersca@codefactory.se>2003-03-17 02:26:41 +0000
commit0e298fbeb513ea03d1ddc80124aec3a1d19a967d (patch)
treeeb73506133d514d76b182a24e33175fe26b3bb64
parent23e4978e2f07de14449f63320cd5e6b066672b8e (diff)
2003-03-17 Anders Carlsson <andersca@codefactory.se>
* bus/activation.c (bus_activation_activate_service): Append the pending activation entry to the list of pending activations.
-rw-r--r--ChangeLog5
-rw-r--r--bus/activation.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3f540c76..ad0cee4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-17 Anders Carlsson <andersca@codefactory.se>
+
+ * bus/activation.c (bus_activation_activate_service): Append
+ the pending activation entry to the list of pending activations.
+
2003-03-16 Havoc Pennington <hp@pobox.com>
* bus/dispatch.c (bus_dispatch_test): remove double-unrefs of
diff --git a/bus/activation.c b/bus/activation.c
index c7d08baa..fed12781 100644
--- a/bus/activation.c
+++ b/bus/activation.c
@@ -548,7 +548,7 @@ bus_activation_activate_service (BusActivation *activation,
pending_activation = _dbus_hash_table_lookup_string (activation->pending_activations, service_name);
if (pending_activation)
{
- if (!_dbus_list_append (&pending_activation->entries, entry))
+ if (!_dbus_list_append (&pending_activation->entries, pending_activation_entry))
{
BUS_SET_OOM (error);
bus_pending_activation_entry_free (pending_activation_entry);
@@ -574,7 +574,7 @@ bus_activation_activate_service (BusActivation *activation,
return FALSE;
}
- if (!_dbus_list_append (&pending_activation->entries, entry))
+ if (!_dbus_list_append (&pending_activation->entries, pending_activation_entry))
{
BUS_SET_OOM (error);
bus_pending_activation_free (pending_activation);