Merge branch '2081-dbus-error-messages' into 'master'

gdbusmessage: Fix swapped signatures in error messages

Closes #2081

See merge request GNOME/glib!1435
This commit is contained in:
Sebastian Dröge 2020-04-03 12:35:58 +00:00
commit dde780fd1b

View File

@ -2786,7 +2786,7 @@ g_dbus_message_to_blob (GDBusMessage *message,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Message body has signature “%s” but there is no signature header"),
signature_str);
g_variant_get_type_string (message->body));
goto out;
}
tupled_signature_str = g_strdup_printf ("(%s)", signature_str);
@ -2796,7 +2796,7 @@ g_dbus_message_to_blob (GDBusMessage *message,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Message body has type signature “%s” but signature in the header field is “%s”"),
tupled_signature_str, g_variant_get_type_string (message->body));
g_variant_get_type_string (message->body), tupled_signature_str);
g_free (tupled_signature_str);
goto out;
}