diff options
Diffstat (limited to 'addressbook/gui')
8 files changed, 9 insertions, 9 deletions
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index ea74122399..17712134b3 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -346,7 +346,7 @@ destination_folder_handle_drop (EvolutionShellComponentDndDestinationFolder *fol g_print ("in destination_folder_handle_drop (%s)\n", physical_uri); - card_list = e_card_load_cards_from_string (data->bytes._buffer); + card_list = e_card_load_cards_from_string_with_default_charset (data->bytes._buffer, "ISO-8859-1"); expanded_uri = addressbook_expand_uri (physical_uri); diff --git a/addressbook/gui/component/select-names/e-select-names-model.c b/addressbook/gui/component/select-names/e-select-names-model.c index 66d7e96bb4..0f43464507 100644 --- a/addressbook/gui/component/select-names/e-select-names-model.c +++ b/addressbook/gui/component/select-names/e-select-names-model.c @@ -466,7 +466,7 @@ disconnect_destination (ESelectNamesModel *model, EDestination *dest) } gboolean -e_select_names_model_contains (ESelectNamesModel *model, EDestination *dest) +e_select_names_model_contains (ESelectNamesModel *model, const EDestination *dest) { GList *iter; diff --git a/addressbook/gui/component/select-names/e-select-names-model.h b/addressbook/gui/component/select-names/e-select-names-model.h index 9fca3897db..c10b6ccf2a 100644 --- a/addressbook/gui/component/select-names/e-select-names-model.h +++ b/addressbook/gui/component/select-names/e-select-names-model.h @@ -61,7 +61,7 @@ void e_select_names_model_import_destinationv (ESelectNamesModel ECard *e_select_names_model_get_card (ESelectNamesModel *model, gint index); const gchar *e_select_names_model_get_string (ESelectNamesModel *model, gint index); -gboolean e_select_names_model_contains (ESelectNamesModel *model, EDestination *dest); +gboolean e_select_names_model_contains (ESelectNamesModel *model, const EDestination *dest); void e_select_names_model_insert (ESelectNamesModel *model, gint index, EDestination *dest); void e_select_names_model_append (ESelectNamesModel *model, EDestination *dest); diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 843f1ab355..9740902313 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -1205,7 +1205,7 @@ e_contact_editor_init (EContactEditor *e_contact_editor) /* Construct the app */ - bonobo_win = bonobo_window_new ("contact-editor-dialog", "Contact Editor"); + bonobo_win = bonobo_window_new ("contact-editor-dialog", _("Contact Editor")); /* FIXME: The sucking bit */ { diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c index 4842a93bf2..c45f6c2720 100644 --- a/addressbook/gui/contact-editor/test-editor.c +++ b/addressbook/gui/contact-editor/test-editor.c @@ -130,11 +130,11 @@ int main( int argc, char *argv[] ) if (cardstr == NULL) cardstr = TEST_VCARD; - ce = e_contact_editor_new (e_card_new (cardstr), TRUE, NULL, FALSE); + ce = e_contact_editor_new (e_card_new_with_default_charset (cardstr, "ISO-8859-1"), TRUE, NULL, FALSE); gtk_signal_connect (GTK_OBJECT (ce), "editor_closed", GTK_SIGNAL_FUNC (editor_closed_cb), NULL); - ce = e_contact_editor_new (e_card_new (cardstr), TRUE, NULL, FALSE); + ce = e_contact_editor_new (e_card_new_with_default_charset (cardstr, "ISO-8859-1"), TRUE, NULL, FALSE); gtk_signal_connect (GTK_OBJECT (ce), "editor_closed", GTK_SIGNAL_FUNC (editor_closed_cb), NULL); diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c index 49de763015..92919c402e 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -726,7 +726,7 @@ table_drag_data_received_cb (ETable *table, int row, int col, target_type = gdk_atom_name (selection_data->target); if (!strcmp (target_type, VCARD_TYPE)) { - GList *card_list = e_card_load_cards_from_string (selection_data->data); + GList *card_list = e_card_load_cards_from_string_with_default_charset (selection_data->data, "ISO-8859-1"); GList *c; for (c = card_list; c; c = c->next) { diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index beb399e38a..8b2a002247 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -1296,7 +1296,7 @@ selection_received (GtkWidget *invisible, } else { /* XXX make sure selection_data->data = \0 terminated */ - GList *card_list = e_card_load_cards_from_string (selection_data->data); + GList *card_list = e_card_load_cards_from_string_with_default_charset (selection_data->data, "ISO-8859-1"); GList *l; if (!card_list /* it wasn't a vcard list */) diff --git a/addressbook/gui/widgets/e-minicard-control.c b/addressbook/gui/widgets/e-minicard-control.c index 94f762560f..ff3e5489e1 100644 --- a/addressbook/gui/widgets/e-minicard-control.c +++ b/addressbook/gui/widgets/e-minicard-control.c @@ -160,7 +160,7 @@ pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream, return; } - card = e_card_new(vcard); + card = e_card_new_with_default_charset(vcard, "ISO-8859-1"); g_free(vcard); gtk_object_set(GTK_OBJECT(minicard), "card", card, |