Merge lp:~ted/indicator-messages/lp1385331-unescape-message-ids into lp:indicator-messages/15.04

[Ted Gould]

Provide functions that allow for action names directly

Now with escaping and unescaping we need two sets of functions here, one that can handle the unescaped names and one that can handle the action names directly. This adds that and puts the right ones in the right places.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:438
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/142/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/indicator-messages-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-messages-ci/142/rebuild

review: Approve (continuous-integration)

[lp:~ted/indicator-messages/lp1385331-unescape-message-ids]

439. By Ted Gould on 2015-02-19

Adding a manual test case for a Tweet

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:439
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/143/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-vivid-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-vivid-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/indicator-messages-vivid-armhf-ci/5/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-messages-ci/143/rebuild

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Looks good to me, thanks!

review: Approve

=== modified file 'src/im-application-list.c'
--- src/im-application-list.c	2015-01-26 19:04:11 +0000
+++ src/im-application-list.c	2015-02-19 03:12:28 +0000
@@ -343,6 +343,17 @@
   return was_drawing_attention != app->draws_attention;
 }
 
+static void
+im_application_list_source_removed_action (Application *app,
+                                           const gchar *action_name)
+{
+  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);
+}
+
 /* Remove a source from an application, signal up and update the status
    of the draws attention flag. */
 static void
@@ -353,11 +364,7 @@
 
   action_name = escape_action_name (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);
+  im_application_list_source_removed_action (app, action_name);
 
   g_free (action_name);
 }
@@ -389,19 +396,15 @@
                                                    app->cancellable, NULL, NULL);
     }
 
-  im_application_list_source_removed (app, action_name);
+  im_application_list_source_removed_action (app, action_name);
 
   g_free (source_id);
 }
 
 static void
-im_application_list_message_removed (Application *app,
-                                     const gchar *id)
+im_application_list_message_removed_action (Application *app,
+                                            const gchar *action_name)
 {
-  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);
 
@@ -409,6 +412,17 @@
     im_application_list_update_root_action (app->list);
 
   g_signal_emit (app->list, signals[MESSAGE_REMOVED], 0, app->id, action_name);
+}
+
+static void
+im_application_list_message_removed (Application *app,
+                                     const gchar *id)
+{
+  gchar *action_name;
+
+  action_name = escape_action_name (id);
+
+  im_application_list_message_removed_action(app, action_name);
 
   g_free (action_name);
 }
@@ -442,7 +456,7 @@
                                                    app->cancellable, NULL, NULL);
     }
 
-  im_application_list_message_removed (app, action_name);
+  im_application_list_message_removed_action (app, action_name);
 
   g_free (message_id);
 }
@@ -498,11 +512,11 @@
 
       source_actions = g_action_group_list_actions (G_ACTION_GROUP (app->source_actions));
       for (it = source_actions; *it; it++)
-        im_application_list_source_removed (app, *it);
+        im_application_list_source_removed_action (app, *it);
 
       message_actions = g_action_group_list_actions (G_ACTION_GROUP (app->message_actions));
       for (it = message_actions; *it; it++)
-        im_application_list_message_removed (app, *it);
+        im_application_list_message_removed_action (app, *it);
 
       if (app->proxy != NULL) /* If it is remote, we tell the app we've cleared */
         {

=== modified file 'tests/manual'
--- tests/manual	2014-10-10 15:22:50 +0000
+++ tests/manual	2015-02-19 03:12:28 +0000
@@ -61,3 +61,20 @@
 	<dt>Clear the message in the greeter</dt>
 		<dd>The message should no longer be in the messaging menu</dd>
 </dl>
+
+Test-case indicator-messages/push-message-twitter
+<dl>
+	<dt>From a shell prompt send a simultated Twitter push notification</dt>
+		<dd>gdbus call --session --dest com.ubuntu.Postal --object-path /com/ubuntu/Postal/com_2eubuntu_2edeveloper_2ewebapps_2ewebapp_2dtwitter --method com.ubuntu.Postal.Post com.ubuntu.developer.webapps.webapp-twitter_webapp-twitter '"{\"message\": \"foobar\", \"notification\":{\"card\": {\"summary\": \"yes\", \"body\": \"hello\", \"popup\": true, \"persist\": true}}}"'</dd>
+		<dd>The messaging envelope on the panel should change to highlight a message</dd>
+	<dt>Open the messaging menu</dt>
+		<dd>The menu should contain an entry with the Twitter icon for the application</dd>
+		<dd>The title of the message should be 'yes'</dd>
+		<dd>The body of the message should be 'hello'</dd>
+		<dd>At the bottom of them menu there should be a 'Clear All' menu item</dd>
+	<dt>Clear the message using the 'Clear All' command</dt>
+		<dd>The Twitter message should disappear</dd>
+		<dd>The 'Clear All' item should disappear</dd>
+		<dd>The icon in the panel should return to its original state</dd>
+</dl>
+