diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 10 | ||||
| -rw-r--r-- | mail/mail-local.c | 2 | ||||
| -rw-r--r-- | mail/mail-search.c | 14 | ||||
| -rw-r--r-- | mail/mail-send-recv.c | 10 |
4 files changed, 26 insertions, 10 deletions
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); |