summaryrefslogtreecommitdiff
path: root/openbox/actions/desktop.c
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@comhem.se>2008-03-02 19:41:32 +0100
committerMikael Magnusson <mikachu@comhem.se>2008-03-02 19:41:32 +0100
commit9676757a08b3e2e508c47f7795326bda8e54dc53 (patch)
treefe390424216d8d3db2f95d50b61adc44262f0658 /openbox/actions/desktop.c
parentfeec8f663f0a11546c2da87575fecc8a88d97ca1 (diff)
parente4691468cd291a6bd2b489e90eca2be78b8d0c51 (diff)
Merge branch 'backport' into work
Conflicts: openbox/actions/desktop.c openbox/actions/if.c
Diffstat (limited to 'openbox/actions/desktop.c')
-rw-r--r--openbox/actions/desktop.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index 37268bba..d5535f6c 100644
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -86,7 +86,7 @@ static gpointer setup_go_func(xmlNodePtr node)
}
else {
o->type = ABSOLUTE;
- o->abs.desktop = obt_parse_node_int(n) - 1;
+ o->abs.desktop = atoi(s) - 1;
}
g_free(s);
}