fix a few more s/DBUS/D-Bus/

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1298 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-common/error.c b/avahi-common/error.c
index 53ff4f218a4d65c663782244c997bdaedac38ba1..92a22341c5e583b41a4105c0bb869c95982a0c3e 100644 (file)
--- 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 ee0626f0b3c2231e31ced8a5f03cfb927681eda9..3e014c2532ab24be9f545ec38a06214e79b37b74 100644 (file)
--- 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 0c322506b6d21a3ff1e64eaafa088ed2a00b179b..3de5845407dfaac0901267e71193deeabef870a5 100644 (file)
--- 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 a34281ec9ed8c154b004aab5ffbcd6b7228945cc..53b18eeebb7936191e6561c7ebb6b6a611b6a9ad 100644 (file)
--- 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.