diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 6 | ||||
| -rw-r--r-- | addressbook/contact-editor/e-contact-editor-categories.c | 6 | ||||
| -rw-r--r-- | addressbook/contact-editor/e-contact-editor.c | 4 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor-categories.c | 6 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 4 |
5 files changed, 16 insertions, 10 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 51db4eef14..8ca4a69bcc 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2000-09-02 Lauris kaplinski <lauris@helixcode.com> + + * contact-editor/e-contact-editor-categories.c: e_utf8 wrappers + + * contact-editor/e-contact-editor.c: e_utf8 wrappers + 2000-09-01 Ettore Perazzoli <ettore@helixcode.com> * gui/component/e-ldap-storage.c (load_ldap_data): Updated for the diff --git a/addressbook/contact-editor/e-contact-editor-categories.c b/addressbook/contact-editor/e-contact-editor-categories.c index 9251a86948..118f08a2a3 100644 --- a/addressbook/contact-editor/e-contact-editor-categories.c +++ b/addressbook/contact-editor/e-contact-editor-categories.c @@ -218,7 +218,7 @@ e_contact_editor_categories_entry_change (GtkWidget *entry, EContactEditorCategories *categories) { g_free(categories->categories); - categories->categories = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry))); + categories->categories = e_utf8_gtk_entry_get_text(GTK_ENTRY(entry)); do_parse_categories(categories); } @@ -342,7 +342,7 @@ e_contact_editor_categories_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) switch (arg_id){ case ARG_CATEGORIES: - gtk_entry_set_text(GTK_ENTRY(e_contact_editor_categories->entry), GTK_VALUE_STRING (*arg)); + e_utf8_gtk_entry_set_text(GTK_ENTRY(e_contact_editor_categories->entry), GTK_VALUE_STRING (*arg)); break; } } @@ -407,7 +407,7 @@ e_contact_editor_categories_set_value_at (ETableModel *etc, int col, int row, co } strs[j] = 0; string = g_strjoinv(", ", strs); - gtk_entry_set_text(GTK_ENTRY(categories->entry), string); + e_utf8_gtk_entry_set_text(GTK_ENTRY(categories->entry), string); g_free(string); g_free(strs); } diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c index aa9b1ff9c9..c2d4450a7b 100644 --- a/addressbook/contact-editor/e-contact-editor.c +++ b/addressbook/contact-editor/e-contact-editor.c @@ -359,8 +359,8 @@ file_as_set_style(EContactEditor *editor, int style) if (style == -1) { - string = gtk_entry_get_text(file_as); - strings = g_list_append(strings, g_strdup(string)); + string = e_utf8_gtk_entry_get_text(file_as); + strings = g_list_append(strings, string); } widget = glade_xml_get_widget(editor->gui, "combo-file-as"); diff --git a/addressbook/gui/contact-editor/e-contact-editor-categories.c b/addressbook/gui/contact-editor/e-contact-editor-categories.c index 9251a86948..118f08a2a3 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-categories.c +++ b/addressbook/gui/contact-editor/e-contact-editor-categories.c @@ -218,7 +218,7 @@ e_contact_editor_categories_entry_change (GtkWidget *entry, EContactEditorCategories *categories) { g_free(categories->categories); - categories->categories = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry))); + categories->categories = e_utf8_gtk_entry_get_text(GTK_ENTRY(entry)); do_parse_categories(categories); } @@ -342,7 +342,7 @@ e_contact_editor_categories_set_arg (GtkObject *o, GtkArg *arg, guint arg_id) switch (arg_id){ case ARG_CATEGORIES: - gtk_entry_set_text(GTK_ENTRY(e_contact_editor_categories->entry), GTK_VALUE_STRING (*arg)); + e_utf8_gtk_entry_set_text(GTK_ENTRY(e_contact_editor_categories->entry), GTK_VALUE_STRING (*arg)); break; } } @@ -407,7 +407,7 @@ e_contact_editor_categories_set_value_at (ETableModel *etc, int col, int row, co } strs[j] = 0; string = g_strjoinv(", ", strs); - gtk_entry_set_text(GTK_ENTRY(categories->entry), string); + e_utf8_gtk_entry_set_text(GTK_ENTRY(categories->entry), string); g_free(string); g_free(strs); } diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index aa9b1ff9c9..c2d4450a7b 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -359,8 +359,8 @@ file_as_set_style(EContactEditor *editor, int style) if (style == -1) { - string = gtk_entry_get_text(file_as); - strings = g_list_append(strings, g_strdup(string)); + string = e_utf8_gtk_entry_get_text(file_as); + strings = g_list_append(strings, string); } widget = glade_xml_get_widget(editor->gui, "combo-file-as"); |