diff options
author | okan <okan> | 2014-08-25 14:31:22 +0000 |
---|---|---|
committer | okan <okan> | 2014-08-25 14:31:22 +0000 |
commit | 3b99d5357667095b3b89e2c41c2cb17d07537b42 (patch) | |
tree | a9f43a884779d14f94e8b64323740fb276694ca7 /group.c | |
parent | 7314a3aefd33e901cfa1bd4a48eb4e75be4c01e2 (diff) | |
download | cwm-3b99d5357667095b3b89e2c41c2cb17d07537b42.tar.gz cwm-3b99d5357667095b3b89e2c41c2cb17d07537b42.tar.xz cwm-3b99d5357667095b3b89e2c41c2cb17d07537b42.zip |
Since the flatting out of sc->group_names is only for setting
NET_DESKTOP_NAMES, merge the helper into xu_ewmh_net_desktop_names, where we actually set the property.
Diffstat (limited to 'group.c')
-rw-r--r-- | group.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/group.c b/group.c index 3657fad..e4567ee 100644 --- a/group.c +++ b/group.c @@ -38,7 +38,6 @@ static void group_show(struct screen_ctx *, struct group_ctx *); static void group_restack(struct screen_ctx *, struct group_ctx *); static int group_hidden_state(struct group_ctx *); static void group_setactive(struct screen_ctx *, long); -static void group_set_names(struct screen_ctx *); const char *num_to_name[] = { "nogroup", "one", "two", "three", "four", "five", "six", @@ -427,28 +426,7 @@ group_update_names(struct screen_ctx *sc) sc->group_names = strings; sc->group_nonames = n; - if (setnames) - group_set_names(sc); -} -static void -group_set_names(struct screen_ctx *sc) -{ - char *p, *q; - size_t len = 0, tlen, slen; - int i; - - for (i = 0; i < sc->group_nonames; i++) - len += strlen(sc->group_names[i]) + 1; - q = p = xcalloc(len, sizeof(*p)); - - tlen = len; - for (i = 0; i < sc->group_nonames; i++) { - slen = strlen(sc->group_names[i]) + 1; - (void)strlcpy(q, sc->group_names[i], tlen); - tlen -= slen; - q += slen; - } - - xu_ewmh_net_desktop_names(sc, p, len); + if (setnames) + xu_ewmh_net_desktop_names(sc); } |