aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog10
-rw-r--r--addressbook/backend/ebook/evolution-vcard-importer.c2
-rw-r--r--addressbook/gui/component/addressbook-config.c9
3 files changed, 18 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index dd259abd30..8dac6267cb 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,13 @@
+2001-07-30 Christopher James Lahey <clahey@ximian.com>
+
+ * backend/ebook/evolution-vcard-importer.c: Added #include
+ <e-util/e-path.h>.
+
+2001-07-23 Zbigniew Chyla <cyba@gnome.pl>
+
+ * gui/component/addressbook-config.c (addressbook_source_dialog):
+ Convert translated string to UTF8 before calling put_html.
+
2001-07-30 Jon Trowbridge <trow@ximian.com>
* gui/component/select-names/e-select-names-completion.c
diff --git a/addressbook/backend/ebook/evolution-vcard-importer.c b/addressbook/backend/ebook/evolution-vcard-importer.c
index c74739aa27..c838fbc1d7 100644
--- a/addressbook/backend/ebook/evolution-vcard-importer.c
+++ b/addressbook/backend/ebook/evolution-vcard-importer.c
@@ -12,6 +12,8 @@
#include <importer/evolution-importer.h>
#include <importer/GNOME_Evolution_Importer.h>
+#include <e-util/e-path.h>
+
#define COMPONENT_FACTORY_IID "OAFIID:GNOME_Evolution_Addressbook_VCard_ImporterFactory"
static BonoboGenericFactory *factory = NULL;
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index 77614a89f5..003b29b96a 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -657,6 +657,7 @@ addressbook_source_dialog (AddressbookSource *source, GtkWidget *parent)
GtkWidget *area;
int i;
int row = 0;
+ char *tmp_utf;
if (source)
dialog->dialog = gnome_dialog_new (_("Edit Addressbook"), NULL);
@@ -678,9 +679,11 @@ addressbook_source_dialog (AddressbookSource *source, GtkWidget *parent)
vbox = gtk_vbox_new (FALSE, 0);
dialog->html = html_new (FALSE);
- put_html (GTK_HTML (dialog->html),
- _("Select the kind of addressbook you have, and enter "
- "the relevant information about it."));
+ tmp_utf = e_utf8_from_locale_string (
+ _("Select the kind of addressbook you have, and enter "
+ "the relevant information about it."));
+ put_html (GTK_HTML (dialog->html), tmp_utf);
+ g_free (tmp_utf);
table = gtk_table_new (2, 2, FALSE);