summaryrefslogtreecommitdiff
path: root/bus/desktop-file.h
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@codefactory.se>2003-02-13 19:06:42 +0000
committerAnders Carlsson <andersca@codefactory.se>2003-02-13 19:06:42 +0000
commit02dfd4fb3427a6afef6b9b99d39de6248a20e0cb (patch)
tree99fd854a9ac5d2aaeac3d3d3fedc958d4bb6a44e /bus/desktop-file.h
parentb09fadc1145570d752e7f709bfc0cf8c486d5146 (diff)
downloaddbus-02dfd4fb3427a6afef6b9b99d39de6248a20e0cb.tar.gz
2003-02-13 Anders Carlsson <andersca@codefactory.se>
* bus/Makefile.am: Add utils.[ch] * bus/connection.c: (bus_connection_foreach): Fix a warning. * bus/desktop-file.c: (grow_lines_in_section), (grow_sections), (unescape_string), (new_section), (parse_section_start), (parse_key_value), (report_error), (bus_desktop_file_load), (bus_desktop_file_get_string): * bus/desktop-file.h: Use DBusError for error reporting. * bus/dispatch.c: (send_one_message), (bus_dispatch_message_handler): * bus/driver.c: (bus_driver_send_service_deleted), (bus_driver_send_service_created), (bus_driver_send_service_lost), (bus_driver_send_service_acquired), (bus_driver_handle_hello), (bus_driver_send_welcome_message), (bus_driver_handle_list_services), (bus_driver_handle_acquire_service), (bus_driver_handle_service_exists): * bus/loop.c: (bus_loop_run): * bus/main.c: Use BUS_HANDLE_OOM instead of _DBUS_HANDLE_OOM. * bus/utils.c: (bus_wait_for_memory): * bus/utils.h: New files with general utility functions. * dbus/dbus-internals.h: Remove _DBUS_HANDLE_OOM.
Diffstat (limited to 'bus/desktop-file.h')
-rw-r--r--bus/desktop-file.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/bus/desktop-file.h b/bus/desktop-file.h
index 4934ea65..d498b1bf 100644
--- a/bus/desktop-file.h
+++ b/bus/desktop-file.h
@@ -26,10 +26,14 @@
#include <dbus/dbus.h>
#include <dbus/dbus-string.h>
+#define BUS_DESKTOP_PARSE_ERROR_INVALID_SYNTAX "org.freedesktop.DBus.DesktopParseError.InvalidSyntax"
+#define BUS_DESKTOP_PARSE_ERROR_INVALID_ESCAPES "org.freedesktop.DBus.DesktopParseError.InvalidEscapes"
+#define BUS_DESKTOP_PARSE_ERROR_INVALID_CHARS "org.freedesktop.DBus.DesktopParseError.InvalidChars"
+
typedef struct BusDesktopFile BusDesktopFile;
BusDesktopFile *bus_desktop_file_load (DBusString *filename,
- DBusResultCode *result);
+ DBusError *error);
void bus_desktop_file_free (BusDesktopFile *file);
dbus_bool_t bus_desktop_file_get_raw (BusDesktopFile *desktop_file,