aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--executive-summary/ChangeLog14
-rw-r--r--executive-summary/component/Makefile.am1
-rw-r--r--executive-summary/component/e-summary-callbacks.c2
-rw-r--r--executive-summary/component/e-summary-url.c6
-rw-r--r--executive-summary/evolution-services/Makefile.am1
-rw-r--r--executive-summary/test-service/Makefile.am3
-rw-r--r--executive-summary/test-service/rdf-summary.c3
7 files changed, 24 insertions, 6 deletions
diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog
index 16c7975314..c32028b771 100644
--- a/executive-summary/ChangeLog
+++ b/executive-summary/ChangeLog
@@ -1,3 +1,17 @@
+2001-05-05 Gediminas Paulauskas <menesis@delfi.lt>
+
+ * component/Makefile.am, evolution-services/Makefile.am: no need of
+ -DEVOLUTION_VERSION
+
+ * component/e-summary-callbacks.c: translate window title.
+
+ * component/e-summary-url.c (e_summary_url_describe): contents are in
+ utf-8, convert to locale.
+
+ * test-service/Makefile.am: define EVOLUTION_LOCALEDIR.
+
+ * test-service/rdf-summary.c: init gettext.
+
2001-05-02 Gediminas Paulauskas <menesis@delfi.lt>
* component/e-summary.c: set default content type of html to
diff --git a/executive-summary/component/Makefile.am b/executive-summary/component/Makefile.am
index 69856b1837..c9e76138c5 100644
--- a/executive-summary/component/Makefile.am
+++ b/executive-summary/component/Makefile.am
@@ -13,7 +13,6 @@ INCLUDES = \
$(EXTRA_GNOME_CFLAGS) \
$(GNOME_VFS_CFLAGS) \
$(GTKHTML_CFLAGS) \
- -DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
diff --git a/executive-summary/component/e-summary-callbacks.c b/executive-summary/component/e-summary-callbacks.c
index 8d1a2eb5fb..216d28c30f 100644
--- a/executive-summary/component/e-summary-callbacks.c
+++ b/executive-summary/component/e-summary-callbacks.c
@@ -123,7 +123,7 @@ embed_service (GtkWidget *widget,
NULL};
char *obj_id;
- obj_id = bonobo_selector_select_id ("Select a service",
+ obj_id = bonobo_selector_select_id (_("Select a service"),
(const char **) required_interfaces);
if (obj_id == NULL)
return;
diff --git a/executive-summary/component/e-summary-url.c b/executive-summary/component/e-summary-url.c
index 4b26f1a85d..202a026406 100644
--- a/executive-summary/component/e-summary-url.c
+++ b/executive-summary/component/e-summary-url.c
@@ -798,12 +798,14 @@ e_summary_url_describe (const char *uri,
ESummary *esummary)
{
ESummaryProtocol protocol;
- char *contents, *description;
+ char *contents, *description, *tmp;
protocol = get_protocol (uri);
contents = parse_uri (uri, protocol, esummary);
+ tmp = e_utf8_to_locale_string (contents);
- description = g_strdup_printf (_(descriptions[protocol]), contents);
+ description = g_strdup_printf (_(descriptions[protocol]), tmp);
+ g_free (tmp);
g_free (contents);
return description;
diff --git a/executive-summary/evolution-services/Makefile.am b/executive-summary/evolution-services/Makefile.am
index 28b9a1c85c..5ffc39d70d 100644
--- a/executive-summary/evolution-services/Makefile.am
+++ b/executive-summary/evolution-services/Makefile.am
@@ -9,7 +9,6 @@ INCLUDES = \
$(EXTRA_GNOME_CFLAGS) \
$(GNOME_VFS_CFLAGS) \
$(GTKHTML_CFLAGS) \
- -DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
diff --git a/executive-summary/test-service/Makefile.am b/executive-summary/test-service/Makefile.am
index 62aaafdc9d..ac22c0ed19 100644
--- a/executive-summary/test-service/Makefile.am
+++ b/executive-summary/test-service/Makefile.am
@@ -5,7 +5,8 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/executive-summary \
$(EXTRA_GNOME_CFLAGS) \
- $(BONOBO_HTML_GNOME_CFLAGS)
+ $(BONOBO_HTML_GNOME_CFLAGS) \
+ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\"
test_service_SOURCES = \
main.c
diff --git a/executive-summary/test-service/rdf-summary.c b/executive-summary/test-service/rdf-summary.c
index 876dae97a4..c7bf12cf0f 100644
--- a/executive-summary/test-service/rdf-summary.c
+++ b/executive-summary/test-service/rdf-summary.c
@@ -954,6 +954,9 @@ main (int argc,
{
CORBA_ORB orb;
+ bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
+ textdomain (PACKAGE);
+
gnome_init_with_popt_table ("RDF-Summary", VERSION,
argc, argv, oaf_popt_options, 0, NULL);
orb = oaf_init (argc, argv);