projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* show toolbar when it's enabled in modest-conf
[modest]
/
src
/
maemo
/
modest-msg-edit-window.c
diff --git
a/src/maemo/modest-msg-edit-window.c
b/src/maemo/modest-msg-edit-window.c
index
6ab35cb
..
3ff45da
100644
(file)
--- a/
src/maemo/modest-msg-edit-window.c
+++ b/
src/maemo/modest-msg-edit-window.c
@@
-140,7
+140,6
@@
save_settings (ModestMsgEditWindow *self)
static void
restore_settings (ModestMsgEditWindow *self)
{
static void
restore_settings (ModestMsgEditWindow *self)
{
-
modest_widget_memory_restore (modest_runtime_get_conf(),
G_OBJECT(self), "modest-edit-msg-window");
}
modest_widget_memory_restore (modest_runtime_get_conf(),
G_OBJECT(self), "modest-edit-msg-window");
}
@@
-155,7
+154,7
@@
get_transports (void)
GSList *cursor, *accounts;
account_mgr = modest_runtime_get_account_mgr();
GSList *cursor, *accounts;
account_mgr = modest_runtime_get_account_mgr();
-/* cursor = accounts = modest_account_mgr_account_names (account_mgr, NULL); */
+ cursor = accounts = modest_account_mgr_account_names (account_mgr);
while (cursor) {
gchar *account_name = (gchar*)cursor->data;
gchar *from_string = modest_account_mgr_get_from_string (account_mgr,
while (cursor) {
gchar *account_name = (gchar*)cursor->data;
gchar *from_string = modest_account_mgr_get_from_string (account_mgr,
@@
-186,13
+185,12
@@
init_window (ModestMsgEditWindow *obj)
GtkWidget *main_vbox;
ModestMsgEditWindowPrivate *priv;
ModestPairList *protos;
GtkWidget *main_vbox;
ModestMsgEditWindowPrivate *priv;
ModestPairList *protos;
-
+
priv = MODEST_MSG_EDIT_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 = MODEST_MSG_EDIT_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..."));
-
protos = get_transports ();
priv->from_field = modest_combo_box_new (protos, g_str_equal);
protos = get_transports ();
priv->from_field = modest_combo_box_new (protos, g_str_equal);
@@
-227,6
+225,12
@@
init_window (ModestMsgEditWindow *obj)
gtk_box_pack_start (GTK_BOX(main_vbox), priv->msg_body, TRUE, TRUE, 6);
gtk_widget_show_all (GTK_WIDGET(main_vbox));
gtk_box_pack_start (GTK_BOX(main_vbox), priv->msg_body, TRUE, TRUE, 6);
gtk_widget_show_all (GTK_WIDGET(main_vbox));
+
+ if (!modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_CC, NULL))
+ gtk_widget_hide (priv->cc_field);
+ if (!modest_conf_get_bool(modest_runtime_get_conf(), MODEST_CONF_SHOW_BCC, NULL))
+ gtk_widget_hide (priv->bcc_field);
+
gtk_container_add (GTK_CONTAINER(obj), main_vbox);
}
gtk_container_add (GTK_CONTAINER(obj), main_vbox);
}
@@
-273,6
+277,7
@@
menubar_to_menu (GtkUIManager *ui_manager)
}
}
+#if 0
static void
set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
{
static void
set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
{
@@
-312,7
+317,9
@@
set_msg (ModestMsgEditWindow *self, TnyMsg *msg)
/* TODO: set attachments */
}
/* TODO: set attachments */
}
+#endif
+
ModestWindow*
modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name)
ModestWindow*
modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name)
@@
-346,9
+353,9
@@
modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name)
g_object_unref (action_group);
/* Load the UI definition */
g_object_unref (action_group);
/* Load the UI definition */
- gtk_ui_manager_add_ui_from_file (parent_priv->ui_manager, MODEST_UIDIR "modest-edit-msg-window-ui.xml", &error);
+ gtk_ui_manager_add_ui_from_file (parent_priv->ui_manager, MODEST_UIDIR "modest-msg-edit-window-ui.xml", &error);
if (error != NULL) {
if (error != NULL) {
- g_warning ("Could not merge modest-edit-msg-window-ui.xml: %s", error->message);
+ g_warning ("Could not merge modest-msg-edit-window-ui.xml: %s", error->message);
g_error_free (error);
error = NULL;
}
g_error_free (error);
error = NULL;
}
@@
-362,15
+369,20
@@
modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name)
parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
hildon_window_add_toolbar (HILDON_WINDOW (obj), GTK_TOOLBAR (parent_priv->toolbar));
parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
hildon_window_add_toolbar (HILDON_WINDOW (obj), GTK_TOOLBAR (parent_priv->toolbar));
+ /* should we hide the toolbar? */
+ if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_TOOLBAR, NULL))
+ gtk_widget_hide (parent_priv->toolbar);
+
+
/* Menubar */
parent_priv->menubar = menubar_to_menu (parent_priv->ui_manager);
hildon_window_set_menu (HILDON_WINDOW (obj), GTK_MENU (parent_priv->menubar));
/* Init window */
init_window (MODEST_MSG_EDIT_WINDOW(obj));
/* Menubar */
parent_priv->menubar = menubar_to_menu (parent_priv->ui_manager);
hildon_window_set_menu (HILDON_WINDOW (obj), GTK_MENU (parent_priv->menubar));
/* Init window */
init_window (MODEST_MSG_EDIT_WINDOW(obj));
-
- restore_settings (MODEST_MSG_EDIT_WINDOW(obj));
+ restore_settings (MODEST_MSG_EDIT_WINDOW(obj));
+
gtk_window_set_title (GTK_WINDOW(obj), "Modest");
gtk_window_set_icon_from_file (GTK_WINDOW(obj), MODEST_APP_ICON, NULL);
gtk_window_set_title (GTK_WINDOW(obj), "Modest");
gtk_window_set_icon_from_file (GTK_WINDOW(obj), MODEST_APP_ICON, NULL);
@@
-385,7
+397,7
@@
MsgData *
modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
{
MsgData *data;
modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
{
MsgData *data;
- ModestAccountData *account_data;
+ const gchar *account_name;
GtkTextBuffer *buf;
GtkTextIter b, e;
ModestMsgEditWindowPrivate *priv;
GtkTextBuffer *buf;
GtkTextIter b, e;
ModestMsgEditWindowPrivate *priv;
@@
-394,13
+406,16
@@
modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window)
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (edit_window);
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (edit_window);
- account_data = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->from_field));
+ account_name = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->from_field));
+ g_return_val_if_fail (account_name, NULL);
+
buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->msg_body));
gtk_text_buffer_get_bounds (buf, &b, &e);
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);
/* 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 = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(),
+ account_name);
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->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));