X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-pair.c;h=25f14ca37f745e13913889bba1b553da08184174;hb=3266fbf87e009daf846687835198f80ae3a2d923;hp=4d5adca3fea5b8c9baad4b08ebdeae39ed2dd5ee;hpb=259b2c3a417dba1c9170c5353d1740e5c29bf246;p=modest diff --git a/src/modest-pair.c b/src/modest-pair.c index 4d5adca..25f14ca 100644 --- a/src/modest-pair.c +++ b/src/modest-pair.c @@ -34,18 +34,18 @@ modest_pair_new (gpointer first, gpointer second, gboolean own) { ModestPair *pair; - pair = g_new (ModestPair, 1); + pair = g_slice_new (ModestPair); - pair->first = first; + pair->first = first; pair->second = second; - pair->own = own; + pair->own = own; return pair; } void -modest_pair_destroy (ModestPair *pair) +modest_pair_free (ModestPair *pair) { if (!pair) return; @@ -54,20 +54,19 @@ modest_pair_destroy (ModestPair *pair) g_free (pair->first); g_free (pair->second); } - g_free (pair); + + g_slice_free (ModestPair, pair); } - -GSList* -modest_pair_gslist_destroy (GSList *pairs) +void +modest_pair_list_free (ModestPairList *pairs) { - GSList *cursor = pairs; + ModestPairList *cursor = pairs; while (cursor) { - modest_pair_destroy ((ModestPair*)cursor->data); + modest_pair_free ((ModestPair*)cursor->data); cursor = cursor->next; } g_slist_free (pairs); - return NULL; }