summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroyuki Ikezoe <poincare@ikezoe.net>2006-06-13 19:52:02 +0000
committerAndre Klapper <aklapper@src.gnome.org>2006-06-13 19:52:02 +0000
commit8186cf1fc9cd9ad2dd0f377c13ac60794c33df7f (patch)
treeb293f3fb64164d6cae5f16a81b21639e480b10f0
parentb0818c79dec057671e34dce43bcbbc49b0341203 (diff)
downloadevolution-data-server-8186cf1fc9cd9ad2dd0f377c13ac60794c33df7f.tar.gz
** Fixes 342384 Sanitizing mail list text and memory leak fix.
2006-06-13 Hiroyuki Ikezoe <poincare@ikezoe.net> ** Fixes 342384 * e-name-selector-entry.c: (popup_activate_inline_expand): Sanitizing mail list text and memory leak fix.
-rw-r--r--libedataserverui/ChangeLog6
-rw-r--r--libedataserverui/e-name-selector-entry.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/libedataserverui/ChangeLog b/libedataserverui/ChangeLog
index 41ca984fa..9b4cc1b0a 100644
--- a/libedataserverui/ChangeLog
+++ b/libedataserverui/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-13 Hiroyuki Ikezoe <poincare@ikezoe.net>
+
+ ** Fixes 342384
+ * e-name-selector-entry.c: (popup_activate_inline_expand):
+ Sanitizing mail list text and memory leak fix.
+
2006-05-21 Hiroyuki Ikezoe <poincare@ikezoe.net>
** Fixes bug #342479
diff --git a/libedataserverui/e-name-selector-entry.c b/libedataserverui/e-name-selector-entry.c
index 5670b07d9..8f8ef4606 100644
--- a/libedataserverui/e-name-selector-entry.c
+++ b/libedataserverui/e-name-selector-entry.c
@@ -1805,6 +1805,7 @@ static void
popup_activate_inline_expand (ENameSelectorEntry *name_selector_entry, GtkWidget *menu_item)
{
const char *email_list, *text;
+ gchar *sanitized_text;
EDestination *destination = name_selector_entry->popup_destination;
int position, start, end;
@@ -1818,8 +1819,9 @@ popup_activate_inline_expand (ENameSelectorEntry *name_selector_entry, GtkWidget
gtk_editable_delete_text (GTK_EDITABLE (name_selector_entry), start, end);
- text = sanitize_string (e_destination_get_textrep (destination, FALSE));
- gtk_editable_insert_text (GTK_EDITABLE (name_selector_entry), email_list, -1, &start);
+ sanitized_text = sanitize_string (email_list);
+ gtk_editable_insert_text (GTK_EDITABLE (name_selector_entry), sanitized_text, -1, &start);
+ g_free (sanitized_text);
g_signal_handlers_unblock_by_func (name_selector_entry, user_delete_text, name_selector_entry);