luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-07-22 09:57:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Partially revert 10c490cdfe

Browse Source 
This commit broke some tests, and I don't have the time
to fix up all the expected output, so I'll revert the changes
to the affected files for now.

This needs to be redone with the necessary test fixes.
This commit is contained in:
Matthias Clasen
2016-10-24 09:37:04 -04:00
parent b56ededeec
commit 2d56c49b10
3 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gio/gdbusconnection.c
View File

@@ -4106,7 +4106,7 @@ invoke_get_property_in_idle_cb (gpointer _data)
{
reply = g_dbus_message_new_method_error (data->message,
"org.freedesktop.DBus.Error.UnknownMethod",
_("No such interface “org.freedesktop.DBus.Properties” on object at path %s"),
_("No such interface 'org.freedesktop.DBus.Properties' on object at path %s"),
g_dbus_message_get_path (data->message));
g_dbus_connection_send_message (data->connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
g_object_unref (reply);
@@ -4248,7 +4248,7 @@ validate_and_maybe_schedule_property_getset (GDBusConnection *connect
{
reply = g_dbus_message_new_method_error (message,
"org.freedesktop.DBus.Error.InvalidArgs",
_("No such property “%s”"),
_("No such property '%s'"),
property_name);
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
g_object_unref (reply);
@@ -4260,7 +4260,7 @@ validate_and_maybe_schedule_property_getset (GDBusConnection *connect
{
reply = g_dbus_message_new_method_error (message,
"org.freedesktop.DBus.Error.InvalidArgs",
_("Property “%s” is not readable"),
_("Property '%s' is not readable"),
property_name);
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
g_object_unref (reply);
@@ -4271,7 +4271,7 @@ validate_and_maybe_schedule_property_getset (GDBusConnection *connect
{
reply = g_dbus_message_new_method_error (message,
"org.freedesktop.DBus.Error.InvalidArgs",
_("Property “%s” is not writable"),
_("Property '%s' is not writable"),
property_name);
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
g_object_unref (reply);
@@ -4291,7 +4291,7 @@ validate_and_maybe_schedule_property_getset (GDBusConnection *connect
{
reply = g_dbus_message_new_method_error (message,
"org.freedesktop.DBus.Error.InvalidArgs",
_("Error setting property “%s”: Expected type “%s” but got “%s”"),
_("Error setting property '%s': Expected type '%s' but got '%s'"),
property_name, property_info->signature,
g_variant_get_type_string (value));
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
@@ -4396,7 +4396,7 @@ handle_getset_property (GDBusConnection *connection,
GDBusMessage *reply;
reply = g_dbus_message_new_method_error (message,
"org.freedesktop.DBus.Error.InvalidArgs",
_("No such interface “%s”"),
_("No such interface '%s'"),
interface_name);
g_dbus_connection_send_message_unlocked (eo->connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
g_object_unref (reply);
@@ -4453,7 +4453,7 @@ invoke_get_all_properties_in_idle_cb (gpointer _data)
{
reply = g_dbus_message_new_method_error (data->message,
"org.freedesktop.DBus.Error.UnknownMethod",
_("No such interface “org.freedesktop.DBus.Properties” on object at path %s"),
_("No such interface 'org.freedesktop.DBus.Properties' on object at path %s"),
g_dbus_message_get_path (data->message));
g_dbus_connection_send_message (data->connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
g_object_unref (reply);
@@ -4822,7 +4822,7 @@ call_in_idle_cb (gpointer user_data)
GDBusMessage *reply;
reply = g_dbus_message_new_method_error (g_dbus_method_invocation_get_message (invocation),
"org.freedesktop.DBus.Error.UnknownMethod",
_("No such interface “%s” on object at path %s"),
_("No such interface '%s' on object at path %s"),
g_dbus_method_invocation_get_interface_name (invocation),
g_dbus_method_invocation_get_object_path (invocation));
g_dbus_connection_send_message (g_dbus_method_invocation_get_connection (invocation), reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
@@ -4920,7 +4920,7 @@ validate_and_maybe_schedule_method_call (GDBusConnection *connection,
{
reply = g_dbus_message_new_method_error (message,
"org.freedesktop.DBus.Error.UnknownMethod",
_("No such method “%s”"),
_("No such method '%s'"),
g_dbus_message_get_member (message));
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
g_object_unref (reply);
@@ -4951,7 +4951,7 @@ validate_and_maybe_schedule_method_call (GDBusConnection *connection,
reply = g_dbus_message_new_method_error (message,
"org.freedesktop.DBus.Error.InvalidArgs",
_("Type of message, “%s”, does not match expected type “%s”"),
_("Type of message, '%s', does not match expected type '%s'"),
g_variant_get_type_string (parameters),
type_string);
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
@@ -5607,7 +5607,7 @@ decode_method_reply (GDBusMessage *reply,
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Method “%s” returned type “%s”, but expected “%s”"),
_("Method '%s' returned type '%s', but expected '%s'"),
method_name, g_variant_get_type_string (result), type_string);
g_variant_unref (result);
@@ -6570,7 +6570,7 @@ handle_subtree_method_invocation (GDBusConnection *connection,
GDBusMessage *reply;
reply = g_dbus_message_new_method_error (message,
"org.freedesktop.DBus.Error.InvalidArgs",
_("No such interface “%s”"),
_("No such interface '%s'"),
interface_name);
g_dbus_connection_send_message (es->connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
g_object_unref (reply);
@@ -6681,7 +6681,7 @@ process_subtree_vtable_message_in_idle_cb (gpointer _data)
GDBusMessage *reply;
reply = g_dbus_message_new_method_error (data->message,
"org.freedesktop.DBus.Error.UnknownMethod",
_("Method “%s” on interface “%s” with signature “%s” does not exist"),
_("Method '%s' on interface '%s' with signature '%s' does not exist"),
g_dbus_message_get_member (data->message),
g_dbus_message_get_interface (data->message),
g_dbus_message_get_signature (data->message));
@@ -7079,7 +7079,7 @@ distribute_method_call (GDBusConnection *connection,
/* if we end up here, the message has not been not handled - so return an error saying this */
reply = g_dbus_message_new_method_error (message,
"org.freedesktop.DBus.Error.UnknownMethod",
_("No such interface “%s” on object at path %s"),
_("No such interface '%s' on object at path %s"),
interface_name,
object_path);
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
@@ -7131,7 +7131,7 @@ message_bus_get_singleton (GBusType bus_type,
G_IO_ERROR,
G_IO_ERROR_INVALID_ARGUMENT,
_("Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable"
" — unknown value “%s”"),
" - unknown value '%s'"),
starter_bus);
}
else