diff options
| author | Ross Burton <ross@linux.intel.com> | 2010-05-14 10:32:38 +0100 |
|---|---|---|
| committer | Ross Burton <ross@linux.intel.com> | 2010-05-14 10:32:38 +0100 |
| commit | 1da71cc919d1900c1f4c67c1ae722ed9cf505271 (patch) | |
| tree | 0968889f66f9e5c9e0cd49a443ce3440507faa6d /rest/rest-proxy.c | |
| parent | 54361c5c613f512ce6462e1584211419011ad754 (diff) | |
| download | librest-1da71cc919d1900c1f4c67c1ae722ed9cf505271.tar.gz | |
Don't check for dispose or finalize when chaining up
Diffstat (limited to 'rest/rest-proxy.c')
| -rw-r--r-- | rest/rest-proxy.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/rest/rest-proxy.c b/rest/rest-proxy.c index 4385200..92a1bfc 100644 --- a/rest/rest-proxy.c +++ b/rest/rest-proxy.c @@ -133,9 +133,6 @@ rest_proxy_dispose (GObject *object) { RestProxyPrivate *priv = GET_PRIVATE (object); - if (G_OBJECT_CLASS (rest_proxy_parent_class)->dispose) - G_OBJECT_CLASS (rest_proxy_parent_class)->dispose (object); - if (priv->session) { g_object_unref (priv->session); @@ -147,6 +144,8 @@ rest_proxy_dispose (GObject *object) g_object_unref (priv->session_sync); priv->session_sync = NULL; } + + G_OBJECT_CLASS (rest_proxy_parent_class)->dispose (object); } static void @@ -158,8 +157,7 @@ rest_proxy_finalize (GObject *object) g_free (priv->url_format); g_free (priv->user_agent); - if (G_OBJECT_CLASS (rest_proxy_parent_class)->finalize) - G_OBJECT_CLASS (rest_proxy_parent_class)->finalize (object); + G_OBJECT_CLASS (rest_proxy_parent_class)->finalize (object); } static void |