Squash underscores and dashes in errors when converting to DBus errors

We were just taking the enumeration nick and appending to the DBus
error name, but since these can contain '-' we need to squash.

1 files changed, 11 insertions, 2 deletions

diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c
index f75a3b1..e61438c 100644
--- a/dbus/dbus-gobject.c
+++ b/dbus/dbus-gobject.c
@@ -1093,9 +1093,18 @@ gerror_domaincode_to_dbus_error_name (const DBusGObjectInfo *object_info,
     }
   else
     {
-      dbus_error_name = g_string_new (domain_str);
+      char *domain_member, *code_member;
+
+      /* TODO should further validate these */
+      domain_member = uscore_to_wincaps (domain_str);
+      code_member = uscore_to_wincaps (code_str);
+
+      dbus_error_name = g_string_new (domain_member);
       g_string_append_c (dbus_error_name, '.');
-      g_string_append (dbus_error_name, code_str);
+      g_string_append (dbus_error_name, code_member);
+
+      g_free (domain_member);
+      g_free (code_member);
     }
 
   return g_string_free (dbus_error_name, FALSE);