diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-11-06 16:12:03 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-11-06 16:12:03 +0000 |
| commit | 4e2113a7d5b702ff070e8220b32662bb00ae02dd (patch) | |
| tree | 1a1812f25e83f36d5fd9667939ab253219be3ec7 /avahi-common | |
| parent | 3b4cd4f3530aa24bb5b38146372b87e966ce62d4 (diff) | |
* Rename AVAHI_ERR_NOT_CONNECTED to AVAHI_ERR_DISCONNECTED
* Remove client state AVAHI_CLIENT_DISCONNECTED and replace it with AVAHI_CLIENT_FAILURE with error code set to AVAHI_ERR_DISCONNECTED
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@935 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-common')
| -rw-r--r-- | avahi-common/dbus.c | 2 | ||||
| -rw-r--r-- | avahi-common/dbus.h | 2 | ||||
| -rw-r--r-- | avahi-common/error.c | 2 | ||||
| -rw-r--r-- | avahi-common/error.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/avahi-common/dbus.c b/avahi-common/dbus.c index 3ea7cbd..fc4b34b 100644 --- a/avahi-common/dbus.c +++ b/avahi-common/dbus.c @@ -56,7 +56,7 @@ static const char * const table[- AVAHI_ERR_MAX] = { AVAHI_DBUS_ERR_ACCESS_DENIED, AVAHI_DBUS_ERR_INVALID_OPERATION, AVAHI_DBUS_ERR_DBUS_ERROR, - AVAHI_DBUS_ERR_NOT_CONNECTED, + AVAHI_DBUS_ERR_DISCONNECTED, AVAHI_DBUS_ERR_NO_MEMORY, AVAHI_DBUS_ERR_INVALID_OBJECT, AVAHI_DBUS_ERR_NO_DAEMON, diff --git a/avahi-common/dbus.h b/avahi-common/dbus.h index fb8a074..f28b48a 100644 --- a/avahi-common/dbus.h +++ b/avahi-common/dbus.h @@ -65,7 +65,7 @@ AVAHI_C_DECL_BEGIN #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_DISCONNECTED "org.freedesktop.Avahi.DisconnectedError" #define AVAHI_DBUS_ERR_NO_MEMORY "org.freedesktop.Avahi.NoMemoryError" #define AVAHI_DBUS_ERR_INVALID_OBJECT "org.freedesktop.Avahi.InvalidObjectError" #define AVAHI_DBUS_ERR_NO_DAEMON "org.freedesktop.Avahi.NoDaemonError" diff --git a/avahi-common/error.c b/avahi-common/error.c index 864a5bd..6c0a900 100644 --- a/avahi-common/error.c +++ b/avahi-common/error.c @@ -53,7 +53,7 @@ const char *avahi_strerror(int error) { "Access denied", "Invalid operation", "An unexpected DBUS error occured", - "Could not get a connection to the daemon", + "Daemon connection failed", "Memory exhausted", "The object passed in was not valid", "Daemon not running", diff --git a/avahi-common/error.h b/avahi-common/error.h index 91e32d7..d6c4620 100644 --- a/avahi-common/error.h +++ b/avahi-common/error.h @@ -55,7 +55,7 @@ enum { AVAHI_ERR_ACCESS_DENIED = -20, /**< Access denied */ 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_DISCONNECTED = -23, /**< Daemon connection failed */ AVAHI_ERR_NO_MEMORY = -24, /**< Memory exhausted */ AVAHI_ERR_INVALID_OBJECT = -25, /**< The object passed to this function was invalid */ AVAHI_ERR_NO_DAEMON = -26, /**< Daemon not running */ |