diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-03-26 03:58:11 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-03-26 03:58:11 +0000 |
| commit | 90ed1d84588a84697051e643175452c50d682ece (patch) | |
| tree | a8ee3ecb05c584194d5c74e98038c24e5fdabe9b /bus/activation.c | |
| parent | 17e82f5728d3fc8abd41c816b1c34c506339c7a7 (diff) | |
2003-03-25 Havoc Pennington <hp@redhat.com>
* throughout - add more _DBUS_ASSERT_ERROR_IS_CLEAR
* configure.in: add --with-xml option to specify XML library,
right now only libxml is supported.
* bus/config-loader-libxml.c, config-parser.c: sync some minor
nonworking code between home and work, still just stubs
Diffstat (limited to 'bus/activation.c')
| -rw-r--r-- | bus/activation.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/bus/activation.c b/bus/activation.c index fed12781..03a01937 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -119,6 +119,8 @@ add_desktop_file_entry (BusActivation *activation, char *name, *exec; BusActivationEntry *entry; + _DBUS_ASSERT_ERROR_IS_CLEAR (error); + name = NULL; exec = NULL; entry = NULL; @@ -194,6 +196,8 @@ load_directory (BusActivation *activation, DBusString full_path; BusDesktopFile *desktop_file; DBusError tmp_error; + + _DBUS_ASSERT_ERROR_IS_CLEAR (error); _dbus_string_init_const (&dir, directory); @@ -327,6 +331,8 @@ bus_activation_new (BusContext *context, int i; BusActivation *activation; + _DBUS_ASSERT_ERROR_IS_CLEAR (error); + activation = dbus_new0 (BusActivation, 1); if (activation == NULL) { @@ -424,6 +430,8 @@ bus_activation_service_created (BusActivation *activation, BusPendingActivation *pending_activation; DBusMessage *message; DBusList *link; + + _DBUS_ASSERT_ERROR_IS_CLEAR (error); /* Check if it's a pending activation */ pending_activation = _dbus_hash_table_lookup_string (activation->pending_activations, service_name); @@ -492,6 +500,8 @@ bus_activation_activate_service (BusActivation *activation, DBusString service_str; char *argv[2]; dbus_bool_t retval; + + _DBUS_ASSERT_ERROR_IS_CLEAR (error); entry = _dbus_hash_table_lookup_string (activation->entries, service_name); |