From 3c8052130a82f0f05d2ad875f3d24fd7367321c8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 19 Aug 2013 11:17:47 -0500 Subject: Make it so that application list returns an error on a bad desktop file --- src/im-application-list.c | 8 +++++--- src/im-application-list.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/im-application-list.c b/src/im-application-list.c index bba7972..14af69b 100644 --- a/src/im-application-list.c +++ b/src/im-application-list.c @@ -576,7 +576,7 @@ im_application_list_activate_app_action (GSimpleAction *action, g_desktop_app_info_launch_action (app->info, g_action_get_name (G_ACTION (action)), NULL); } -void +gboolean im_application_list_add (ImApplicationList *list, const gchar *desktop_id) { @@ -590,13 +590,13 @@ im_application_list_add (ImApplicationList *list, g_return_if_fail (desktop_id != NULL); if (im_application_list_lookup (list, desktop_id)) - return; + return TRUE; info = g_desktop_app_info_new (desktop_id); if (!info) { g_warning ("an application with id '%s' is not installed", desktop_id); - return; + return FALSE; } id = g_app_info_get_id (G_APP_INFO (info)); @@ -645,6 +645,8 @@ im_application_list_add (ImApplicationList *list, g_object_unref (launch_action); g_object_unref (actions); + + return TRUE; } void diff --git a/src/im-application-list.h b/src/im-application-list.h index f1de220..65e3326 100644 --- a/src/im-application-list.h +++ b/src/im-application-list.h @@ -36,7 +36,7 @@ GType im_application_list_get_type (void); ImApplicationList * im_application_list_new (void); -void im_application_list_add (ImApplicationList *list, +gboolean im_application_list_add (ImApplicationList *list, const gchar *desktop_id); void im_application_list_remove (ImApplicationList *list, -- cgit v1.2.3 From f96b5cf389899d0cc4b7f389d8dd8ec3e9e89489 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 19 Aug 2013 11:24:47 -0500 Subject: Pass the error back up through DBus --- src/messages-service.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/messages-service.c b/src/messages-service.c index 71fa09b..5054ebc 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -43,6 +43,12 @@ static IndicatorMessagesService *messages_service; static GHashTable *menus; static GSettings *settings; +enum { + DBUS_ERROR_BAD_DESKTOP_FILE, +}; + +G_DEFINE_QUARK(indicator_messages_dbus_error, dbus_error); + static void register_application (IndicatorMessagesService *service, GDBusMethodInvocation *invocation, @@ -53,7 +59,10 @@ register_application (IndicatorMessagesService *service, GDBusConnection *bus; const gchar *sender; - im_application_list_add (applications, desktop_id); + if (!im_application_list_add (applications, desktop_id)) { + g_dbus_method_invocation_return_error(invocation, dbus_error_quark(), DBUS_ERROR_BAD_DESKTOP_FILE, "Unable to find or parse desktop file for application '%s'", desktop_id); + return; + } bus = g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (service)); sender = g_dbus_method_invocation_get_sender (invocation); @@ -125,6 +134,9 @@ on_bus_acquired (GDBusConnection *bus, const gchar *profile; ImMenu *menu; + /* Register some errors */ + g_dbus_error_register_error (dbus_error_quark(), DBUS_ERROR_BAD_DESKTOP_FILE, "BadDesktopFile"); + g_dbus_connection_export_action_group (bus, INDICATOR_MESSAGES_DBUS_OBJECT, im_application_list_get_action_group (applications), &error); -- cgit v1.2.3