diff options
| author | Lars Uebernickel <lars.uebernickel@canonical.com> | 2014-11-07 12:42:38 +0100 |
|---|---|---|
| committer | Lars Uebernickel <lars.uebernickel@canonical.com> | 2014-11-07 12:42:38 +0100 |
| commit | d3f66404116478c8f5942e9c056f8145397a69bd (patch) | |
| tree | dd569d8901567b4e86a07c17909db2114badf94f /src | |
| parent | 885784f87f1447782c410cd99d81eb283b373c48 (diff) | |
| download | ayatana-indicator-messages-d3f66404116478c8f5942e9c056f8145397a69bd.tar.gz ayatana-indicator-messages-d3f66404116478c8f5942e9c056f8145397a69bd.tar.bz2 ayatana-indicator-messages-d3f66404116478c8f5942e9c056f8145397a69bd.zip | |
Also escape message and source ids when removing them from the app
The last commit missed these two places.
Diffstat (limited to 'src')
| -rw-r--r-- | src/im-application-list.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/im-application-list.c b/src/im-application-list.c index 3ff3355..6c7c0a8 100644 --- a/src/im-application-list.c +++ b/src/im-application-list.c @@ -344,12 +344,17 @@ static void im_application_list_source_removed (Application *app, const gchar *id) { - g_action_map_remove_action (G_ACTION_MAP(app->source_actions), id); + gchar *action_name; + + action_name = escape_action_name (id); - g_signal_emit (app->list, signals[SOURCE_REMOVED], 0, app->id, id); + g_action_map_remove_action (G_ACTION_MAP(app->source_actions), action_name); + g_signal_emit (app->list, signals[SOURCE_REMOVED], 0, app->id, action_name); if (application_update_draws_attention(app)) im_application_list_update_root_action (app->list); + + g_free (action_name); } static void @@ -388,13 +393,19 @@ static void im_application_list_message_removed (Application *app, const gchar *id) { - g_action_map_remove_action (G_ACTION_MAP(app->message_actions), id); - g_action_muxer_remove (app->message_sub_actions, id); + gchar *action_name; + + action_name = escape_action_name (id); + + g_action_map_remove_action (G_ACTION_MAP(app->message_actions), action_name); + g_action_muxer_remove (app->message_sub_actions, action_name); if (application_update_draws_attention(app)) im_application_list_update_root_action (app->list); - g_signal_emit (app->list, signals[MESSAGE_REMOVED], 0, app->id, id); + g_signal_emit (app->list, signals[MESSAGE_REMOVED], 0, app->id, action_name); + + g_free (action_name); } static void |