summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2011-08-15 14:05:50 +0200
committerColin Guthrie <colin@mageia.org>2011-08-16 11:59:34 +0100
commit545521d405f15d47cc2e9d93f64a80d798a291cf (patch)
tree9dd2bb294a7682589e7ddc357a408866c00331d9
parent286232f7a8f360654746e9f78505c358a98b1b79 (diff)
Remove offensive part of error messageHEADmaster
I don't know the exact cause for someone to submit a bug report for this error message: if someone is truly offended by it (if so it is a reminder that some people are more sensitive than others, and I do want those people to feel welcome as well), or if it's a system's check (if this goes through, it shows the system works, and the person might put more work into his/her next patch), or if it's just a bug (after all, it's not that weird to run two instances of PulseAudio?). Either one could be reason enough to apply IMO. Signed-off-by: David Henningsson <david.henningsson@canonical.com>
-rw-r--r--src/daemon/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 1d0a65e3..c620842a 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -377,7 +377,7 @@ static pa_dbus_connection *register_dbus_name(pa_core *c, DBusBusType bus, const
if (dbus_error_is_set(&error))
pa_log_error("Failed to acquire %s: %s: %s", name, error.name, error.message);
else
- pa_log_error("D-Bus name %s already taken. Weird shit!", name);
+ pa_log_error("D-Bus name %s already taken.", name);
/* PA cannot be started twice by the same user and hence we can
* ignore mostly the case that a name is already taken. */