diff options
| author | Federico Mena Quintero <federico@helixcode.com> | 2000-06-07 02:15:57 +0800 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2000-06-07 02:15:57 +0800 |
| commit | ae33d3f67e77c5182dec21c388605b4a4ae48e51 (patch) | |
| tree | ee94ecd4d154c794b7ac1b8f58fcfe2cf0f17905 /calendar/cal-util/calobj.c | |
| parent | 315fea41788c87515239ef8b9d26c7bdbd23d1d1 (diff) | |
| download | gsoc2013-evolution-ae33d3f67e77c5182dec21c388605b4a4ae48e51.tar.gz gsoc2013-evolution-ae33d3f67e77c5182dec21c388605b4a4ae48e51.tar.zst gsoc2013-evolution-ae33d3f67e77c5182dec21c388605b4a4ae48e51.zip | |
Removed from the public header; made static. Now everyone should use
2000-06-06 Federico Mena Quintero <federico@helixcode.com>
* cal-util/calobj.c (ical_object_destroy): Removed from the public
header; made static. Now everyone should use refcounting.
* pcs/cal-backend-imc.c (free_ical_object): Use
ical_object_unref().
(remove_object): Likewise.
svn path=/trunk/; revision=3439
Diffstat (limited to 'calendar/cal-util/calobj.c')
| -rw-r--r-- | calendar/cal-util/calobj.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/calendar/cal-util/calobj.c b/calendar/cal-util/calobj.c index d2c47fbc65..9e86011d9f 100644 --- a/calendar/cal-util/calobj.c +++ b/calendar/cal-util/calobj.c @@ -104,31 +104,9 @@ ical_object_ref (iCalObject *ico) } -void -ical_object_unref (iCalObject *ico) -{ - ico->ref_count--; - if (ico->ref_count == 0) - ical_object_destroy (ico); -} - - -static void -my_free (gpointer data, gpointer user_dat_ignored) -{ - g_free (data); -} - -static void -list_free (GList *list) -{ - g_list_foreach (list, my_free, 0); - g_list_free (list); -} - #define free_if_defined(x) if (x){ g_free (x); x = 0; } #define lfree_if_defined(x) if (x){ list_free (x); x = 0; } -void +static void ical_object_destroy (iCalObject *ico) { /* Regular strings */ @@ -157,6 +135,28 @@ ical_object_destroy (iCalObject *ico) g_free (ico); } +void +ical_object_unref (iCalObject *ico) +{ + ico->ref_count--; + if (ico->ref_count == 0) + ical_object_destroy (ico); +} + + +static void +my_free (gpointer data, gpointer user_dat_ignored) +{ + g_free (data); +} + +static void +list_free (GList *list) +{ + g_list_foreach (list, my_free, 0); + g_list_free (list); +} + /* This resets any recurrence rules of the iCalObject. */ void ical_object_reset_recurrence (iCalObject *ico) @@ -830,7 +830,7 @@ ical_object_create_from_vobject (VObject *o, const char *object_name) /* rrule */ if (has (o, VCRRuleProp)){ if (!load_recurrence (ical, str_val (vo))) { - ical_object_destroy (ical); + ical_object_unref (ical); return NULL; } free (the_str); |