--- a/libpurple/e2ee.c Sat Oct 05 10:04:30 2013 +0200 +++ b/libpurple/e2ee.c Sat Oct 05 17:29:09 2013 +0200 @@ -40,6 +40,7 @@ struct _PurpleE2eeProvider { + gchar *name; PurpleE2eeFeatures features; PurpleE2eeState *default_state; }; @@ -108,7 +109,7 @@ const gchar * purple_e2ee_state_get_name(PurpleE2eeState *state) { - g_return_val_if_fail(state, NULL); + g_return_val_if_fail(state != NULL, NULL); return state->name; } @@ -155,6 +156,7 @@ return; } + g_free(provider->name); g_free(provider); } @@ -198,6 +200,24 @@ } void +purple_e2ee_provider_set_name(PurpleE2eeProvider *provider, const gchar *name) +{ + g_return_if_fail(provider != NULL); + g_return_if_fail(name != NULL); + + g_free(provider->name); + provider->name = g_strdup(name); +} + +const gchar * +purple_e2ee_provider_get_name(PurpleE2eeProvider *provider) +{ + g_return_val_if_fail(provider != NULL, NULL); + + return provider->name; +} + +void purple_e2ee_provider_set_default_state(PurpleE2eeProvider *provider, PurpleE2eeState *state) {