From: Ryan Lortie <desrt@desrt.ca>
Date: Mon, 28 Oct 2013 21:49:14 +0000 (-0700)
Subject: exporter: give error on Describe of missing action
X-Git-Tag: 2.39.1~110
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e275b8bc6c48aa7c894cb4f53bd1ee95850eb801;p=platform%2Fupstream%2Fglib.git

exporter: give error on Describe of missing action

If someone calls org.gtk.Actions.Describe on a non-existent action then
return an exception instead of a trivial description (disabled, no
state, etc.).

https://bugzilla.gnome.org/show_bug.cgi?id=687185
---

diff --git a/gio/gactiongroupexporter.c b/gio/gactiongroupexporter.c
index c90634402..2e1e8f4b9 100644
--- a/gio/gactiongroupexporter.c
+++ b/gio/gactiongroupexporter.c
@@ -380,6 +380,14 @@ org_gtk_Actions_method_call (GDBusConnection       *connection,
       GVariant *desc;
 
       g_variant_get (parameters, "(&s)", &name);
+
+      if (!g_action_group_has_action (exporter->action_group, name))
+        {
+          g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS,
+                                                 "The named action does not exist.");
+          return;
+        }
+
       desc = g_action_group_describe_action (exporter->action_group, name);
       result = g_variant_new ("(@(bgav))", desc);
     }