Merge lp:~larsu/indicator-messages/lp1414025 into lp:indicator-messages/15.04

[Lars Karlitski]

unescape_action_name: fix logic error (& instead of |)

unescape_action_name: fix logic error (& instead of |)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

Makes sense and the debs work for me.

review: Approve

=== modified file 'src/im-application-list.c'
--- src/im-application-list.c	2015-01-12 18:38:57 +0000
+++ src/im-application-list.c	2015-01-26 19:10:26 +0000
@@ -178,7 +178,7 @@
           (one = g_ascii_xdigit_value (name[i + 1])) >= 0 &&
           (two = g_ascii_xdigit_value (name[i + 2])) >= 0)
         {
-          g_string_append_c (unescaped, (one << 4) & two);
+          g_string_append_c (unescaped, (one << 4) | two);
           i += 2;
         }
       else