luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 23:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdbusconnection: removed a confusing message

Browse Source 
The message `No such interface %s on object at path %s`
displayed when requested object does not exist, which was kind of
confusing.

Closes #793
This commit is contained in:
nitinosiris 2021-05-27 14:18:34 +05:30
parent 4575c70a6b
commit 5e2986ea2c
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gio/gdbusconnection.c
View File

@ -5052,7 +5052,8 @@ validate_and_maybe_schedule_method_call (GDBusConnection *connection,
static gboolean static gboolean
obj_message_func (GDBusConnection *connection, obj_message_func (GDBusConnection *connection,
ExportedObject *eo, ExportedObject *eo,
GDBusMessage *message) GDBusMessage *message,
gboolean *object_found)
{ {
const gchar *interface_name; const gchar *interface_name;
const gchar *member; const gchar *member;
@ -5088,6 +5089,10 @@ obj_message_func (GDBusConnection *connection,
ei->user_data); ei->user_data);
goto out; goto out;
} }
else
{
*object_found = TRUE;
}
} }
if (g_strcmp0 (interface_name, "org.freedesktop.DBus.Introspectable") == 0 && if (g_strcmp0 (interface_name, "org.freedesktop.DBus.Introspectable") == 0 &&
@ -7113,6 +7118,7 @@ distribute_method_call (GDBusConnection *connection,
const gchar *path; const gchar *path;
gchar *subtree_path; gchar *subtree_path;
gchar *needle; gchar *needle;
gboolean object_found = FALSE;
g_assert (g_dbus_message_get_message_type (message) == G_DBUS_MESSAGE_TYPE_METHOD_CALL); g_assert (g_dbus_message_get_message_type (message) == G_DBUS_MESSAGE_TYPE_METHOD_CALL);
@ -7154,7 +7160,7 @@ distribute_method_call (GDBusConnection *connection,
eo = g_hash_table_lookup (connection->map_object_path_to_eo, object_path); eo = g_hash_table_lookup (connection->map_object_path_to_eo, object_path);
if (eo != NULL) if (eo != NULL)
{ {
if (obj_message_func (connection, eo, message)) if (obj_message_func (connection, eo, message, &object_found))
goto out; goto out;
} }
@ -7179,11 +7185,22 @@ distribute_method_call (GDBusConnection *connection,
goto out; goto out;
/* if we end up here, the message has not been not handled - so return an error saying this */ /* if we end up here, the message has not been not handled - so return an error saying this */
if (object_found == TRUE)
{
reply = g_dbus_message_new_method_error (message, reply = g_dbus_message_new_method_error (message,
"org.freedesktop.DBus.Error.UnknownMethod", "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, interface_name,
object_path); object_path);
}
else
{
reply = g_dbus_message_new_method_error (message,
"org.freedesktop.DBus.Error.UnknownMethod",
_("Object does not exist at path “%s”"),
object_path);
}
g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL); g_dbus_connection_send_message_unlocked (connection, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
g_object_unref (reply); g_object_unref (reply);