From 0a9bafb949e411cbc6f3eeb2d3f1901f1273adf5 Mon Sep 17 00:00:00 2001 From: Gediminas Paulauskas Date: Tue, 8 May 2001 00:26:58 +0000 Subject: Fix for #2253 (search names not translated), mail-search i18n fixes. 2001-05-08 Gediminas Paulauskas * searches.xml: replace title> with _title>. Part of fix to #2253. 2001-05-08 Gediminas Paulauskas * 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 * POTFILES.in: add mail/mail-search.c 2001-05-08 Gediminas Paulauskas * 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 * 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 --- mail/mail-search.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'mail/mail-search.c') 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 #endif -#include #include "mail-search.h" +#include +#include + 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) { -- cgit