Messaging Menu

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

  1. lp1414025
  2. Merge into trunk.15.04
Proposed by Lars Karlitski on 2015-01-26
Status: Merged
Approved by: Ted Gould on 2015-01-26
Approved revision: 435
Merged at revision: 435
Proposed branch: lp:~larsu/indicator-messages/lp1414025
Merge into: lp:indicator-messages/15.04
Diff against target: 12 lines (+1/-1)
1 file modified
src/im-application-list.c (+1/-1)
To merge this branch: bzr merge lp:~larsu/indicator-messages/lp1414025
Reviewer Review Type Date Requested Status
Ted Gould (community) 2015-01-26 Approve on 2015-01-26
PS Jenkins bot continuous-integration Approve on 2015-01-26
Review via email: mp+247638@code.launchpad.net

Commit Message

unescape_action_name: fix logic error (& instead of |)

Description of the Change

unescape_action_name: fix logic error (& instead of |)

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Ted Gould (ted) wrote :

Makes sense and the debs work for me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/im-application-list.c'
2--- src/im-application-list.c 2015-01-12 18:38:57 +0000
3+++ src/im-application-list.c 2015-01-26 19:10:26 +0000
4@@ -178,7 +178,7 @@
5 (one = g_ascii_xdigit_value (name[i + 1])) >= 0 &&
6 (two = g_ascii_xdigit_value (name[i + 2])) >= 0)
7 {
8- g_string_append_c (unescaped, (one << 4) & two);
9+ g_string_append_c (unescaped, (one << 4) | two);
10 i += 2;
11 }
12 else

Subscribers

People subscribed via source and target branches