X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fgnome%2Fmodest-msg-edit-window.c;h=a4572272984a25face690a50d86a6b44766ccea4;hp=637d17234362b25d6b4c61761ad0446dedb069f8;hb=2b58f5abfb171a82424c14cd9777ea5ee460db61;hpb=556398d85f1803ab8d4871a107bc4b8938c444ae diff --git a/src/gnome/modest-msg-edit-window.c b/src/gnome/modest-msg-edit-window.c index 637d172..a457227 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; + + ModestPairList *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), \ @@ -100,16 +105,37 @@ modest_msg_edit_window_get_type (void) return my_type; } + +static void +save_state (ModestWindow *self) +{ + modest_widget_memory_save (modest_runtime_get_conf (), + G_OBJECT(self), "modest-edit-msg-window"); +} + + +static void +restore_settings (ModestMsgEditWindow *self) +{ + modest_widget_memory_restore (modest_runtime_get_conf (), + G_OBJECT(self), "modest-edit-msg-window"); +} + static void modest_msg_edit_window_class_init (ModestMsgEditWindowClass *klass) { GObjectClass *gobject_class; + ModestWindowClass *modest_window_class; + gobject_class = (GObjectClass*) klass; + modest_window_class = (ModestWindowClass*) klass; parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_msg_edit_window_finalize; g_type_class_add_private (gobject_class, sizeof(ModestMsgEditWindowPrivate)); + + modest_window_class->save_state_func = save_state; } static void @@ -126,25 +152,12 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) priv->cc_field = NULL; priv->bcc_field = NULL; priv->subject_field = NULL; + priv->sent = FALSE; } -static void -save_settings (ModestMsgEditWindow *self) -{ - modest_widget_memory_save (modest_runtime_get_conf (), - G_OBJECT(self), "modest-edit-msg-window"); -} - - -static void -restore_settings (ModestMsgEditWindow *self) -{ - modest_widget_memory_restore (modest_runtime_get_conf (), - G_OBJECT(self), "modest-edit-msg-window"); -} - - - +/** + * @result: A ModestPairList, which must be freed with modest_pair_list_free(). + */ static ModestPairList* get_transports (void) { @@ -153,9 +166,9 @@ get_transports (void) GSList *cursor, *accounts; account_mgr = modest_runtime_get_account_mgr(); - cursor = accounts = modest_account_mgr_account_names (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) { @@ -192,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); @@ -201,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); @@ -250,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); } @@ -258,7 +278,7 @@ modest_msg_edit_window_finalize (GObject *obj) static gboolean on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMsgEditWindow *self) { - save_settings (self); + modest_window_save_state (MODEST_WINDOW(self)); return FALSE; } @@ -294,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); @@ -302,7 +322,8 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg) ModestWindow * -modest_msg_edit_window_new (TnyMsg *msg, const gchar *account) +modest_msg_edit_window_new (TnyMsg *msg, const gchar *account, + gboolean preserve_is_rich) { ModestMsgEditWindow *self; ModestMsgEditWindowPrivate *priv; @@ -373,8 +394,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; @@ -392,17 +412,20 @@ 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))); + + 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; @@ -415,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); } @@ -508,6 +540,23 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) } void +modest_msg_edit_window_attach_file (ModestMsgEditWindow *window) +{ + g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window)); + + g_message ("Attach file operation is not supported"); +} + +void +modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window, + GList *att_list) +{ + g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window)); + + g_message ("Remove attachments operation is not supported"); +} + +void modest_msg_edit_window_show_cc (ModestMsgEditWindow *window, gboolean show) { @@ -556,7 +605,7 @@ modest_msg_edit_window_select_contacts (ModestMsgEditWindow *window) } gboolean -modest_msg_edit_window_check_names (ModestMsgEditWindow *window) +modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to_addressbook) { g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE); @@ -572,3 +621,137 @@ 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; +} + +GtkWidget * +modest_msg_edit_window_get_child_widget (ModestMsgEditWindow *win, + ModestMsgEditWindowWidgetType widget_type) +{ + ModestMsgEditWindowPrivate *priv; + + g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (win), NULL); + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (win); + + switch (widget_type) { + case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_BODY: + return priv->msg_body; + break; + case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_TO: + return priv->to_field; + break; + case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_CC: + return priv->cc_field; + break; + case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_BCC: + return priv->bcc_field; + break; + case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_SUBJECT: + return priv->subject_field; + break; + case MODEST_MSG_EDIT_WINDOW_WIDGET_TYPE_ATTACHMENTS: + return NULL; + break; + default: + return NULL; + } + return NULL; +} + +/* FUNCTIONS NOT IMPLEMENTED YET */ + +void +modest_msg_edit_window_reset_modified (ModestMsgEditWindow *window) +{ + g_message (__FUNCTION__); +} + +void +modest_msg_edit_window_toggle_find_toolbar (ModestMsgEditWindow *window, + gboolean show) +{ + g_message ("NOT IMPLEMENTED %s", __FUNCTION__); +} + +void +modest_msg_edit_window_add_part (ModestMsgEditWindow *window, + TnyMimePart *part) +{ + g_message ("NOT IMPLEMENTED %s", __FUNCTION__); +} + +void +modest_msg_edit_window_redo (ModestMsgEditWindow *window) +{ + g_message ("NOT IMPLEMENTED %s", __FUNCTION__); +} + +void +modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *window) +{ + g_message ("NOT IMPLEMENTED %s", __FUNCTION__); +} + +void +modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window, const gchar *file_uri) +{ + g_message ("NOT IMPLEMENTED %s", __FUNCTION__); +} + +void +modest_msg_edit_window_set_draft (ModestMsgEditWindow *window, + TnyMsg *draft) +{ + g_message ("NOT IMPLEMENTED %s", __FUNCTION__); +} + +gboolean +modest_msg_edit_window_is_modified (ModestMsgEditWindow *window) +{ + g_message ("NOT IMPLEMENTED %s", __FUNCTION__); + return TRUE; +} + +const gchar * +modest_msg_edit_window_get_clipboard_text (ModestMsgEditWindow *win) +{ + g_message ("NOT IMPLEMENTED %s", __FUNCTION__); + return NULL; +} + +gboolean +modest_msg_edit_window_can_redo (ModestMsgEditWindow *window) +{ + g_message ("NOT IMPLEMENTED %s", __FUNCTION__); + return FALSE; +} +gboolean +modest_msg_edit_window_can_undo (ModestMsgEditWindow *window) +{ + g_message ("NOT IMPLEMENTED %s", __FUNCTION__); + return FALSE; +} + +const gchar* +modest_msg_edit_window_get_message_uid (ModestMsgEditWindow *window) +{ + g_message ("NOT IMPLEMENTED %s", __FUNCTION__); + return NULL; +}