diff options
author | Ted Gould <ted@gould.cx> | 2013-08-20 16:04:51 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2013-08-20 16:04:51 -0500 |
commit | 0bd953b0ca74c8ae50b8eb907b081d61cc8bad10 (patch) | |
tree | b8f0356d0eddbb1fe14b7cd4e7c4598299cfc321 | |
parent | 47ecc8ff09e32d6dd20f55a4d31a5d6b91dd89da (diff) | |
download | ayatana-indicator-messages-0bd953b0ca74c8ae50b8eb907b081d61cc8bad10.tar.gz ayatana-indicator-messages-0bd953b0ca74c8ae50b8eb907b081d61cc8bad10.tar.bz2 ayatana-indicator-messages-0bd953b0ca74c8ae50b8eb907b081d61cc8bad10.zip |
Switch to looking in the shortcuts object to set the actions
-rw-r--r-- | src/im-application-list.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/im-application-list.c b/src/im-application-list.c index 81fee9a..61d0f53 100644 --- a/src/im-application-list.c +++ b/src/im-application-list.c @@ -609,7 +609,7 @@ im_application_list_activate_app_action (GSimpleAction *action, { Application *app = user_data; - g_desktop_app_info_launch_action (app->info, g_action_get_name (G_ACTION (action)), NULL); + indicator_desktop_shortcuts_nick_exec_with_context (app->shortcuts, g_action_get_name (G_ACTION (action)), NULL); } void @@ -662,14 +662,14 @@ im_application_list_add (ImApplicationList *list, g_signal_connect (launch_action, "activate", G_CALLBACK (im_application_list_activate_launch), app); g_action_map_add_action (G_ACTION_MAP (actions), G_ACTION (launch_action)); - { - const gchar *const *app_actions; + if (app->shortcuts != NULL) { + const gchar ** nicks; - for (app_actions = g_desktop_app_info_list_actions (app->info); *app_actions; app_actions++) + for (nicks = indicator_desktop_shortcuts_get_nicks (app->shortcuts); *nicks; nicks++) { GSimpleAction *action; - action = g_simple_action_new (*app_actions, NULL); + action = g_simple_action_new (*nicks, NULL); g_signal_connect (action, "activate", G_CALLBACK (im_application_list_activate_app_action), app); g_action_map_add_action (G_ACTION_MAP (actions), G_ACTION (action)); |