Merge lp:~nikwen/indicator-messages/clear-all-unescape-fix into lp:indicator-messages/15.10

[Ted Gould]

Unescape action names when passing them to the proxy in im_application_list_remove_all()

Unescape action names when passing them to the proxy in im_application_list_remove_all().

This fixes an issue in account-polld and ubuntu-push where no new Gmail notifications would be shown because account-polld still thinks that a "You have about %d more unread messages" notification is being shown although it has been cleared using the "Clear all" button.

[Ted Gould (ted)]

Approving for 15.10 as well.

review: Approve

[Niklas Wenzel (nikwen)]

Thanks. :)

The comment from the other MP is still valid. Could we get this into the phone images before the next RTM branch off?

[Niklas Wenzel (nikwen)]

Thanks for merging. :)

What's about the other MP for the phone images? https://code.launchpad.net/~nikwen/indicator-messages/clear-all-unescape-fix/+merge/257471

=== modified file 'src/im-application-list.c'
--- src/im-application-list.c	2015-04-03 14:51:51 +0000
+++ src/im-application-list.c	2015-05-05 14:36:02 +0000
@@ -522,10 +522,26 @@
 
       if (app->proxy != NULL) /* If it is remote, we tell the app we've cleared */
         {
+          guint i;
+          gchar **unescaped_source_actions;
+          gchar **unescaped_message_actions;
+
+          /* Unescape action names */
+          unescaped_source_actions = g_new0 (gchar *, g_strv_length (source_actions) + 1);
+          for (i = 0; source_actions[i]; i++)
+            unescaped_source_actions[i] = unescape_action_name (source_actions[i]);
+
+          unescaped_message_actions = g_new0 (gchar *, g_strv_length (message_actions) + 1);
+          for (i = 0; message_actions[i]; i++)
+            unescaped_message_actions[i] = unescape_action_name (message_actions[i]);
+
           indicator_messages_application_call_dismiss (app->proxy, 
-                                                       (const gchar * const *) source_actions,
-                                                       (const gchar * const *) message_actions,
+                                                       (const gchar * const *) unescaped_source_actions,
+                                                       (const gchar * const *) unescaped_message_actions,
                                                        app->cancellable, NULL, NULL);
+
+          g_strfreev (unescaped_source_actions);
+          g_strfreev (unescaped_message_actions);
         }
 
       g_strfreev (source_actions);