bcc = tny_header_get_bcc (header);
subject = tny_header_get_subject (header);
- /* TODO: the comparison with Invalid is ugly, should be fixed
- in tinymail -> TnyCamelHeader */
- if (strcmp (to, "Invalid"))
+ if (to)
gtk_entry_set_text (GTK_ENTRY(priv->to_field), to);
- if (strcmp (cc, "Invalid"))
+ if (cc)
gtk_entry_set_text (GTK_ENTRY(priv->cc_field), cc);
- if (strcmp (bcc, "Invalid"))
+ if (bcc)
gtk_entry_set_text (GTK_ENTRY(priv->bcc_field), bcc);
if (subject)
gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject);
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <glib/gi18n.h>
#include <string.h>
#include <tny-header.h>
#include <tny-gtk-text-buffer-stream.h>
{
TnyMsg *new_msg = NULL;
gchar *attach_text = NULL;
+ const gchar *subject;
TnyMimePart *body_part = NULL, *attach_part = NULL;
ModestFormatterPrivate *priv;
TnyPlatformFactory *fact;
attach_text = extract_text (self, body);
construct_from_text (body_part, "", priv->content_type);
construct_from_text (attach_part, (const gchar*) attach_text, priv->content_type);
- tny_mime_part_set_filename (attach_part, tny_header_get_subject (header));
+ subject = tny_header_get_subject (header);
+ tny_mime_part_set_filename (attach_part, subject ? subject : _("No subject"));
/* Add parts */
tny_mime_part_add_part (TNY_MIME_PART (new_msg), body_part);
new_header = tny_msg_get_header (new_msg);
reply_to = tny_header_get_replyto (header);
- /* TODO: tinymail returns Invalid and it should return NULL */
- if (strcmp (reply_to, "Invalid"))
+ if (reply_to)
tny_header_set_to (new_header, reply_to);
else
tny_header_set_to (new_header, tny_header_get_from (header));
{
gchar *tmp, *retval;
+ g_return_val_if_fail (text, NULL);
+ g_return_val_if_fail (content_type, NULL);
+ g_return_val_if_fail (from, NULL);
+
tmp = cite (sent_date, from);
retval = g_strdup_printf ("%s%s\n", tmp, text);
g_free (tmp);
g_return_val_if_fail (from, NULL);
g_return_val_if_fail (text, NULL);
g_return_val_if_fail (to, NULL);
- g_return_val_if_fail (subject, NULL);
modest_text_utils_strftime (sent_str, 100, "%c", sent_date);