--- a/libpurple/certificate.c Wed Aug 01 07:39:38 2007 +0000 +++ b/libpurple/certificate.c Fri Aug 03 06:12:42 2007 +0000 @@ -244,17 +244,8 @@ this? */ g_return_val_if_fail( (activation != NULL) || (expiration != NULL), FALSE); - /* Fulfill the caller's requests, if possible */ - if (activation) { - g_return_val_if_fail(scheme->get_activation, FALSE); - *activation = scheme->get_activation(crt); - } - if (expiration) { - g_return_val_if_fail(scheme->get_expiration, FALSE); - *expiration = scheme->get_expiration(crt); - } - - return TRUE; + /* Throw the request on down to the certscheme */ + return (scheme->get_times)(crt, activation, expiration); }