diff options
| author | Dan Winship <danw@src.gnome.org> | 2003-07-02 21:29:55 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2003-07-02 21:29:55 +0800 |
| commit | 43d436a36ebd59699b20f6e49f544ad24c8d8a30 (patch) | |
| tree | b65aee0432b3c88a8ca33cb12e2e33e93e7dd4f7 /calendar/cal-client/cal-client.c | |
| parent | 55b00d2c1261b744640134260abf94d60d8d0e58 (diff) | |
| download | gsoc2013-evolution-43d436a36ebd59699b20f6e49f544ad24c8d8a30.tar.gz gsoc2013-evolution-43d436a36ebd59699b20f6e49f544ad24c8d8a30.tar.zst gsoc2013-evolution-43d436a36ebd59699b20f6e49f544ad24c8d8a30.zip | |
Don't leak exceptions (load_static_capabilities): free the capability
* cal-client/cal-client.c (real_open_calendar): Don't leak
exceptions
(load_static_capabilities): free the capability string
* gui/dialogs/task-page.c (task_page_fill_component): Free the
description text if it *was* set, rather than if it wasn't.
* gui/dialogs/task-editor.c (task_editor_finalize): Free the priv
struct.
svn path=/trunk/; revision=21722
Diffstat (limited to 'calendar/cal-client/cal-client.c')
| -rw-r--r-- | calendar/cal-client/cal-client.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c index 075186b056..25e40322bb 100644 --- a/calendar/cal-client/cal-client.c +++ b/calendar/cal-client/cal-client.c @@ -839,10 +839,15 @@ real_open_calendar (CalClient *client, const char *str_uri, gboolean only_if_exi GNOME_Evolution_Calendar_CalFactory_open (f->data, str_uri, only_if_exists, corba_listener, &ev); - if (!BONOBO_EX (&ev)) - break; - else if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_CalFactory_UnsupportedMethod)) + if (!BONOBO_EX (&ev)) { + if (supported != NULL) + *supported = TRUE; + return TRUE; + } + + if (BONOBO_USER_EX (&ev, ex_GNOME_Evolution_Calendar_CalFactory_UnsupportedMethod)) unsupported++; + CORBA_exception_free (&ev); } if (supported != NULL) { @@ -852,17 +857,13 @@ real_open_calendar (CalClient *client, const char *str_uri, gboolean only_if_exi *supported = TRUE; } - if (BONOBO_EX (&ev)) { - bonobo_object_unref (BONOBO_OBJECT (priv->listener)); - priv->listener = NULL; - priv->load_state = CAL_CLIENT_LOAD_NOT_LOADED; - g_free (priv->uri); - priv->uri = NULL; - - return FALSE; - } + bonobo_object_unref (BONOBO_OBJECT (priv->listener)); + priv->listener = NULL; + priv->load_state = CAL_CLIENT_LOAD_NOT_LOADED; + g_free (priv->uri); + priv->uri = NULL; - return TRUE; + return FALSE; } /** @@ -1213,6 +1214,8 @@ load_static_capabilities (CalClient *client) priv->capabilities = g_strdup (cap); else priv->capabilities = g_strdup (""); + + CORBA_free (cap); CORBA_exception_free (&ev); } |