commit be7daa4605a378f831d57a4eea03306ca05de58c
parent 92c409206795e136836314d09819b171a4e25e60
Author: Paul Mangan <paul@claws-mail.org>
Date: Sat, 31 Jan 2009 07:58:58 +0000
2009-01-31 [paul] 3.7.0cvs47
* src/prefs_compose_writing.c
* src/prefs_message.c
move 'quote_chars' pref to where it should be
Diffstat:
5 files changed, 49 insertions(+), 44 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-31 [paul] 3.7.0cvs47
+
+ * src/prefs_compose_writing.c
+ * src/prefs_message.c
+ move 'quote_chars' pref to where it should be
+
2009-01-30 [paul] 3.7.0cvs46
* src/summaryview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3708,3 +3708,4 @@
( cvs diff -u -r 1.94.2.196 -r 1.94.2.197 src/messageview.c; ) > 3.7.0cvs44.patchset
( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 tools/filter_conv_new.pl; ) > 3.7.0cvs45.patchset
( cvs diff -u -r 1.395.2.404 -r 1.395.2.405 src/summaryview.c; ) > 3.7.0cvs46.patchset
+( cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/prefs_compose_writing.c; cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/prefs_message.c; ) > 3.7.0cvs47.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=46
+EXTRA_VERSION=47
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/prefs_compose_writing.c b/src/prefs_compose_writing.c
@@ -64,7 +64,6 @@ typedef struct _WritingPage
GtkWidget *checkbtn_autosave;
GtkWidget *spinbtn_autosave_length;
GtkWidget *optmenu_dnd_insert_or_attach;
- GtkWidget *entry_quote_chars;
} WritingPage;
static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *window,
@@ -106,13 +105,6 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
GtkListStore *menu;
GtkTreeIter iter;
- GtkWidget *frame_quote;
- GtkWidget *hbox1;
- GtkWidget *hbox2;
- GtkWidget *vbox_quote;
- GtkWidget *entry_quote_chars;
- GtkWidget *label_quote_chars;
-
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
@@ -213,33 +205,6 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
SET_TOGGLE_SENSITIVITY (checkbtn_autosave, spinbtn_autosave_length);
SET_TOGGLE_SENSITIVITY (checkbtn_autosave, label_autosave_length);
- /* quote chars */
-
- PACK_FRAME (vbox1, frame_quote, _("Quotation characters"));
-
- vbox_quote = gtk_vbox_new (FALSE, VSPACING_NARROW);
- gtk_widget_show (vbox_quote);
- gtk_container_add (GTK_CONTAINER (frame_quote), vbox_quote);
- gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
-
- hbox1 = gtk_hbox_new (FALSE, 32);
- gtk_widget_show (hbox1);
- gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, FALSE, FALSE, 0);
-
- hbox2 = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (hbox2);
- gtk_box_pack_start (GTK_BOX (hbox1), hbox2, FALSE, FALSE, 0);
-
- label_quote_chars = gtk_label_new (_("Treat these characters as quotation marks: "));
- gtk_widget_show (label_quote_chars);
- gtk_box_pack_start (GTK_BOX (hbox2), label_quote_chars, FALSE, FALSE, 0);
-
- entry_quote_chars = gtk_entry_new ();
- gtk_widget_show (entry_quote_chars);
- gtk_box_pack_start (GTK_BOX (hbox2), entry_quote_chars,
- FALSE, FALSE, 0);
- gtk_widget_set_size_request (entry_quote_chars, 64, -1);
-
prefs_writing->checkbtn_autoextedit = checkbtn_autoextedit;
@@ -260,7 +225,6 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
prefs_writing->optmenu_dnd_insert_or_attach = optmenu_dnd_insert_or_attach;
- prefs_writing->entry_quote_chars = entry_quote_chars;
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prefs_writing->checkbtn_autoextedit),
prefs_common.auto_exteditor);
@@ -286,8 +250,6 @@ static void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *win
prefs_common.default_reply_list);
combobox_select_by_data(GTK_COMBO_BOX(optmenu_dnd_insert_or_attach),
prefs_common.compose_dnd_mode);
- gtk_entry_set_text(GTK_ENTRY(entry_quote_chars),
- prefs_common.quote_chars?prefs_common.quote_chars:"");
prefs_writing->page.widget = vbox1;
}
@@ -322,11 +284,6 @@ static void prefs_compose_writing_save(PrefsPage *_page)
prefs_common.compose_dnd_mode = combobox_get_active_data(
GTK_COMBO_BOX(page->optmenu_dnd_insert_or_attach));
-
- g_free(prefs_common.quote_chars);
- prefs_common.quote_chars = gtk_editable_get_chars(
- GTK_EDITABLE(page->entry_quote_chars), 0, -1);
- remove_space(prefs_common.quote_chars);
}
static void prefs_compose_writing_destroy_widget(PrefsPage *_page)
diff --git a/src/prefs_message.c b/src/prefs_message.c
@@ -60,6 +60,7 @@ typedef struct _MessagePage
GtkWidget *checkbtn_halfpage;
GtkWidget *checkbtn_attach_desc;
+ GtkWidget *entry_quote_chars;
} MessagePage;
static void disphdr_pane_toggled(GtkToggleButton *toggle_btn, GtkWidget *widget)
@@ -102,6 +103,12 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
GtkWidget *checkbtn_halfpage;
GtkWidget *checkbtn_attach_desc;
+
+ GtkWidget *frame_quote;
+ GtkWidget *hbox2;
+ GtkWidget *vbox_quote;
+ GtkWidget *entry_quote_chars;
+ GtkWidget *label_quote_chars;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
@@ -219,6 +226,32 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
PACK_CHECK_BUTTON(vbox1, checkbtn_attach_desc,
_("Show attachment descriptions (rather than names)"));
+ /* quote chars */
+ PACK_FRAME (vbox1, frame_quote, _("Quotation characters"));
+
+ vbox_quote = gtk_vbox_new (FALSE, VSPACING_NARROW);
+ gtk_widget_show (vbox_quote);
+ gtk_container_add (GTK_CONTAINER (frame_quote), vbox_quote);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox_quote), 8);
+
+ hbox1 = gtk_hbox_new (FALSE, 32);
+ gtk_widget_show (hbox1);
+ gtk_box_pack_start (GTK_BOX (vbox_quote), hbox1, FALSE, FALSE, 0);
+
+ hbox2 = gtk_hbox_new (FALSE, 8);
+ gtk_widget_show (hbox2);
+ gtk_box_pack_start (GTK_BOX (hbox1), hbox2, FALSE, FALSE, 0);
+
+ label_quote_chars = gtk_label_new (_("Treat these characters as quotation marks: "));
+ gtk_widget_show (label_quote_chars);
+ gtk_box_pack_start (GTK_BOX (hbox2), label_quote_chars, FALSE, FALSE, 0);
+
+ entry_quote_chars = gtk_entry_new ();
+ gtk_widget_show (entry_quote_chars);
+ gtk_box_pack_start (GTK_BOX (hbox2), entry_quote_chars,
+ FALSE, FALSE, 0);
+ gtk_widget_set_size_request (entry_quote_chars, 64, -1);
+
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_disphdrpane),
prefs_common.display_header_pane);
@@ -243,6 +276,8 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
prefs_common.line_space);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_scrollstep),
prefs_common.scroll_step);
+ gtk_entry_set_text(GTK_ENTRY(entry_quote_chars),
+ prefs_common.quote_chars?prefs_common.quote_chars:"");
prefs_message->window = GTK_WIDGET(window);
prefs_message->checkbtn_disphdrpane = checkbtn_disphdrpane;
@@ -256,6 +291,7 @@ static void prefs_message_create_widget(PrefsPage *_page, GtkWindow *window,
prefs_message->spinbtn_scrollstep = spinbtn_scrollstep;
prefs_message->checkbtn_halfpage = checkbtn_halfpage;
prefs_message->checkbtn_attach_desc = checkbtn_attach_desc;
+ prefs_message->entry_quote_chars = entry_quote_chars;
prefs_message->page.widget = vbox1;
}
@@ -287,6 +323,11 @@ static void prefs_message_save(PrefsPage *_page)
prefs_common.scroll_step = gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON(page->spinbtn_scrollstep));
+ g_free(prefs_common.quote_chars);
+ prefs_common.quote_chars = gtk_editable_get_chars(
+ GTK_EDITABLE(page->entry_quote_chars), 0, -1);
+ remove_space(prefs_common.quote_chars);
+
main_window_reflect_prefs_all_real(FALSE);
}
