* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <glib/gi18n.h>
+#include <string.h>
#include <tny-account-store.h>
-#include "modest-edit-msg-window.h"
-#include "modest-edit-msg-window-ui.h"
-#include "modest-icon-names.h"
-#include "modest-icon-factory.h"
-#include "modest-widget-memory.h"
-#include "modest-mail-operation.h"
-#include "modest-tny-platform-factory.h"
-#include "modest-tny-msg-actions.h"
#include <tny-simple-list.h>
-#include "modest-ui-actions.h"
+#include <modest-conf.h>
+#include <modest-runtime.h>
+#include <modest-tny-msg.h>
+#include <modest-window-priv.h>
+#include <modest-edit-msg-window.h>
+#include <modest-widget-memory.h>
+#include <widgets/modest-edit-msg-window-ui.h>
+#include <modest-account-mgr-helpers.h>
static void modest_edit_msg_window_class_init (ModestEditMsgWindowClass *klass);
static void modest_edit_msg_window_init (ModestEditMsgWindow *obj);
typedef struct _ModestEditMsgWindowPrivate ModestEditMsgWindowPrivate;
struct _ModestEditMsgWindowPrivate {
- ModestWidgetFactory *widget_factory;
- TnyPlatformFactory *fact;
- TnyAccountStore *account_store;
- GtkUIManager *ui_manager;
-
- GtkWidget *toolbar, *menubar;
- GtkWidget *msg_body;
- GtkWidget *from_field, *to_field, *cc_field, *bcc_field,
- *subject_field;
+ GtkWidget *toolbar;
+ GtkWidget *menubar;
+
+ GtkWidget *msg_body;
+ GtkWidget *from_field;
+ GtkWidget *to_field;
+ GtkWidget *cc_field;
+ GtkWidget *bcc_field;
+ GtkWidget *subject_field;
};
#define MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
(GInstanceInitFunc) modest_edit_msg_window_init,
NULL
};
- my_type = g_type_register_static (GTK_TYPE_WINDOW,
+ my_type = g_type_register_static (MODEST_TYPE_WINDOW,
"ModestEditMsgWindow",
&my_info, 0);
}
gobject_class->finalize = modest_edit_msg_window_finalize;
g_type_class_add_private (gobject_class, sizeof(ModestEditMsgWindowPrivate));
-
- /* signal definitions go here, e.g.: */
-/* signals[MY_SIGNAL_1] = */
-/* g_signal_new ("my_signal_1",....); */
-/* signals[MY_SIGNAL_2] = */
-/* g_signal_new ("my_signal_2",....); */
-/* etc. */
}
static void
ModestEditMsgWindowPrivate *priv;
priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(obj);
- priv->fact = modest_tny_platform_factory_get_instance ();
- priv->widget_factory = NULL;
- priv->toolbar = NULL;
- priv->menubar = NULL;
+ priv->toolbar = NULL;
+ priv->menubar = NULL;
+ priv->msg_body = NULL;
+ priv->from_field = NULL;
+ priv->to_field = NULL;
+ priv->cc_field = NULL;
+ priv->bcc_field = NULL;
+ priv->subject_field = NULL;
}
-
-
static void
save_settings (ModestEditMsgWindow *self)
{
- ModestEditMsgWindowPrivate *priv;
- ModestConf *conf;
-
- priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(self);
- conf = modest_tny_platform_factory_get_conf_instance
- (MODEST_TNY_PLATFORM_FACTORY(priv->fact));
-
- modest_widget_memory_save (conf, G_OBJECT(self), "modest-edit-msg-window");
+ modest_widget_memory_save (modest_runtime_get_conf (),
+ G_OBJECT(self), "modest-edit-msg-window");
}
static void
restore_settings (ModestEditMsgWindow *self)
{
- ModestEditMsgWindowPrivate *priv;
- ModestConf *conf;
-
- priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(self);
- conf = modest_tny_platform_factory_get_conf_instance
- (MODEST_TNY_PLATFORM_FACTORY(priv->fact));
- modest_widget_memory_restore (conf, G_OBJECT(self), "modest-edit-msg-window");
+ modest_widget_memory_restore (modest_runtime_get_conf (),
+ G_OBJECT(self), "modest-edit-msg-window");
}
GtkWidget *to_button, *cc_button, *bcc_button;
GtkWidget *header_table;
GtkWidget *main_vbox;
-
ModestEditMsgWindowPrivate *priv;
+ ModestWindowPrivate *parent_priv;
+
priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(obj);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE(obj);
to_button = gtk_button_new_with_label (_("To..."));
cc_button = gtk_button_new_with_label (_("Cc..."));
bcc_button = gtk_button_new_with_label (_("Bcc..."));
- priv->from_field = modest_widget_factory_get_combo_box (priv->widget_factory,
+ priv->from_field = modest_widget_factory_get_combo_box (modest_runtime_get_widget_factory(),
MODEST_COMBO_BOX_TYPE_TRANSPORTS);
priv->to_field = gtk_entry_new_with_max_length (80);
priv->cc_field = gtk_entry_new_with_max_length (80);
gtk_widget_show_all (GTK_WIDGET(main_vbox));
gtk_container_add (GTK_CONTAINER(obj), main_vbox);
}
-
static void
modest_edit_msg_window_finalize (GObject *obj)
{
- ModestEditMsgWindowPrivate *priv;
-
- priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(obj);
-
- g_object_unref (G_OBJECT(priv->widget_factory));
- priv->widget_factory = NULL;
-
G_OBJECT_CLASS(parent_class)->finalize (obj);
-
}
ModestWindow *
-modest_edit_msg_window_new (ModestWidgetFactory *factory,
- TnyAccountStore *account_store,
- ModestEditType type)
+modest_edit_msg_window_new (ModestEditType type)
{
GObject *obj;
ModestEditMsgWindowPrivate *priv;
+ ModestWindowPrivate *parent_priv;
GtkActionGroup *action_group;
GError *error = NULL;
- g_return_val_if_fail (factory, NULL);
g_return_val_if_fail (type < MODEST_EDIT_TYPE_NUM, NULL);
obj = g_object_new(MODEST_TYPE_EDIT_MSG_WINDOW, NULL);
priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE(obj);
-
- priv->widget_factory = g_object_ref (factory);
- priv->account_store = g_object_ref (account_store);
-
- /* ****** */
- priv->ui_manager = gtk_ui_manager_new();
+ parent_priv = MODEST_WINDOW_GET_PRIVATE(obj);
+
+ parent_priv->ui_manager = gtk_ui_manager_new();
action_group = gtk_action_group_new ("ModestEditMsgWindowActions");
/* Add common actions */
modest_edit_msg_toggle_action_entries,
G_N_ELEMENTS (modest_edit_msg_toggle_action_entries),
obj);
- gtk_ui_manager_insert_action_group (priv->ui_manager, action_group, 0);
+ gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 0);
g_object_unref (action_group);
/* Load the UI definition */
- gtk_ui_manager_add_ui_from_file (priv->ui_manager, MODEST_UIDIR "modest-edit-msg-window-ui.xml", &error);
- if (error != NULL) {
- g_warning ("Could not merge modest-edit-msg-window-ui.xml: %s", error->message);
+ gtk_ui_manager_add_ui_from_file (parent_priv->ui_manager, MODEST_UIDIR "modest-edit-msg-window-ui.xml", &error);
+ if (error) {
+ g_printerr ("modest: could not merge modest-edit-msg-window-ui.xml: %s\n", error->message);
g_error_free (error);
error = NULL;
}
/* Add accelerators */
gtk_window_add_accel_group (GTK_WINDOW (obj),
- gtk_ui_manager_get_accel_group (priv->ui_manager));
+ gtk_ui_manager_get_accel_group (parent_priv->ui_manager));
/* Toolbar / Menubar */
- priv->toolbar = gtk_ui_manager_get_widget (priv->ui_manager, "/EditMsgWindowToolBar");
- priv->menubar = gtk_ui_manager_get_widget (priv->ui_manager, "/EditMsgWindowMenuBar");
+ priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
+ priv->menubar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar");
gtk_toolbar_set_tooltips (GTK_TOOLBAR (priv->toolbar), TRUE);
restore_settings (MODEST_EDIT_MSG_WINDOW(obj));
gtk_window_set_title (GTK_WINDOW(obj), "Modest");
- gtk_window_set_icon (GTK_WINDOW(obj),
- modest_icon_factory_get_icon (MODEST_APP_ICON));
+ gtk_window_set_icon_from_file (GTK_WINDOW(obj), MODEST_APP_ICON, NULL);
g_signal_connect (G_OBJECT(obj), "delete-event",
G_CALLBACK(on_delete_event), obj);
GtkTextBuffer *buf;
const gchar *to, *cc, *bcc, *subject;
ModestEditMsgWindowPrivate *priv;
-
+ gchar *body;
+
g_return_if_fail (MODEST_IS_EDIT_MSG_WINDOW (self));
g_return_if_fail (TNY_IS_MSG (msg));
subject = tny_header_get_subject (header);
if (to)
- gtk_entry_set_text (GTK_ENTRY(priv->to_field), to);
+ gtk_entry_set_text (GTK_ENTRY(priv->to_field), to);
if (cc)
- gtk_entry_set_text (GTK_ENTRY(priv->cc_field), cc);
+ gtk_entry_set_text (GTK_ENTRY(priv->cc_field), cc);
if (bcc)
- gtk_entry_set_text (GTK_ENTRY(priv->bcc_field), bcc);
+ gtk_entry_set_text (GTK_ENTRY(priv->bcc_field), bcc);
if (subject)
- gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject);
+ gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject);
+
+ buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW(priv->msg_body));
+ body = modest_tny_msg_get_body (msg, FALSE);
+ if (body)
+ gtk_text_buffer_set_text (buf, body, -1);
+ g_free (body);
- buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW(priv->msg_body));
- gtk_text_buffer_set_text (buf,
- (const gchar *) modest_tny_msg_actions_find_body (msg, FALSE),
- -1);
-
/* TODO: lower priority, select in the From: combo to the
value that comes from msg <- not sure, should it be
allowed? */
/* TODO: set attachments */
}
-ModestWidgetFactory *
-modest_edit_msg_window_get_widget_factory (ModestEditMsgWindow *edit_window)
-{
- ModestEditMsgWindowPrivate *priv;
-
- g_return_val_if_fail (MODEST_IS_EDIT_MSG_WINDOW (edit_window), NULL);
-
- priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE (edit_window);
-
- return g_object_ref (priv->widget_factory);
-}
-
-TnyAccountStore *
-modest_edit_msg_window_get_account_store (ModestEditMsgWindow *edit_window)
-{
- ModestEditMsgWindowPrivate *priv;
-
- g_return_val_if_fail (MODEST_IS_EDIT_MSG_WINDOW (edit_window), NULL);
-
- priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE (edit_window);
-
- return g_object_ref (priv->account_store);
-}
-
MsgData *
modest_edit_msg_window_get_msg_data (ModestEditMsgWindow *edit_window)
{
MsgData *data;
- ModestAccountData *account_data;
GtkTextBuffer *buf;
GtkTextIter b, e;
+ const gchar *account_name;
+ gchar *from_string = NULL;
ModestEditMsgWindowPrivate *priv;
g_return_val_if_fail (MODEST_IS_EDIT_MSG_WINDOW (edit_window), NULL);
priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE (edit_window);
- account_data = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->from_field));
- buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
+ account_name = (gchar*)modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->from_field));
+ if (account_name)
+ from_string = modest_account_mgr_get_from_string (
+ modest_runtime_get_account_mgr(), account_name);
+ if (!from_string) {
+ g_printerr ("modest: cannot get from string\n");
+ return NULL;
+ }
+
+ buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
gtk_text_buffer_get_bounds (buf, &b, &e);
/* don't free these (except from) */
data = g_slice_new0 (MsgData);
- data->from = g_strdup_printf ("%s <%s>", account_data->fullname, account_data->email) ;
+ 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->subject = (gchar*) gtk_entry_get_text (GTK_ENTRY(priv->subject_field));
data->body = gtk_text_buffer_get_text (buf, &b, &e, FALSE);
return data;
projects / modest / blobdiff