aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2015-01-26 22:07:32 +0000
committerCI Train Bot <ci-train-bot@canonical.com>2015-01-26 22:07:32 +0000
commit788c2fbea2d68d1bdddca329604c3717a6880fbf (patch)
tree2da95392365f1969d3643d164042a3dcfca0f229 /src
parent594861df6c4f14af1cfc7c3d9874e07c438fb01e (diff)
parentb8537d99ad8c4c559f5dd3bc82394591f956ca8f (diff)
downloadayatana-indicator-messages-788c2fbea2d68d1bdddca329604c3717a6880fbf.tar.gz
ayatana-indicator-messages-788c2fbea2d68d1bdddca329604c3717a6880fbf.tar.bz2
ayatana-indicator-messages-788c2fbea2d68d1bdddca329604c3717a6880fbf.zip
unescape_action_name: fix logic error (& instead of |) Fixes: #1414025
Approved by: Ted Gould, PS Jenkins bot
Diffstat (limited to 'src')
-rw-r--r--src/im-application-list.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/im-application-list.c b/src/im-application-list.c
index 3b06798..cbabc64 100644
--- a/src/im-application-list.c
+++ b/src/im-application-list.c
@@ -178,7 +178,7 @@ unescape_action_name (const gchar *name)
(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