# HG changeset patch # User William Pitcock # Date 1189560593 18000 # Node ID 331bfc72ef6623c876851f779e76a1bdfd1ce501 # Parent d74a68871159934ac1a6587d98f29b88e4732af7 Convert some things to use GSlice. diff -r d74a68871159 -r 331bfc72ef66 src/audacious/eventqueue.c --- a/src/audacious/eventqueue.c Tue Sep 11 09:14:15 2007 -0500 +++ b/src/audacious/eventqueue.c Tue Sep 11 20:29:53 2007 -0500 @@ -27,7 +27,7 @@ hook_call(hq->name, hq->user_data); g_free(hq->name); - g_free(hq); + g_slice_free(HookCallQueue, hq); return FALSE; } @@ -39,7 +39,7 @@ g_return_if_fail(name != NULL); g_return_if_fail(user_data != NULL); - hq = g_new0(HookCallQueue, 1); + hq = g_slice_new0(HookCallQueue); hq->name = g_strdup(name); hq->user_data = user_data; diff -r d74a68871159 -r 331bfc72ef66 src/audacious/formatter.c --- a/src/audacious/formatter.c Tue Sep 11 09:14:15 2007 -0500 +++ b/src/audacious/formatter.c Tue Sep 11 20:29:53 2007 -0500 @@ -40,7 +40,7 @@ Formatter * formatter_new(void) { - Formatter *formatter = g_new0(Formatter, 1); + Formatter *formatter = g_slice_new0(Formatter); formatter_associate(formatter, '%', "%"); return formatter; @@ -60,7 +60,8 @@ for (i = 0; i < 256; i++) if (formatter->values[i]) g_free(formatter->values[i]); - g_free(formatter); + + g_slice_free(Formatter, formatter); } /** diff -r d74a68871159 -r 331bfc72ef66 src/audacious/playback.c --- a/src/audacious/playback.c Tue Sep 11 09:14:15 2007 -0500 +++ b/src/audacious/playback.c Tue Sep 11 20:29:53 2007 -0500 @@ -248,7 +248,7 @@ g_cond_free(playback->pb_ready_cond); g_free(playback->filename); - g_free(playback); + g_slice_free(InputPlayback, playback); set_current_input_playback(NULL); #ifdef USE_DBUS mpris_emit_status_change(mpris, MPRIS_STATUS_STOP); @@ -343,7 +343,7 @@ ip_data.playing = TRUE; - playback = g_new0(InputPlayback, 1); + playback = g_slice_new0(InputPlayback); entry->decoder->output = &psuedo_output_plugin; diff -r d74a68871159 -r 331bfc72ef66 src/audacious/ui_skinned_playlist.c --- a/src/audacious/ui_skinned_playlist.c Tue Sep 11 09:14:15 2007 -0500 +++ b/src/audacious/ui_skinned_playlist.c Tue Sep 11 20:29:53 2007 -0500 @@ -455,7 +455,7 @@ plw_w = playlistwin_get_width(); plw_h = playlistwin_get_height(); - playlist_rect = g_new0(GdkRectangle, 1); + playlist_rect = g_slice_new0(GdkRectangle); playlist_rect->x = 0; playlist_rect->y = 0; @@ -769,7 +769,7 @@ g_object_unref(obj); g_object_unref(gc); - g_free(playlist_rect); + g_slice_free(GdkRectangle, playlist_rect); return FALSE; } diff -r d74a68871159 -r 331bfc72ef66 src/audacious/ui_skinselector.c --- a/src/audacious/ui_skinselector.c Tue Sep 11 09:14:15 2007 -0500 +++ b/src/audacious/ui_skinselector.c Tue Sep 11 20:29:53 2007 -0500 @@ -168,7 +168,7 @@ g_return_if_fail(filename != NULL); - node = g_new0(SkinNode, 1); + node = g_slice_new0(SkinNode); node->path = g_strdup(filename); basename = g_path_get_basename(filename); @@ -232,7 +232,7 @@ g_return_if_fail(data != NULL); g_free(SKIN_NODE(data)->name); g_free(SKIN_NODE(data)->path); - g_free(data); + g_slice_free(SkinNode, data); }