diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-02-12 14:13:32 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2010-02-12 14:13:32 -0500 |
| commit | e61fd8874a8352fb5fa1c4b2ab84d29679fa7b0c (patch) | |
| tree | 2dbb90847597ead74c48c71d0a8e46a1cc711f67 /openbox/actions/execute.c | |
| parent | 890e13b919892887b773462bb866e849e0cb4d91 (diff) | |
use g_slice_new() instead of g_new() part 4
Diffstat (limited to 'openbox/actions/execute.c')
| -rw-r--r-- | openbox/actions/execute.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c index ed205364..18daf784 100644 --- a/openbox/actions/execute.c +++ b/openbox/actions/execute.c @@ -53,7 +53,7 @@ static gpointer setup_func(xmlNodePtr node) xmlNodePtr n; Options *o; - o = g_new0(Options, 1); + o = g_slice_new0(Options); if ((n = obt_xml_find_node(node, "command")) || (n = obt_xml_find_node(node, "execute"))) @@ -97,21 +97,22 @@ static void free_func(gpointer options) g_free(o->sn_icon); g_free(o->sn_wmclass); g_free(o->prompt); - if (o->data) g_free(o->data); - g_free(o); + if (o->data) g_slice_free(ObActionsData, o->data); + g_slice_free(Options, o); } } static Options* dup_options(Options *in, ObActionsData *data) { - Options *o = g_new(Options, 1); + Options *o = g_slice_new(Options); o->cmd = g_strdup(in->cmd); o->sn = in->sn; o->sn_name = g_strdup(in->sn_name); o->sn_icon = g_strdup(in->sn_icon); o->sn_wmclass = g_strdup(in->sn_wmclass); o->prompt = NULL; - o->data = g_memdup(data, sizeof(ObActionsData)); + o->data = g_slice_new(ObActionsData); + memcpy(o->data, data, sizeof(ObActionsData)); return o; } |
