summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-08-31 17:26:29 +0000
committerLennart Poettering <lennart@poettering.net>2006-08-31 17:26:29 +0000
commit0456242ed7e6ad6bb2afd2f8210e86dfa80ab9d2 (patch)
tree9cbbe3f77358086fce8c824245144eb1dd0486b8
parent50c10f3b83474d421f78b898ce374bdafd3cd9bc (diff)
fix a few more s/DBUS/D-Bus/
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1298 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
-rw-r--r--avahi-common/error.c2
-rw-r--r--avahi-common/error.h2
-rw-r--r--avahi-daemon/dbus-protocol.c2
-rw-r--r--examples/core-browse-services.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/avahi-common/error.c b/avahi-common/error.c
index 53ff4f2..92a2234 100644
--- a/avahi-common/error.c
+++ b/avahi-common/error.c
@@ -52,7 +52,7 @@ const char *avahi_strerror(int error) {
"Access denied",
"Invalid operation",
- "An unexpected DBUS error occured",
+ "An unexpected D-Bus error occured",
"Daemon connection failed",
"Memory exhausted",
"The object passed in was not valid",
diff --git a/avahi-common/error.h b/avahi-common/error.h
index ee0626f..3e014c2 100644
--- a/avahi-common/error.h
+++ b/avahi-common/error.h
@@ -54,7 +54,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_DBUS_ERROR = -22, /**< An unexpected D-Bus error occured */
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 */
diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
index 0c32250..3de5845 100644
--- a/avahi-daemon/dbus-protocol.c
+++ b/avahi-daemon/dbus-protocol.c
@@ -1102,7 +1102,7 @@ static int dbus_connect(void) {
goto fail;
}
- avahi_log_error("Failed to acquire DBUS name '"AVAHI_DBUS_NAME"'");
+ avahi_log_error("Failed to acquire D-Bus name '"AVAHI_DBUS_NAME"'");
goto fail;
}
diff --git a/examples/core-browse-services.c b/examples/core-browse-services.c
index a34281e..53b18ee 100644
--- a/examples/core-browse-services.c
+++ b/examples/core-browse-services.c
@@ -5,7 +5,7 @@
* the embeddable mDNS stack for embedded applications.
*
* End user applications should *not* use this API and should use
- * the DBUS or C APIs, please see
+ * the D-Bus or C APIs, please see
* client-browse-services.c and glib-integration.c
*
* I repeat, you probably do *not* want to use this example.