Skip to content
Snippets Groups Projects
Commit ea8b54ac authored by Alexandre Savard's avatar Alexandre Savard
Browse files

Merge branch 'm_savard' into addressbook

parents da73a5d1 d1268539
No related branches found
No related tags found
No related merge requests found
......@@ -402,6 +402,7 @@ shortcuts_initialize_bindings ()
action = shortcutsKeysElement->data;
maskAndKey = g_strdup (g_hash_table_lookup (shortcutsMap, action));
DEBUG("-------------------- maskAndKey %s", maskAndKey);
token1 = strtok (maskAndKey, "x");
token2 = strtok (NULL, "x");
......@@ -409,19 +410,9 @@ shortcuts_initialize_bindings ()
key = 0;
// Value not setted
if (token1 == NULL)
{
// Nothing to do
}
// Backward compatibility (no mask defined)
if (token1 != NULL && token2 == NULL)
{
key = atoi (token1);
mask = 0;
}
// Regular case
else
{
if (token1 && token2){
DEBUG("token1 %s, token2 %s", token1, token2);
mask = atoi (token1);
key = atoi (token2);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment