removed head_space option, and changed the margin of TextView.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@3 ee746299-78ed-0310-b773-934348b2243d

3 files changed, 2 insertions, 26 deletions

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 51c2e6ba..a951fea8 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -138,7 +138,6 @@ static struct Message {
 	GtkWidget *chkbtn_disphdr;
 	GtkWidget *spinbtn_linespc;
 	GtkObject *spinbtn_linespc_adj;
-	GtkWidget *chkbtn_headspc;
 
 	GtkWidget *chkbtn_smoothscroll;
 	GtkWidget *spinbtn_scrollstep;
@@ -539,9 +538,6 @@ static PrefParam param[] = {
 	{"line_space", "2", &prefs_common.line_space, P_INT,
 	 &message.spinbtn_linespc,
 	 prefs_set_data_from_spinbtn, prefs_set_spinbtn},
-	{"enable_head_space", "FALSE", &prefs_common.head_space, P_BOOL,
-	 &message.chkbtn_headspc,
-	 prefs_set_data_from_toggle, prefs_set_toggle},
 
 	{"enable_smooth_scroll", "FALSE",
 	 &prefs_common.enable_smooth_scroll, P_BOOL,
@@ -1678,7 +1674,6 @@ static void prefs_message_create(void)
 	GtkWidget *label_linespc;
 	GtkObject *spinbtn_linespc_adj;
 	GtkWidget *spinbtn_linespc;
-	GtkWidget *chkbtn_headspc;
 
 	GtkWidget *frame_scr;
 	GtkWidget *vbox_scr;
@@ -1772,8 +1767,6 @@ static void prefs_message_create(void)
 	gtk_box_pack_start (GTK_BOX (hbox_linespc), label_linespc,
 			    FALSE, FALSE, 0);
 
-	PACK_CHECK_BUTTON(hbox1, chkbtn_headspc, _("Leave space on head"));
-
 	PACK_FRAME(vbox1, frame_scr, _("Scroll"));
 
 	vbox_scr = gtk_vbox_new (FALSE, 0);
@@ -1822,7 +1815,6 @@ static void prefs_message_create(void)
 	message.chkbtn_disphdrpane = chkbtn_disphdrpane;
 	message.chkbtn_disphdr     = chkbtn_disphdr;
 	message.spinbtn_linespc    = spinbtn_linespc;
-	message.chkbtn_headspc     = chkbtn_headspc;
 
 	message.chkbtn_smoothscroll    = chkbtn_smoothscroll;
 	message.spinbtn_scrollstep     = spinbtn_scrollstep;
diff --git a/src/prefs_common.h b/src/prefs_common.h
index 4b1c6101..863b3076 100644
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -169,7 +169,6 @@ struct _PrefsCommon
 	gboolean conv_mb_alnum;
 	gboolean display_header_pane;
 	gboolean display_header;
-	gboolean head_space;
 	gint line_space;
 	gboolean enable_smooth_scroll;
 	gint scroll_step;
diff --git a/src/textview.c b/src/textview.c
index 69fe7ca8..227d53dd 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -197,22 +197,13 @@ TextView *textview_create(void)
 	gtk_widget_show(text);
 	gtk_text_view_set_editable(GTK_TEXT_VIEW(text), FALSE);
 	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD);
-	gtk_text_view_set_left_margin(GTK_TEXT_VIEW(text), 4);
-	gtk_text_view_set_right_margin(GTK_TEXT_VIEW(text), 4);
+	gtk_text_view_set_left_margin(GTK_TEXT_VIEW(text), 6);
+	gtk_text_view_set_right_margin(GTK_TEXT_VIEW(text), 6);
 
 	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
 	clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
 	gtk_text_buffer_add_selection_clipboard(buffer, clipboard);
 
-#if 0
-	if (prefs_common.normalfont)
-		font_desc = pango_font_description_from_string
-			(prefs_common.normalfont);
-	if (font_desc)
-		gtk_widget_modify_font(text, font_desc);
-	pango_font_description_free(font_desc);
-#endif
-
 	gtk_widget_ref(scrolledwin);
 
 	gtk_container_add(GTK_CONTAINER(scrolledwin), text);
@@ -1066,12 +1057,6 @@ void textview_set_font(TextView *textview, const gchar *codeset)
 
 	gtk_text_view_set_pixels_above_lines(text, prefs_common.line_space / 2);
 	gtk_text_view_set_pixels_below_lines(text, prefs_common.line_space / 2);
-#if 0
-	if (prefs_common.head_space)
-		gtk_text_view_set_left_margin(text, 6);
-	else
-		gtk_text_view_set_left_margin(text, 0);
-#endif
 }
 
 void textview_set_position(TextView *textview, gint pos)