Fix for #2253 (search names not translated), mail-search i18n fixes.

2001-05-08  Gediminas Paulauskas <menesis@delfi.lt>

	* searches.xml: replace title> with _title>. Part of fix to #2253.

2001-05-08  Gediminas Paulauskas <menesis@delfi.lt>

	* mail-search.c: convert search entry to utf8.

	* mail-local.c: d() debugging message.

	* mail-send-recv.c: replace " ..." with "..."

	* Makefile.am: removed EVOLUTION_VERSION.

2001-05-07  Gediminas Paulauskas <menesis@delfi.lt>

	* POTFILES.in: add mail/mail-search.c

2001-05-08  Gediminas Paulauskas <menesis@delfi.lt>

	* misc/e-search-bar.c (add_dropdown), (set_option): first try to
	translate, then if not suceeded -- convert from utf8. This handles
	cases when menuitem needs to be translated (it is passed as N_()), or is
	utf8 search title. However you cannot have a search like "Folders" -- it
	is translated. Part of fix for #2253.

	* misc/e-filter-bar.c: d() debugging strings. Use E_FILTERBAR_ADVANCED
	macro instead of own "Advanced ..." for consistency.

2001-05-08  Gediminas Paulauskas <menesis@delfi.lt>

	* filter-rule.c (xml_decode): allow "_title" in user rules. translate
	them and encode to utf8.
	(get_rule_part_widget): do not call gettext on part->title. It is always
	translated already.

svn path=/trunk/; revision=9706

11 files changed, 88 insertions, 23 deletions

diff --git a/default_user/ChangeLog b/default_user/ChangeLog
index a8d60417a2..6b0f40e582 100644
--- a/default_user/ChangeLog
+++ b/default_user/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-08  Gediminas Paulauskas <menesis@delfi.lt>
+
+	* searches.xml: replace title> with _title>. Part of fix to #2253.
+
 2001-03-22  Dan Winship  <danw@ximian.com>
 
 	* local/Inbox/mbox: Change the From address to "The Evolution
diff --git a/filter/ChangeLog b/filter/ChangeLog
index e28f8821ba..3783fcc2b5 100644
--- a/filter/ChangeLog
+++ b/filter/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-08  Gediminas Paulauskas <menesis@delfi.lt>
+
+	* filter-rule.c (xml_decode): allow "_title" in user rules. translate
+	them and encode to utf8.
+	(get_rule_part_widget): do not call gettext on part->title. It is always
+	translated already.
+
 2001-04-26  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* rule-editor.c (rule_edit): Set the default size of the dialog to
diff --git a/mail/ChangeLog b/mail/ChangeLog
index f579b252de..6d8c70eed5 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,13 @@
+2001-05-08  Gediminas Paulauskas <menesis@delfi.lt>
+
+	* mail-search.c: convert search entry to utf8.
+	
+	* mail-local.c: d() debugging message.
+
+	* mail-send-recv.c: replace " ..." with "..."
+
+	* Makefile.am: removed EVOLUTION_VERSION.
+
 2001-05-07  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* mail-account-gui.c: s/HAVE_NSS/HAVE_SSL for the SSL checkbox
diff --git a/mail/mail-local.c b/mail/mail-local.c
index d8448a1154..597a17b8e1 100644
--- a/mail/mail-local.c
+++ b/mail/mail-local.c
@@ -504,7 +504,7 @@ static char *register_folder_desc(struct _mail_msg *mm, int done)
 {
 	struct _register_msg *m = (struct _register_msg *)mm;
 
-	printf("returning description for %s\n", m->local_folder->uri);
+	d(printf("returning description for %s\n", m->local_folder->uri));
 
 	return g_strdup_printf(_("Opening '%s'"), m->local_folder->uri);
 }
diff --git a/mail/mail-search.c b/mail/mail-search.c
index 4de003afe0..9611c34887 100644
--- a/mail/mail-search.c
+++ b/mail/mail-search.c
@@ -29,9 +29,11 @@
 #include <config.h>
 #endif
 
-#include <gtkhtml/gtkhtml-search.h>
 #include "mail-search.h"
 
+#include <gal/widgets/e-unicode.h>
+#include <gtkhtml/gtkhtml-search.h>
+
 static GtkObjectClass *parent_class;
 
 static void
@@ -40,7 +42,7 @@ mail_search_destroy (GtkObject *obj)
 	MailSearch *ms = MAIL_SEARCH (obj);
 
 	g_free (ms->last_search);
-	gtk_object_unref (ms->mail);
+	gtk_object_unref (GTK_OBJECT (ms->mail));
 }
 
 static void
@@ -101,8 +103,12 @@ dialog_clicked_cb (GtkWidget *w, gint button_number, MailSearch *ms)
 {
 	if (button_number == 0) {        /* "Search" */
 
-		gchar *search_text = gtk_editable_get_chars (GTK_EDITABLE (ms->entry), 0, -1);
-		g_strstrip (search_text);
+		char *search_text, *tmp;
+		
+		tmp = gtk_editable_get_chars (GTK_EDITABLE (ms->entry), 0, -1);
+		g_strstrip (tmp);
+		search_text = e_utf8_from_gtk_string ((GtkWidget *) ms->entry, tmp);
+		g_free (tmp);
 
 		if (search_text && *search_text) {
 		
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 374bc846c2..ded42cb6ff 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -135,7 +135,7 @@ receive_cancel(GtkButton *button, struct _send_info *info)
 	if (info->state == SEND_ACTIVE) {
 		camel_operation_cancel(info->cancel);
 		if (info->bar)
-			gtk_progress_set_format_string((GtkProgress *)info->bar, _("Cancelling ..."));
+			gtk_progress_set_format_string((GtkProgress *)info->bar, _("Cancelling..."));
 		info->state = SEND_CANCELLED;
 	}
 	if (info->stop)
@@ -282,9 +282,9 @@ static struct _send_data *build_dialogue(GSList *sources, CamelFolder *outbox, c
 		gtk_progress_set_show_text((GtkProgress *)bar, TRUE);
 
 		if (info->type == SEND_UPDATE) {
-			gtk_progress_set_format_string((GtkProgress *)bar, _("Updating ..."));
+			gtk_progress_set_format_string((GtkProgress *)bar, _("Updating..."));
 		} else {
-			gtk_progress_set_format_string((GtkProgress *)bar, _("Waiting ..."));
+			gtk_progress_set_format_string((GtkProgress *)bar, _("Waiting..."));
 		}
 
 		gtk_table_attach(table, (GtkWidget *)label, 0, 1, row, row+1, GTK_EXPAND|GTK_FILL, 0, 3, 1);
@@ -330,7 +330,7 @@ static struct _send_data *build_dialogue(GSList *sources, CamelFolder *outbox, c
 		bar = (GtkProgressBar *)gtk_progress_bar_new();
 		stop = (GtkButton *)gnome_stock_button(GNOME_STOCK_BUTTON_CANCEL);
 		
-		gtk_progress_set_format_string((GtkProgress *)bar, _("Waiting ..."));
+		gtk_progress_set_format_string((GtkProgress *)bar, _("Waiting..."));
 		gtk_progress_set_show_text((GtkProgress *)bar, TRUE);
 		
 		gtk_table_attach(table, (GtkWidget *)label, 0, 1, row, row+1, GTK_EXPAND|GTK_FILL, 0, 3, 1);
@@ -527,7 +527,7 @@ receive_get_folder(CamelFilterDriver *d, const char *uri, void *data, CamelExcep
 	if (!folder)
 		return NULL;
 
-	/* we recheck that the folder hasn't snuck in while we were loading it ... */
+	/* we recheck that the folder hasn't snuck in while we were loading it... */
 	/* and we assume the newer one is the same, but unref the old one anyway */
 	g_mutex_lock(info->data->lock);
 	
diff --git a/po/ChangeLog b/po/ChangeLog
index 9acc124e29..75de5f64fb 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-07  Gediminas Paulauskas <menesis@delfi.lt>
+
+	* POTFILES.in: add mail/mail-search.c
+
 2001-05-05  Gediminas Paulauskas <menesis@delfi.lt>
 	
 	* lt.po: Updated Lithuanian translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 81d6a8b20c..d4c35513fc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -185,6 +185,7 @@ mail/mail-local.c
 mail/mail-mt.c
 mail/mail-ops.c
 mail/mail-search-dialogue.c
+mail/mail-search.c
 mail/mail-send-recv.c
 mail/mail-summary.c
 mail/mail-tools.c
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index 53ede2ff84..f80719b0cc 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,21 @@
+2001-05-08  Gediminas Paulauskas <menesis@delfi.lt>
+
+	* misc/e-search-bar.c (add_dropdown), (set_option): first try to
+	translate, then if not suceeded -- convert from utf8. This handles
+	cases when menuitem needs to be translated (it is passed as N_()), or is
+	utf8 search title. However you cannot have a search like "Folders" -- it
+	is translated. Part of fix for #2253.
+	
+	* misc/e-filter-bar.c: d() debugging strings. Use E_FILTERBAR_ADVANCED
+	macro instead of own "Advanced ..." for consistency.
+
+2001-05-07  Gediminas Paulauskas <menesis@delfi.lt>
+	
+	* menus/gal-view-menus.c (build_menus): convert label to locale
+	encoding. Still displays truncated strings.
+	
+	* menus/Makefile.am: removed -DEVOLUTION_VERSION.
+
 2001-04-21  Gediminas Paulauskas <menesis@delfi.lt>
 
 	* menus/gal-view-menus.c: bonobo_ui_node_set_attr expects unstranslated
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index 24bbba4d57..2a84912d62 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -37,6 +37,8 @@
 #include <gal/widgets/e-unicode.h>
 #include <gal/widgets/e-gui-utils.h>
 
+#define d(x)
+
 
 enum {
 	LAST_SIGNAL
@@ -137,7 +139,7 @@ menubar_activated (ESearchBar *esb, int id, void *data)
 
 	switch(id) {
 	case E_FILTERBAR_RESET_ID:
-		printf("Reset menu\n");
+		d(printf("Reset menu\n"));
 		efb->current_query = NULL;
 		gtk_object_set((GtkObject *)esb, "option_choice", efb->option_base, NULL);
 		gtk_object_set((GtkObject *)esb, "text", NULL, NULL);
@@ -185,14 +187,14 @@ menubar_activated (ESearchBar *esb, int id, void *data)
 			gtk_widget_show((GtkWidget *)gd);
 		}
 
-		printf("Save menu\n");
+		d(printf("Save menu\n"));
 		break;
 	default:
 		if (id >= efb->menu_base && id < efb->menu_base + efb->menu_rules->len) {
 			GString *out = g_string_new("");
-			printf("Selected rule: %s\n", ((FilterRule *)efb->menu_rules->pdata[id - efb->menu_base])->name);
+			d(printf("Selected rule: %s\n", ((FilterRule *)efb->menu_rules->pdata[id - efb->menu_base])->name));
 			filter_rule_build_code(efb->menu_rules->pdata[id - efb->menu_base], out);
-			printf("query: '%s'\n", out->str);
+			d(printf("query: '%s'\n", out->str));
 			g_string_free(out, 1);
 
 			efb->current_query = (FilterRule *)efb->menu_rules->pdata[id - efb->menu_base];
@@ -216,11 +218,11 @@ option_changed (ESearchBar *esb, void *data)
 	int id = esb->option_choice;
 	char *query;
 
-	printf("option changed, id = %d\n", id);
+	d(printf("option changed, id = %d\n", id));
 
 	switch(id) {
 	case E_FILTERBAR_ADVANCED_ID: {
-		printf("Advanced search!\n");
+		d(printf("Advanced search!\n"));
 
 		if (!efb->save_dialogue && !efb->setquery) {
 			GtkWidget *w;
@@ -313,9 +315,8 @@ static GArray *build_items(ESearchBar *esb, ESearchBarItem *items, int type, int
 
 	/* always add on the advanced menu */
 	if (type == 1) {
-		item.id = E_FILTERBAR_ADVANCED_ID;
-		item.text = _("Advanced ...");
-		g_array_append_vals(menu, &item, 1);
+		ESearchBarItem advanced_item = E_FILTERBAR_ADVANCED;
+		g_array_append_vals(menu, &advanced_item, 1);
 	}
 
 	item.id = -1;
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index 3be08f4063..c668082260 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -118,8 +118,15 @@ static void add_dropdown(ESearchBar *esb, ESearchBarItem *items)
 	GtkWidget *menu = esb->dropdown_menu;
 	GtkWidget *item;
 
-	if (items->text)
-		item = gtk_menu_item_new_with_label (_(items->text));
+	if (items->text) {
+		char *str;
+		str = _(items->text);
+		if (str == items->text) {
+			/* It may be english string, or utf8 rule name */
+			item = e_utf8_gtk_menu_item_new_with_label (menu, str);
+		} else
+			item = gtk_menu_item_new_with_label (str);
+	}
 	else
 		item = gtk_menu_item_new();
 
@@ -189,8 +196,15 @@ set_option(ESearchBar *esb, ESearchBarItem *items)
 	for (i = 0; items[i].id != -1; i++) {
 		GtkWidget *item;
 
-		if (items[i].text)
-			item = gtk_menu_item_new_with_label (_(items[i].text));
+		if (items[i].text) {
+			char *str;
+			str = _(items[i].text);
+			if (str == items[i].text) {
+				/* It may be english string, or utf8 rule name */
+				item = e_utf8_gtk_menu_item_new_with_label (menu, str);
+			} else
+				item = gtk_menu_item_new_with_label (str);
+		}
 		else
 			item = gtk_menu_item_new();