X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fgnome%2Fmodest-msg-edit-window.c;h=95cf505746086de1f75e68142ac72999798cba2c;hb=800a2c925d5b3fbbf2937cd2066a4f694f7cd741;hp=052f2c5a015771ffb81d05939065e827c32fdd58;hpb=0edd0f0c6813c947ecab591cd50c857a1eebfafd;p=modest diff --git a/src/gnome/modest-msg-edit-window.c b/src/gnome/modest-msg-edit-window.c index 052f2c5..95cf505 100644 --- a/src/gnome/modest-msg-edit-window.c +++ b/src/gnome/modest-msg-edit-window.c @@ -60,11 +60,16 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *menubar; GtkWidget *msg_body; + + ModestProtoList *from_field_protos; GtkWidget *from_field; + GtkWidget *to_field; GtkWidget *cc_field; GtkWidget *bcc_field; GtkWidget *subject_field; + + gboolean sent; }; #define MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -147,9 +152,12 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) priv->cc_field = NULL; priv->bcc_field = NULL; priv->subject_field = NULL; + priv->sent = FALSE; } - +/** + * @result: A ModestPairList, which must be freed with modest_pair_list_free(). + */ static ModestPairList* get_transports (void) { @@ -160,7 +168,7 @@ get_transports (void) account_mgr = modest_runtime_get_account_mgr(); cursor = accounts = modest_account_mgr_account_names (account_mgr, TRUE); while (cursor) { - gchar *account_name = (gchar*)cursor->data; + gchar *account_name = cursor->data ? g_strdup((gchar*)cursor->data) : NULL; gchar *from_string = modest_account_mgr_get_from_string (account_mgr, account_name); if (!from_string) { @@ -197,7 +205,6 @@ init_window (ModestMsgEditWindow *obj, const gchar* account) GtkWidget *main_vbox; ModestMsgEditWindowPrivate *priv; ModestWindowPrivate *parent_priv; - ModestPairList *protos; priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj); parent_priv = MODEST_WINDOW_GET_PRIVATE(obj); @@ -206,9 +213,12 @@ init_window (ModestMsgEditWindow *obj, const gchar* account) cc_button = gtk_button_new_with_label (_("Cc...")); bcc_button = gtk_button_new_with_label (_("Bcc...")); - protos = get_transports (); - priv->from_field = modest_combo_box_new (protos, g_str_equal); - modest_pair_list_free (protos); + /* Note: This ModestPairList* must exist for as long as the combo + * that uses it, because the ModestComboBox uses the ID opaquely, + * so it can't know how to manage its memory. */ + priv->from_field_protos = get_transports (); + priv->from_field = modest_combo_box_new (priv->from_field_protos, g_str_equal); + if (account) { modest_combo_box_set_active_id (MODEST_COMBO_BOX(priv->from_field), (gpointer)account); @@ -255,6 +265,11 @@ init_window (ModestMsgEditWindow *obj, const gchar* account) static void modest_msg_edit_window_finalize (GObject *obj) { + ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj); + + /* These had to stay alive for as long as the comboboxes that used them: */ + modest_pair_list_free (priv->from_field_protos); + G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -299,7 +314,7 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg) buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW(priv->msg_body)); - body = modest_tny_msg_get_body (msg, FALSE); + body = modest_tny_msg_get_body (msg, FALSE, NULL); if (body) gtk_text_buffer_set_text (buf, body, -1); g_free (body); @@ -378,8 +393,7 @@ MsgData * modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window) { MsgData *data; - GtkTextBuffer *buf; - GtkTextIter b, e; + const gchar *account_name; gchar *from_string = NULL; ModestMsgEditWindowPrivate *priv; @@ -397,17 +411,21 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window) return NULL; } - buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body)); + + + data = g_slice_new0 (MsgData); + data->from = from_string; /* will be freed when data is freed */ + data->to = g_strdup (gtk_entry_get_text (GTK_ENTRY(priv->to_field))); + data->cc = g_strdup ( gtk_entry_get_text (GTK_ENTRY(priv->cc_field))); + data->bcc = g_strdup ( gtk_entry_get_text (GTK_ENTRY(priv->bcc_field))); + data->subject = g_strdup ( gtk_entry_get_text (GTK_ENTRY(priv->subject_field))); + data->msg_id = NULL; + + GtkTextBuffer *buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body)); + GtkTextIter b, e; gtk_text_buffer_get_bounds (buf, &b, &e); + data->plain_body = gtk_text_buffer_get_text (buf, &b, &e, FALSE); /* Returns a copy. */ - /* don't free these (except from) */ - data = g_slice_new0 (MsgData); - data->from = from_string, /* will be freed when data is freed */ - data->to = (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->to_field)); - data->cc = (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->cc_field)); - data->bcc = (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->bcc_field)); - data->subject = (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->subject_field)); - data->plain_body = gtk_text_buffer_get_text (buf, &b, &e, FALSE); /* No rich supported yet, then html body is NULL */ data->html_body = NULL; @@ -420,9 +438,18 @@ modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window, { g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (edit_window)); - g_free (data->from); + if (!data) + return; + + g_free (data->to); + g_free (data->cc); + g_free (data->bcc); + g_free (data->subject); g_free (data->plain_body); g_free (data->html_body); + + /* TODO: Free data->attachments? */ + g_slice_free (MsgData, data); } @@ -594,3 +621,22 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window, g_message ("not implemented yet %s", __FUNCTION__); } + +gboolean +modest_msg_edit_window_get_sent (ModestMsgEditWindow *window) +{ + ModestMsgEditWindowPrivate *priv; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window); + return priv->sent; +} + +void +modest_msg_edit_window_set_sent (ModestMsgEditWindow *window, + gboolean sent) +{ + ModestMsgEditWindowPrivate *priv; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window); + priv->sent = sent; +}