diff options
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/e-plugin.c | 6 | ||||
| -rw-r--r-- | e-util/e-signature-list.c | 6 | ||||
| -rw-r--r-- | e-util/e-signature-utils.c | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c index f839591cc6..a125e6832d 100644 --- a/e-util/e-plugin.c +++ b/e-util/e-plugin.c @@ -107,7 +107,7 @@ ep_set_enabled (const gchar *id, gint state) { GSettings *settings; - GSList *l; + GSList *link; GPtrArray *array; /* Bail out if no change to state, when expressed as a boolean: */ @@ -128,8 +128,8 @@ ep_set_enabled (const gchar *id, settings = g_settings_new ("org.gnome.evolution"); array = g_ptr_array_new (); - for (l = ep_disabled; l != NULL; l = l->next) - g_ptr_array_add (array, l->data); + for (link = ep_disabled; link != NULL; link = link->next) + g_ptr_array_add (array, link->data); g_ptr_array_add (array, NULL); g_settings_set_strv ( settings, "disabled-eplugins", diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c index 7223178d24..afc1d9eefd 100644 --- a/e-util/e-signature-list.c +++ b/e-util/e-signature-list.c @@ -280,9 +280,13 @@ ESignatureList * e_signature_list_new (void) { ESignatureList *signature_list; + GConfClient *client; signature_list = g_object_new (E_TYPE_SIGNATURE_LIST, NULL); - e_signature_list_construct (signature_list, gconf_client_get_default ()); + + client = gconf_client_get_default (); + e_signature_list_construct (signature_list, client); + g_object_unref (client); return signature_list; } diff --git a/e-util/e-signature-utils.c b/e-util/e-signature-utils.c index e7cb88f294..7a5a7829ac 100644 --- a/e-util/e-signature-utils.c +++ b/e-util/e-signature-utils.c @@ -38,9 +38,8 @@ static ESignatureList *global_signature_list; ESignatureList * e_get_signature_list (void) { - if (G_UNLIKELY (global_signature_list == NULL)) { + if (G_UNLIKELY (global_signature_list == NULL)) global_signature_list = e_signature_list_new (); - } g_return_val_if_fail (global_signature_list != NULL, NULL); |