[totem] main: Merge finalize into dispose
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] main: Merge finalize into dispose
- Date: Wed, 13 Mar 2013 11:06:12 +0000 (UTC)
commit e4c7d59e2c923ef1b7cb0af9f12c6c8e67197e77
Author: Bastien Nocera <hadess hadess net>
Date: Wed Mar 13 11:12:52 2013 +0100
main: Merge finalize into dispose
The codepaths were similar.
src/totem-playlist.c | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
---
diff --git a/src/totem-playlist.c b/src/totem-playlist.c
index 1271dfd..1c87cf1 100644
--- a/src/totem-playlist.c
+++ b/src/totem-playlist.c
@@ -1703,20 +1703,10 @@ totem_playlist_dispose (GObject *object)
g_clear_pointer (&playlist->priv->starttime, g_free);
g_clear_object (&playlist->priv->settings);
g_clear_object (&playlist->priv->lockdown_settings);
-
- G_OBJECT_CLASS (totem_playlist_parent_class)->dispose (object);
-}
-
-static void
-totem_playlist_finalize (GObject *object)
-{
- TotemPlaylist *playlist = TOTEM_PLAYLIST (object);
-
g_clear_pointer (&playlist->priv->current, gtk_tree_path_free);
-
g_clear_pointer (&playlist->priv->tree_path, gtk_tree_path_free);
- G_OBJECT_CLASS (totem_playlist_parent_class)->finalize (object);
+ G_OBJECT_CLASS (totem_playlist_parent_class)->dispose (object);
}
static void
@@ -3096,7 +3086,6 @@ totem_playlist_class_init (TotemPlaylistClass *klass)
object_class->set_property = totem_playlist_set_property;
object_class->get_property = totem_playlist_get_property;
object_class->dispose = totem_playlist_dispose;
- object_class->finalize = totem_playlist_finalize;
/* Signals */
totem_playlist_table_signals[CHANGED] =
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]