X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fgnome%2Fmodest-msg-edit-window.c;h=95cf505746086de1f75e68142ac72999798cba2c;hb=6ae65afc6c85e5221c0ab94b5d4d07828e7da1ff;hp=4d773f8e7a62fee4b3c2ab5b3dd827453d2941fe;hpb=5a5108804dcac3687462958bd3ca208694e0e9a4;p=modest

diff --git a/src/gnome/modest-msg-edit-window.c b/src/gnome/modest-msg-edit-window.c
index 4d773f8..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), \
@@ -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);
@@ -373,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;
@@ -392,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;
 
@@ -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);
 }
 
@@ -475,6 +507,23 @@ modest_msg_edit_window_select_color (ModestMsgEditWindow *window)
 }
 
 void
+modest_msg_edit_window_select_file_format (ModestMsgEditWindow *window,
+					   gint file_format)
+{
+	g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
+
+	g_message ("Select file format operation is not supported");
+}
+
+void
+modest_msg_edit_window_select_font (ModestMsgEditWindow *window)
+{
+	g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
+
+	g_message ("Select font operation is not supported");
+}
+
+void
 modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window)
 {
 	g_return_if_fail (MODEST_MSG_EDIT_WINDOW (window));
@@ -491,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)
 {
@@ -506,69 +572,71 @@ modest_msg_edit_window_show_bcc (ModestMsgEditWindow *window,
 
 	g_message ("not implemented yet %s", __FUNCTION__);
 }
+void
+modest_msg_edit_window_undo (ModestMsgEditWindow *window)
+{
+	g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+      
+	g_message ("not implemented yet %s", __FUNCTION__);
+}
+void
+modest_msg_edit_window_toggle_fullscreen (ModestMsgEditWindow *window)
+{
+	g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+      
+	g_message ("not implemented yet %s", __FUNCTION__);
+}
+void
+modest_msg_edit_window_set_priority_flags (ModestMsgEditWindow *window,
+					   TnyHeaderFlags priority_flags)
+{
+	g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
+      
+	g_message ("not implemented yet %s", __FUNCTION__);
+}
 
-static void
-modest_msg_edit_window_set_zoom (ModestWindow *window,
-				 gdouble zoom)
+
+void
+modest_msg_edit_window_select_contacts (ModestMsgEditWindow *window)
 {
 	g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
 
+	g_message ("not implemented yet %s", __FUNCTION__);
 }
 
-static gdouble
-modest_msg_edit_window_get_zoom (ModestWindow *window)
+gboolean
+modest_msg_edit_window_check_names (ModestMsgEditWindow *window)
 {
-	g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), 1.0);
+	g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE);
 
-	return 1.0;
+	g_message ("not implemented yet %s", __FUNCTION__);
+	return TRUE;
 }
 
-static void
-modest_msg_edit_window_zoom_plus (GtkAction *action, ModestWindow *window)
+void
+modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window,
+					gint file_format)
 {
-	ModestWindowPrivate *parent_priv;
-	GtkRadioAction *zoom_radio_action;
-	GSList *group, *node;
-
-	parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
-	zoom_radio_action = GTK_RADIO_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, 
-									 "/MenuBar/ViewMenu/ZoomMenu/Zoom50Menu"));
+	g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
 
-	group = gtk_radio_action_get_group (zoom_radio_action);
+	g_message ("not implemented yet %s", __FUNCTION__);
+}
 
-	if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (group->data))) {
-		hildon_banner_show_information (NULL, NULL, _("mcen_ib_max_zoom_level"));
-		return;
-	}
+gboolean 
+modest_msg_edit_window_get_sent (ModestMsgEditWindow *window)
+{
+	ModestMsgEditWindowPrivate *priv;
 
-	for (node = group; node != NULL; node = g_slist_next (node)) {
-		if ((node->next != NULL) && gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (node->next->data))) {
-			gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (node->data), TRUE);
-			return;
-		}
-	}
+	priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window);
+	return priv->sent;
 }
 
-static void
-modest_msg_edit_window_zoom_minus (GtkAction *action, ModestWindow *window)
+void 
+modest_msg_edit_window_set_sent (ModestMsgEditWindow *window, 
+				 gboolean sent)
 {
-	ModestWindowPrivate *parent_priv;
-	GtkRadioAction *zoom_radio_action;
-	GSList *group, *node;
-
-	parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
-	zoom_radio_action = GTK_RADIO_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, 
-									 "/MenuBar/ViewMenu/ZoomMenu/Zoom50Menu"));
-
-	group = gtk_radio_action_get_group (zoom_radio_action);
-
-	for (node = group; node != NULL; node = g_slist_next (node)) {
-		if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (node->data))) {
-			if (node->next != NULL)
-				gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (node->next->data), TRUE);
-			else
-				hildon_banner_show_information (NULL, NULL, _("mcen_ib_min_zoom_level"));
-			break;
-		}
-	}
+	ModestMsgEditWindowPrivate *priv;
+
+	priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(window);
+	priv->sent = sent;
 }