diff options
| author | Anders Carlsson <andersca@codefactory.se> | 2003-03-16 22:25:18 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@codefactory.se> | 2003-03-16 22:25:18 +0000 |
| commit | 3f4086f0fdd1cc7fc03585ec9f750897fb3c1d55 (patch) | |
| tree | a180077e4b5a97e83b0afc08619b2fb5db790f22 /bus/desktop-file.c | |
| parent | d1f65c6c4f9dd9750f9ad3eda5b590a4ffca6498 (diff) | |
2003-03-16 Anders Carlsson <andersca@codefactory.se>
* bus/activation.c: (bus_pending_activation_entry_free),
(bus_pending_activation_free), (bus_activation_new),
(bus_activation_unref), (bus_activation_service_created),
(bus_activation_activate_service):
* bus/activation.h:
* bus/bus.c: (bus_context_new):
* bus/desktop-file.c: (new_section):
* bus/driver.c: (bus_driver_send_service_deleted),
(bus_driver_handle_activate_service):
* bus/services.c: (bus_registry_new), (bus_registry_ensure):
* bus/services.h:
* dbus/dbus-connection.c:
(dbus_connection_send_with_reply_and_block):
* dbus/dbus-message.c: (dbus_message_append_args_valist):
* dbus/dbus-protocol.h:
Make activation work better. Now pending activations will be queued
and the daemon won't try to activate services that are already registered.
Diffstat (limited to 'bus/desktop-file.c')
| -rw-r--r-- | bus/desktop-file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bus/desktop-file.c b/bus/desktop-file.c index 65a0d76f..f45a997e 100644 --- a/bus/desktop-file.c +++ b/bus/desktop-file.c @@ -272,8 +272,8 @@ new_section (BusDesktopFile *desktop_file, name_copy = _dbus_strdup (name); if (name_copy == NULL) return NULL; - - n = desktop_file->n_sections + 1; + + n = desktop_file->n_sections; desktop_file->sections[n].section_name = name_copy; desktop_file->sections[n].n_lines = 0; @@ -287,7 +287,7 @@ new_section (BusDesktopFile *desktop_file, return NULL; } - desktop_file->n_sections = n; + desktop_file->n_sections += 1; return &desktop_file->sections[n]; } |