diff options
Diffstat (limited to 'addressbook/gui/component')
| -rw-r--r-- | addressbook/gui/component/addressbook-component.c | 9 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-storage.c | 14 | ||||
| -rw-r--r-- | addressbook/gui/component/e-address-popup.c | 3 |
3 files changed, 20 insertions, 6 deletions
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index f90df5f65a..b49dec3005 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -407,12 +407,17 @@ static void new_item_cb (EBook *book, gpointer closure) { gboolean is_list = GPOINTER_TO_INT (closure); + ECard *card; + if (book == NULL) return; + + card = e_card_new (""); if (is_list) - e_addressbook_show_contact_list_editor (book, e_card_new(""), TRUE, TRUE); + e_addressbook_show_contact_list_editor (book, card, TRUE, TRUE); else - e_addressbook_show_contact_editor (book, e_card_new(""), TRUE, TRUE); + e_addressbook_show_contact_editor (book, card, TRUE, TRUE); + g_object_unref (card); } static void diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c index 6f087b6c7e..f877dd3cd6 100644 --- a/addressbook/gui/component/addressbook-storage.c +++ b/addressbook/gui/component/addressbook-storage.c @@ -443,7 +443,7 @@ load_source_data (const char *file_path) } for (child = root->children; child; child = child->next) { - char *path; + char *path, *value; AddressbookSource *source; source = g_new0 (AddressbookSource, 1); @@ -452,9 +452,15 @@ load_source_data (const char *file_path) source->port = get_string_value (child, "port"); source->host = get_string_value (child, "host"); source->rootdn = get_string_value (child, "rootdn"); - source->scope = ldap_parse_scope (get_string_value (child, "scope")); - source->auth = ldap_parse_auth (get_string_value (child, "authmethod")); - source->ssl = ldap_parse_ssl (get_string_value (child, "ssl")); + value = get_string_value (child, "scope"); + source->scope = ldap_parse_scope (value); + g_free (value); + value = get_string_value (child, "authmethod"); + source->auth = ldap_parse_auth (value); + g_free (value); + value = get_string_value (child, "ssl"); + source->ssl = ldap_parse_ssl (value); + g_free (value); source->email_addr = get_string_value (child, "emailaddr"); source->binddn = get_string_value (child, "binddn"); source->limit = get_integer_value (child, "limit", 100); diff --git a/addressbook/gui/component/e-address-popup.c b/addressbook/gui/component/e-address-popup.c index 0b5ec97185..9d87fd0fb3 100644 --- a/addressbook/gui/component/e-address-popup.c +++ b/addressbook/gui/component/e-address-popup.c @@ -836,6 +836,9 @@ e_address_popup_set_free_form (EAddressPopup *pop, const gchar *txt) e_address_popup_set_name (pop, name); e_address_popup_set_email (pop, email); + g_free (name); + g_free (email); + return TRUE; } |