diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2006-09-11 15:24:10 +0000 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2006-09-11 15:24:10 +0000 |
| commit | 9cfb902807e2b568a27227fb11d757ac5cdb3aae (patch) | |
| tree | 524511180cd97db8ebb77f0a88a7cb813d6eb116 /bus/activation.c | |
| parent | 05d90f4f20c1fbbb6c532b5f62531c97ced7d63e (diff) | |
* bus/activation.c, bus/desktop-file.c: Distinguish between OOM and
key not found
Diffstat (limited to 'bus/activation.c')
| -rw-r--r-- | bus/activation.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/bus/activation.c b/bus/activation.c index e1fe2954..fa439c41 100644 --- a/bus/activation.c +++ b/bus/activation.c @@ -285,22 +285,16 @@ update_desktop_file_entry (BusActivation *activation, if (!bus_desktop_file_get_string (desktop_file, DBUS_SERVICE_SECTION, DBUS_SERVICE_NAME, - &name)) - { - dbus_set_error (error, DBUS_ERROR_FAILED, - "No \""DBUS_SERVICE_NAME"\" key in .service file\n"); - goto failed; - } + &name, + error)) + goto failed; if (!bus_desktop_file_get_string (desktop_file, DBUS_SERVICE_SECTION, DBUS_SERVICE_EXEC, - &exec)) - { - dbus_set_error (error, DBUS_ERROR_FAILED, - "No \""DBUS_SERVICE_EXEC"\" key in .service file\n"); - goto failed; - } + &exec, + error)) + goto failed; entry = _dbus_hash_table_lookup_string (s_dir->entries, _dbus_string_get_const_data (filename)); @@ -466,7 +460,10 @@ check_service_file (BusActivation *activation, retval = TRUE; goto out; } - + + /* @todo We can return OOM or a DBUS_ERROR_FAILED error + * Handle these both better + */ if (!update_desktop_file_entry (activation, entry->s_dir, &filename, desktop_file, &tmp_error)) { bus_desktop_file_free (desktop_file); @@ -593,6 +590,9 @@ update_directory (BusActivation *activation, continue; } + /* @todo We can return OOM or a DBUS_ERROR_FAILED error + * Handle these both better + */ if (!update_desktop_file_entry (activation, s_dir, &filename, desktop_file, &tmp_error)) { bus_desktop_file_free (desktop_file); |