GtkWidget *toolbar;
GtkWidget *menubar;
GtkWidget *msg_view;
+
+ gchar *msg_uid;
};
#define MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
ModestMsgViewWindowPrivate *priv;
priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj);
- priv->toolbar = NULL;
- priv->menubar = NULL;
- priv->msg_view = NULL;
+ priv->toolbar = NULL;
+ priv->menubar = NULL;
+ priv->msg_view = NULL;
+ priv->msg_uid = NULL;
}
static void
modest_msg_view_window_finalize (GObject *obj)
-{
+{
+ ModestMsgViewWindowPrivate *priv;
+
+ priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj);
+
+ if (priv->msg_uid) {
+ g_free (priv->msg_uid);
+ msg_uid = NULL;
+ }
+
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
ModestWindow *
-modest_msg_view_window_new (TnyMsg *msg, const gchar *account)
+modest_msg_view_window_new_for_attachment (TnyMsg *msg,
+ const gchar *modest_account_name,
+ const gchar *msg_uid)
{
GObject *obj;
ModestMsgViewWindowPrivate *priv;
priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(obj);
parent_priv = MODEST_WINDOW_GET_PRIVATE(obj);
+ priv->msg_uid = g_strdup (msg_uid);
+
modest_window_set_active_account (MODEST_WINDOW(obj), account);
parent_priv->ui_manager = gtk_ui_manager_new();
/* Init window */
init_window (MODEST_MSG_VIEW_WINDOW(obj), msg);
- restore_settings (MODEST_MSG_VIEW_WINDOW(obj));
+ restore_settings (MODEST_WINDOW(obj));
header = tny_msg_get_header (msg);
if (header)
retval = tny_header_get_uid (header);
g_object_unref (header);
}
+ g_object_unref (msg);
+
return retval;
}
ModestWindow*
modest_msg_view_window_new_with_header_model (TnyMsg *msg,
- const gchar *account,
+ const gchar *modest_account_name,
+ const gchar *msg_uid,
GtkTreeModel *model,
- GtkTreeIter iter)
+ GtkTreeRowReference *row_reference)
{
/* Currently we simply redirect to new constructor. It should store a
reference to the header list model, to enable next/prev message
actions */
g_message ("partially implemented %s", __FUNCTION__);
- return modest_msg_view_window_new (msg, account);
+ return modest_msg_view_window_new_for_attachment (msg, account);
}