Merge lp:~ted/indicator-messages/verify-before-parse into lp:indicator-messages/15.04

[Ted Gould]

Verify state type before parsing

Never use g_variant_get(), please.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:428
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/141/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-messages-vivid-amd64-ci/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/indicator-messages-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

The Jenkins failure looks like a hiccup, so re-queueing.

The patch looks fine, but is there a bug # associated with this patch?

[Ted Gould (ted)]

No, it was when looking at another bug I thought this was the fix. It wasn't, but I figured we should fix it anyway.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

And Jenkins is happy now too

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-17 20:08:22 +0000
@@ -293,6 +293,8 @@
   state = g_action_group_get_action_state (G_ACTION_GROUP(app->source_actions), action_name);
   if (state == NULL)
     return FALSE;
+  if (!g_variant_is_of_type(state, G_VARIANT_TYPE("(uxsb)")))
+    return FALSE;
 
   g_variant_get (state, "(ux&sb)", &count, &time, &string, &draws_attention);