TnyMsg *draft_msg;
TnyMsg *outbox_msg;
+ gchar *msg_uid;
+
gboolean sent;
};
priv->draft_msg = NULL;
priv->outbox_msg = NULL;
+ priv->msg_uid = NULL;
priv->clipboard_change_handler_id = 0;
priv->sent = FALSE;
g_object_unref (priv->outbox_msg);
priv->outbox_msg = NULL;
}
+ if (priv->msg_uid != NULL) {
+ g_free (priv->msg_uid);
+ priv->msg_uid = NULL;
+ }
/* This had to stay alive for as long as the combobox that used it: */
modest_pair_list_free (priv->from_field_protos);
text_buffer_can_undo (priv->text_buffer, FALSE, self);
text_buffer_can_redo (priv->text_buffer, FALSE, self);
+ if (priv->msg_uid) {
+ g_free (priv->msg_uid);
+ priv->msg_uid = NULL;
+ }
+
/* we should set a reference to the incoming message if it is a draft */
msg_folder = tny_msg_get_folder (msg);
if (msg_folder) {
priv->draft_msg = g_object_ref(msg);
if (type == TNY_FOLDER_TYPE_OUTBOX)
priv->outbox_msg = g_object_ref(msg);
+ priv->msg_uid = modest_tny_folder_get_header_unique_id (header);
}
g_object_unref (msg_folder);
}
header = tny_msg_get_header (draft);
if (TNY_IS_HEADER (header))
modest_window_mgr_register_header (mgr, header);
+ if (priv->msg_uid) {
+ g_free (priv->msg_uid);
+ priv->msg_uid = NULL;
+ }
+ priv->msg_uid = modest_tny_folder_get_header_unique_id (header);
}
priv->draft_msg = draft;
gtk_widget_show_all (priv->attachments_caption);
gtk_text_buffer_set_modified (priv->text_buffer, TRUE);
}
+
+const gchar*
+modest_msg_edit_window_get_message_uid (ModestMsgEditWindow *window)
+{
+ ModestMsgEditWindowPrivate *priv;
+
+ g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), NULL);
+ priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
+
+ return priv->msg_uid;
+}
*/
void modest_msg_edit_window_set_draft (ModestMsgEditWindow *window,
TnyMsg *draft);
+/**
+ * modest_msg_edit_window_get_message_uid:
+ * @msg: an #ModestMsgEditWindow instance
+ *
+ * gets the unique identifier for the message in this msg editor.
+ * This is the identifier of the draft or outbox message the editor was
+ * opened from. If it's a new message, then it returns %NULL
+ *
+ * Returns: the id of the #TnyMsg being shown, or NULL in case of error
+ */
+const gchar* modest_msg_edit_window_get_message_uid (ModestMsgEditWindow *window);
G_END_DECLS
{
const gchar *msg_uid;
- if (!MODEST_IS_MSG_VIEW_WINDOW (win))
+ if ((!MODEST_IS_MSG_EDIT_WINDOW (win)) && (!MODEST_IS_MSG_VIEW_WINDOW (win)))
return 1;
/* Get message uid from msg window */
- msg_uid = modest_msg_view_window_get_message_uid (MODEST_MSG_VIEW_WINDOW (win));
+ if (MODEST_IS_MSG_EDIT_WINDOW (win)) {
+ msg_uid = modest_msg_edit_window_get_message_uid (MODEST_MSG_EDIT_WINDOW (win));
+ } else {
+ msg_uid = modest_msg_view_window_get_message_uid (MODEST_MSG_VIEW_WINDOW (win));
+ }
if (msg_uid && uid &&!strcmp (msg_uid, uid))
return 0;
if (item) {
has_window = TRUE;
if (win) {
- if (!MODEST_IS_MSG_VIEW_WINDOW(item->data))
+ if ((!MODEST_IS_MSG_VIEW_WINDOW(item->data)) &&
+ (!MODEST_IS_MSG_EDIT_WINDOW (item->data)))
g_debug ("not a valid window!");
else {
g_debug ("found a window");
remove_uid (priv->preregistered_uids,
modest_msg_view_window_get_message_uid
(MODEST_MSG_VIEW_WINDOW (window)));
+ } else if (MODEST_IS_MSG_EDIT_WINDOW(window)) {
+ const gchar *uid = modest_msg_edit_window_get_message_uid
+ (MODEST_MSG_EDIT_WINDOW (window));
+
+ g_debug ("registering window for %s", uid);
+
+ if (!has_uid (priv->preregistered_uids, uid))
+ g_debug ("weird: no uid for window (%s)", uid);
+
+ priv->preregistered_uids =
+ remove_uid (priv->preregistered_uids,
+ modest_msg_edit_window_get_message_uid
+ (MODEST_MSG_EDIT_WINDOW (window)));
}
/* Add to list. Keep a reference to the window */