2006-10-10 [colin] 2.5.3cvs30

	* src/prefs_compose_writing.c
		Stop making the page larger than the window

diff --git a/ChangeLog b/ChangeLog
index 576f0e62acf12ab0d2b3d965a880dcad04017f06..c176580dca6a8bcdd6e3692569af012535a00584 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-10 [colin]     2.5.3cvs30
+
+       * src/prefs_compose_writing.c
+               Stop making the page larger than the window
+
 2006-10-10 [wwp]       2.5.3cvs29
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 5fb4e64e5716182d9ee4c6cc1f08a174d5d9b9ca..217e0e4cf0d71a3ea6b8c8155e42712bf196bf34 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1984,3 +1984,4 @@
 ( cvs diff -u -r 1.115.2.109 -r 1.115.2.110 src/main.c;  cvs diff -u -r 1.10.2.24 -r 1.10.2.25 src/prefs_gtk.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpcore/pgp_viewer.c;  cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/plugins/pgpcore/sgpgme.c;  ) > 2.5.3cvs27.patchset
 ( cvs diff -u -r 1.47.2.34 -r 1.47.2.35 src/procheader.c;  ) > 2.5.3cvs28.patchset
 ( cvs diff -u -r 1.382.2.313 -r 1.382.2.314 src/compose.c;  cvs diff -u -r 1.12.2.31 -r 1.12.2.32 src/prefs_template.c;  cvs diff -u -r 1.8.2.9 -r 1.8.2.10 src/quote_fmt.c;  cvs diff -u -r 1.5.12.5 -r 1.5.12.6 src/quote_fmt.h;  cvs diff -u -r 1.8.2.5 -r 1.8.2.6 src/quote_fmt_lex.l;  cvs diff -u -r 1.22.2.23 -r 1.22.2.24 src/quote_fmt_parse.y;  ) > 2.5.3cvs29.patchset
+( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/prefs_compose_writing.c;  ) > 2.5.3cvs30.patchset

diff --git a/configure.ac b/configure.ac
index c24077b21f2e4dd72ad53e2a895ef942f3ebfdee..eae5da88456b50551a8737730b5ea28a43f38c98 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=29
+EXTRA_VERSION=30
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_compose_writing.c b/src/prefs_compose_writing.c
index 3307f23f9a40e71d3d3f1b88442d66cc470c069c..5762d521e3ea4e13957e8755c3c91212c7e321b2 100644 (file)
--- a/src/prefs_compose_writing.c
+++ b/src/prefs_compose_writing.c
@@ -187,9 +187,9 @@ void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (optmenu_dnd_insert_or_attach);
 
        menu = gtk_menu_new ();
-       MENUITEM_ADD (menu, menuitem, _("Ask whether to insert or attach"), COMPOSE_DND_ASK);
-       MENUITEM_ADD (menu, menuitem, _("Always insert"), COMPOSE_DND_INSERT);
-       MENUITEM_ADD (menu, menuitem, _("Always attach"), COMPOSE_DND_ATTACH);
+       MENUITEM_ADD (menu, menuitem, _("Ask"), COMPOSE_DND_ASK);
+       MENUITEM_ADD (menu, menuitem, _("Insert"), COMPOSE_DND_INSERT);
+       MENUITEM_ADD (menu, menuitem, _("Attach"), COMPOSE_DND_ATTACH);
 
        gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu_dnd_insert_or_attach), menu);