X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=690bb80a554c5584148a39f74668750e1087512d;hb=498f4ad7afce6a5320beadf565a67547381d04e6;hp=5d1d5e20e9d08e75a679910dda716d0c4c3887e1;hpb=8347154ce87266bdbac7b7477fc0a9bbd70c96f3;p=modest

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 5d1d5e2..690bb80 100644
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -794,6 +794,8 @@ init_window (ModestMsgEditWindow *obj)
 	hildon_button_set_image (HILDON_BUTTON (priv->add_attachment_button), attachment_icon);
 	gtk_box_pack_start (GTK_BOX (subject_box), priv->add_attachment_button, FALSE, FALSE, 0);
 	priv->attachments_view = modest_attachments_view_new (NULL);
+	modest_attachments_view_set_style (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+					   MODEST_ATTACHMENTS_VIEW_STYLE_NO_FOCUS);
 	
 	priv->header_box = gtk_vbox_new (FALSE, 0);
 	
@@ -1369,6 +1371,10 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
 	/* font_size */
 	tool_item = GTK_WIDGET (gtk_menu_tool_button_new (NULL, NULL));
 	priv->size_tool_button_label = gtk_label_new (NULL);
+	hildon_helper_set_logical_color (GTK_WIDGET (priv->size_tool_button_label), GTK_RC_TEXT,
+					 GTK_STATE_INSENSITIVE, "SecondaryTextColor");
+	hildon_helper_set_logical_color (GTK_WIDGET (priv->size_tool_button_label), GTK_RC_FG,
+					 GTK_STATE_INSENSITIVE, "SecondaryTextColor");
 	snprintf(size_text, sizeof(size_text), "%d", wp_font_size[DEFAULT_FONT_SIZE]);
 	markup = g_strconcat ("<span font_family='", DEFAULT_SIZE_BUTTON_FONT_FAMILY, "'>",
 			      size_text,"</span>", NULL);
@@ -1411,6 +1417,10 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window)
 	/* font face */
 	tool_item = GTK_WIDGET (gtk_menu_tool_button_new (NULL, NULL));
 	priv->font_tool_button_label = gtk_label_new (NULL);
+	hildon_helper_set_logical_color (GTK_WIDGET (priv->font_tool_button_label), GTK_RC_TEXT,
+					 GTK_STATE_INSENSITIVE, "SecondaryTextColor");
+	hildon_helper_set_logical_color (GTK_WIDGET (priv->font_tool_button_label), GTK_RC_FG,
+					 GTK_STATE_INSENSITIVE, "SecondaryTextColor");
 	markup = g_strconcat ("<span font_family='", wp_get_font_name(DEFAULT_FONT), "'>Tt</span>", NULL);
 	gtk_label_set_markup (GTK_LABEL (priv->font_tool_button_label), markup);
 	g_free(markup);
@@ -3662,7 +3672,7 @@ from_field_changed (HildonPickerButton *button,
 	mgr = modest_runtime_get_account_mgr ();
 	signature = modest_account_mgr_get_signature (mgr, priv->last_from_account, &has_old_signature);
 	if (has_old_signature) {
-		full_signature = g_strconcat ("--\n", signature, NULL);
+		full_signature = g_strconcat ("\n--\n", signature, NULL);
 		if (gtk_text_iter_forward_search (&iter, full_signature, 0, &match_start, &match_end, NULL)) {
 			gtk_text_buffer_delete (priv->text_buffer, &match_start, &match_end);
 			iter = match_start;
@@ -3677,7 +3687,7 @@ from_field_changed (HildonPickerButton *button,
 	priv->last_from_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->from_field));
 	signature = modest_account_mgr_get_signature (mgr, priv->last_from_account, &has_new_signature);
 	if (has_new_signature) {
-		full_signature = g_strconcat ("--\n", signature, NULL);
+		full_signature = g_strconcat ("\n--\n", signature, NULL);
 		gtk_text_buffer_insert (priv->text_buffer, &iter, full_signature, -1);
 		g_free (full_signature);
 	}