comparison: libpurple/e2ee.c
libpurple/e2ee.c
- changeset 34483
- 0fbb73c987a4
- parent 34481
- 25c373adf8de
- child 34484
- 19edf7808ec1
equal
deleted
inserted
replaced
| 34482:ea64bce9423c | 34483:0fbb73c987a4 |
|---|---|
| 38 guint ref_count; | 38 guint ref_count; |
| 39 }; | 39 }; |
| 40 | 40 |
| 41 struct _PurpleE2eeProvider | 41 struct _PurpleE2eeProvider |
| 42 { | 42 { |
| 43 gchar *name; | |
| 43 PurpleE2eeFeatures features; | 44 PurpleE2eeFeatures features; |
| 44 PurpleE2eeState *default_state; | 45 PurpleE2eeState *default_state; |
| 45 }; | 46 }; |
| 46 | 47 |
| 47 static PurpleE2eeProvider *main_provider = NULL; | 48 static PurpleE2eeProvider *main_provider = NULL; |
| 106 } | 107 } |
| 107 | 108 |
| 108 const gchar * | 109 const gchar * |
| 109 purple_e2ee_state_get_name(PurpleE2eeState *state) | 110 purple_e2ee_state_get_name(PurpleE2eeState *state) |
| 110 { | 111 { |
| 111 g_return_val_if_fail(state, NULL); | 112 g_return_val_if_fail(state != NULL, NULL); |
| 112 | 113 |
| 113 return state->name; | 114 return state->name; |
| 114 } | 115 } |
| 115 | 116 |
| 116 void | 117 void |
| 153 if (provider == main_provider) { | 154 if (provider == main_provider) { |
| 154 purple_debug_error("e2ee", "This provider is still registered"); | 155 purple_debug_error("e2ee", "This provider is still registered"); |
| 155 return; | 156 return; |
| 156 } | 157 } |
| 157 | 158 |
| 159 g_free(provider->name); | |
| 158 g_free(provider); | 160 g_free(provider); |
| 159 } | 161 } |
| 160 | 162 |
| 161 gboolean | 163 gboolean |
| 162 purple_e2ee_provider_register(PurpleE2eeProvider *provider) | 164 purple_e2ee_provider_register(PurpleE2eeProvider *provider) |
| 196 | 198 |
| 197 return provider->features; | 199 return provider->features; |
| 198 } | 200 } |
| 199 | 201 |
| 200 void | 202 void |
| 203 purple_e2ee_provider_set_name(PurpleE2eeProvider *provider, const gchar *name) | |
| 204 { | |
| 205 g_return_if_fail(provider != NULL); | |
| 206 g_return_if_fail(name != NULL); | |
| 207 | |
| 208 g_free(provider->name); | |
| 209 provider->name = g_strdup(name); | |
| 210 } | |
| 211 | |
| 212 const gchar * | |
| 213 purple_e2ee_provider_get_name(PurpleE2eeProvider *provider) | |
| 214 { | |
| 215 g_return_val_if_fail(provider != NULL, NULL); | |
| 216 | |
| 217 return provider->name; | |
| 218 } | |
| 219 | |
| 220 void | |
| 201 purple_e2ee_provider_set_default_state(PurpleE2eeProvider *provider, | 221 purple_e2ee_provider_set_default_state(PurpleE2eeProvider *provider, |
| 202 PurpleE2eeState *state) | 222 PurpleE2eeState *state) |
| 203 { | 223 { |
| 204 g_return_if_fail(provider != NULL); | 224 g_return_if_fail(provider != NULL); |
| 205 g_return_if_fail(state != NULL); | 225 g_return_if_fail(state != NULL); |
