From 42a69b14dfe9b4f05bfd24e71f228c1f392e2a39 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 7 Apr 2010 11:31:22 -0400 Subject: Bug 614644 - Email window's title is blank when subject is blank --- mail/e-mail-browser.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'mail') diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c index a6461e2bfe..78dd91b5c2 100644 --- a/mail/e-mail-browser.c +++ b/mail/e-mail-browser.c @@ -244,6 +244,7 @@ mail_browser_message_selected_cb (EMailBrowser *browser, CamelMessageInfo *info; CamelFolder *folder; EMailReader *reader; + const gchar *title; if (uid == NULL) return; @@ -257,9 +258,14 @@ mail_browser_message_selected_cb (EMailBrowser *browser, if (info == NULL) return; - gtk_window_set_title ( - GTK_WINDOW (browser), - camel_message_info_subject (info)); + /* XXX The string here was added after the 2.30.0 release, so + * it's not marked for translation. But it IS marked for + * translation in 2.31. */ + title = camel_message_info_subject (info); + if (title == NULL || *title == '\0') + title = "(No Subject)"; + + gtk_window_set_title (GTK_WINDOW (browser), title); gtk_widget_grab_focus ( GTK_WIDGET (((EMFormatHTML *) html_display)->html)); -- cgit From 3dfd9aa7c4b24f8971382dcc5278714956066ff8 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 21 Mar 2010 00:12:01 +0100 Subject: [win32] Be consistent in disabling the lockdown options. --- mail/e-mail-reader.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mail') diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index ad60195b58..d238d500a9 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -2159,8 +2159,12 @@ mail_reader_update_actions (EMailReader *reader) shell = e_shell_backend_get_shell (shell_backend); shell_settings = e_shell_get_shell_settings (shell); +#ifndef G_OS_WIN32 disable_printing = e_shell_settings_get_boolean ( shell_settings, "disable-printing"); +#else + disable_printing = FALSE; +#endif have_an_account = (state & E_MAIL_READER_HAVE_ACCOUNT); -- cgit From a629756a400180bb1b2764a276aebabdd78770d1 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 8 Apr 2010 12:14:55 +0200 Subject: Bug #612236 - Find-As-You-Type in Folder list stops working --- mail/message-list.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'mail') diff --git a/mail/message-list.c b/mail/message-list.c index 02b7ce9908..ed1236524c 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -2516,12 +2516,6 @@ message_list_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } -static void -message_list_built (MessageList *message_list) -{ - gtk_widget_grab_focus (GTK_WIDGET (message_list)); -} - static void message_list_selectable_update_actions (ESelectable *selectable, EFocusTracker *focus_tracker, @@ -2563,7 +2557,7 @@ message_list_class_init (MessageListClass *class) gtk_object_class = GTK_OBJECT_CLASS (class); gtk_object_class->destroy = message_list_destroy; - class->message_list_built = message_list_built; + class->message_list_built = NULL; /* Inherited from ESelectableInterface */ g_object_class_override_property ( -- cgit From 5df72deec71e159ff4aa4fa9d55695c806a37c29 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 8 Apr 2010 13:56:03 +0200 Subject: Bug #614325 - Shrink/expand To,Cc header images is missing --- mail/e-mail-display.c | 4 +-- mail/em-format-html.c | 68 ++++++++++++++++----------------------------------- 2 files changed, 23 insertions(+), 49 deletions(-) (limited to 'mail') diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index 70789c0d47..86ed222f04 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -239,12 +239,12 @@ mail_display_link_clicked (GtkHTML *html, if (!(flags & EM_FORMAT_HTML_HEADER_CC)) flags |= EM_FORMAT_HTML_HEADER_CC; else - flags |= EM_FORMAT_HTML_HEADER_CC; + flags &= ~EM_FORMAT_HTML_HEADER_CC; } else if (strcmp (uri, "##BCC##") == 0) { if (!(flags & EM_FORMAT_HTML_HEADER_BCC)) flags |= EM_FORMAT_HTML_HEADER_BCC; else - flags |= EM_FORMAT_HTML_HEADER_BCC; + flags &= ~EM_FORMAT_HTML_HEADER_BCC; } priv->formatter->header_wrap_flags = flags; diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 26c6f92ff3..ad47742ba8 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -1480,17 +1480,22 @@ efh_url_requested(GtkHTML *html, const gchar *url, GtkHTMLStream *handle, EMForm } else if (g_ascii_strncasecmp(url, "http:", 5) == 0 || g_ascii_strncasecmp(url, "https:", 6) == 0) { d(printf(" adding job, get %s\n", url)); job = em_format_html_job_new(efh, emfh_gethttp, g_strdup(url)); - } else if (g_ascii_strncasecmp(url, "/", 1) == 0) { + } else if (g_str_has_prefix (url, "file://")) { gchar *data = NULL; gsize length = 0; gboolean status; + gchar *path; + + path = g_filename_from_uri (url, NULL, NULL); + g_return_if_fail (path != NULL); - status = g_file_get_contents (url, &data, &length, NULL); + status = g_file_get_contents (path, &data, &length, NULL); if (status) gtk_html_stream_write (handle, data, length); - gtk_html_stream_close(handle, status? GTK_HTML_STREAM_OK : GTK_HTML_STREAM_ERROR); + gtk_html_stream_close (handle, status ? GTK_HTML_STREAM_OK : GTK_HTML_STREAM_ERROR); g_free (data); + g_free (path); } else { d(printf("HTML Includes reference to unknown uri '%s'\n", url)); gtk_html_stream_close(handle, GTK_HTML_STREAM_ERROR); @@ -2295,74 +2300,43 @@ efh_format_address (EMFormatHTML *efh, GString *out, struct _camel_header_addres /* Let us add a '...' if we have more addresses */ if (limit > 0 && wrap && a && (i>(limit-1))) { - - gchar * evolution_imagesdir = g_filename_to_uri(EVOLUTION_IMAGESDIR, NULL, NULL); + gchar *evolution_imagesdir = g_filename_to_uri (EVOLUTION_IMAGESDIR, NULL, NULL); if (!strcmp (field, _("To"))) { - g_string_append (out, "..."); -#ifdef G_OS_WIN32 - str = g_strdup_printf ("+ "); -#else - str = g_strdup_printf (" ", evolution_imagesdir); -#endif - g_free(evolution_imagesdir); - - return str; + str = g_strdup_printf (" ", evolution_imagesdir); } else if (!strcmp (field, _("Cc"))) { g_string_append (out, "..."); -#ifdef G_OS_WIN32 - str = g_strdup_printf ("+ "); -#else - str = g_strdup_printf (" ", evolution_imagesdir); -#endif - g_free(evolution_imagesdir); - - return str; + str = g_strdup_printf (" ", evolution_imagesdir); } else if (!strcmp (field, _("Bcc"))) { g_string_append (out, "..."); -#ifdef G_OS_WIN32 - str = g_strdup_printf ("+ "); -#else - str = g_strdup_printf (" ", evolution_imagesdir); -#endif - g_free(evolution_imagesdir); + str = g_strdup_printf (" ", evolution_imagesdir); + } + g_free (evolution_imagesdir); + + if (str) return str; - } } } if (limit > 0 && i>(limit)) { - - gchar * evolution_imagesdir = g_filename_to_uri(EVOLUTION_IMAGESDIR, NULL, NULL); + gchar *evolution_imagesdir = g_filename_to_uri (EVOLUTION_IMAGESDIR, NULL, NULL); if (!strcmp (field, _("To"))) { -#ifdef G_OS_WIN32 - str = g_strdup_printf ("- "); -#else - str = g_strdup_printf (" ", evolution_imagesdir); -#endif + str = g_strdup_printf (" ", evolution_imagesdir); } else if (!strcmp (field, _("Cc"))) { -#ifdef G_OS_WIN32 - str = g_strdup_printf ("- "); -#else - str = g_strdup_printf (" ", evolution_imagesdir); -#endif + str = g_strdup_printf (" ", evolution_imagesdir); } else if (!strcmp (field, _("Bcc"))) { -#ifdef G_OS_WIN32 - str = g_strdup_printf ("- "); -#else - str = g_strdup_printf (" ", evolution_imagesdir); -#endif + str = g_strdup_printf (" ", evolution_imagesdir); } - g_free(evolution_imagesdir); + g_free (evolution_imagesdir); } return str; -- cgit