diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-02-16 16:26:18 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2010-02-16 16:32:38 -0500 |
| commit | d179d6428ae585a3b8a13479bfe4586e41de2ff9 (patch) | |
| tree | 322cb58fea023dc635432cef8f06307008c8f4c8 /openbox/actions/addremovedesktop.c | |
| parent | d45af3cb45f35ba639efac15675ed10b3515a7f0 (diff) | |
more using g_slice_new() instead of g_new()
Diffstat (limited to 'openbox/actions/addremovedesktop.c')
| -rw-r--r-- | openbox/actions/addremovedesktop.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/openbox/actions/addremovedesktop.c b/openbox/actions/addremovedesktop.c index e21e9e66..ff6767e2 100644 --- a/openbox/actions/addremovedesktop.c +++ b/openbox/actions/addremovedesktop.c @@ -10,6 +10,7 @@ typedef struct { static gpointer setup_func(xmlNodePtr node); static gpointer setup_add_func(xmlNodePtr node); static gpointer setup_remove_func(xmlNodePtr node); +static void free_func(gpointer o); static gboolean run_func(ObActionsData *data, gpointer options); /* 3.4-compatibility */ static gpointer setup_addcurrent_func(xmlNodePtr node); @@ -19,17 +20,18 @@ static gpointer setup_removelast_func(xmlNodePtr node); void action_addremovedesktop_startup(void) { - actions_register("AddDesktop", setup_add_func, g_free, run_func); - actions_register("RemoveDesktop", setup_remove_func, g_free, run_func); + actions_register("AddDesktop", setup_add_func, free_func, run_func); + actions_register("RemoveDesktop", setup_remove_func, free_func, run_func); /* 3.4-compatibility */ - actions_register("AddDesktopLast", setup_addlast_func, g_free, run_func); + actions_register("AddDesktopLast", setup_addlast_func, + free_func, run_func); actions_register("RemoveDesktopLast", setup_removelast_func, - g_free, run_func); + free_func, run_func); actions_register("AddDesktopCurrent", setup_addcurrent_func, - g_free, run_func); + free_func, run_func); actions_register("RemoveDesktopCurrent", setup_removecurrent_func, - g_free, run_func); + free_func, run_func); } static gpointer setup_func(xmlNodePtr node) @@ -37,7 +39,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, "where"))) { gchar *s = obt_xml_node_string(n); @@ -65,6 +67,11 @@ static gpointer setup_remove_func(xmlNodePtr node) return o; } +static void free_func(gpointer o) +{ + g_slice_free(Options, o); +} + /* Always return FALSE because its not interactive */ static gboolean run_func(ObActionsData *data, gpointer options) { |