From 7f5fd7ab759d8881e04f9edf31decdb000498fd1 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 13 Aug 2005 21:34:17 +0000
Subject: [PATCH] add missing error codes to some places where they belong

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@309 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
---
 avahi-common/dbus.h          |  3 +++
 avahi-common/error.h         | 10 +++++++++-
 avahi-daemon/dbus-protocol.c |  5 ++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/avahi-common/dbus.h b/avahi-common/dbus.h
index facd7b2..fc8dc02 100644
--- a/avahi-common/dbus.h
+++ b/avahi-common/dbus.h
@@ -57,6 +57,9 @@ AVAHI_C_DECL_BEGIN
 #define AVAHI_DBUS_ERR_OS "org.freedesktop.Avahi.OSError"
 #define AVAHI_DBUS_ERR_ACCESS_DENIED DBUS_ERROR_ACCESS_DENIED
 #define AVAHI_DBUS_ERR_INVALID_OPERATION "org.freedesktop.Avahi.InvalidOperationError"
+#define AVAHI_DBUS_ERR_DBUS_ERROR "org.freedesktop.Avahi.DBusError"
+#define AVAHI_DBUS_ERR_NOT_CONNECTED "org.freedesktop.Avahi.NotConnectedError"
+#define AVAHI_DBUS_ERR_NO_MEMORY "org.freedesktop.Avahi.NoMemoryError"
 
 AVAHI_C_DECL_END
 
diff --git a/avahi-common/error.h b/avahi-common/error.h
index 943b49c..c949466 100644
--- a/avahi-common/error.h
+++ b/avahi-common/error.h
@@ -54,7 +54,15 @@ enum {
     AVAHI_ERR_INVALID_OPERATION = -21,     /**< Invalid operation */
     AVAHI_ERR_DBUS_ERROR = -22,            /**< An unexpected DBUS error occured */
     AVAHI_ERR_NOT_CONNECTED = -23,         /**< Could not get a connection to the daemon */
-    AVAHI_ERR_NO_MEMORY = -24,             /**< Memory exhausted */ 
+    AVAHI_ERR_NO_MEMORY = -24,             /**< Memory exhausted */
+
+    /****
+     ****    IF YOU ADD A NEW ERROR CODE HERE, PLEASE DON'T FORGET TO ADD
+     ****    IT TO THE STRING ARRAY IN avahi_strerror() AND TO THE ARRAY
+     ****    IN respond_error() IN dbus-protocol.c AND FINALLY TO
+     ****    dbus.h!
+     ****/
+    
     AVAHI_ERR_MAX = -25
 };
 
diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
index 6526d7d..117f30f 100644
--- a/avahi-daemon/dbus-protocol.c
+++ b/avahi-daemon/dbus-protocol.c
@@ -346,7 +346,10 @@ static DBusHandlerResult respond_error(DBusConnection *c, DBusMessage *m, gint e
         AVAHI_DBUS_ERR_TOO_MANY_ENTRIES,
         AVAHI_DBUS_ERR_OS,
         AVAHI_DBUS_ERR_ACCESS_DENIED,
-        AVAHI_DBUS_ERR_INVALID_OPERATION
+        AVAHI_DBUS_ERR_INVALID_OPERATION,
+        AVAHI_DBUS_ERR_DBUS_ERROR,
+        AVAHI_DBUS_ERR_NOT_CONNECTED,
+        AVAHI_DBUS_ERR_NO_MEMORY
     };
 
     g_assert(-error > -AVAHI_OK);
-- 
2.39.5