2011-10-30 [pawel] 3.7.10cvs61

	* src/compose.c
		Those entries should not be editable

diff --git a/ChangeLog b/ChangeLog
index 3a6a08f7653951a6977abd65eb25ee704b5c3491..3c59533dd3843fbaf21410028bb467359e8b4b7f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-30 [pawel]     3.7.10cvs61
+
+       * src/compose.c
+               Those entries should not be editable
+

 2011-10-30 [pawel]     3.7.10cvs60
 
        * src/prefs_template.c
 2011-10-30 [pawel]     3.7.10cvs60
 
        * src/prefs_template.c

diff --git a/PATCHSETS b/PATCHSETS
index 3380476b0778d58bb8a965ff20a49d2da2e08496..e8c0a67139a50bb6999fe63fa8f01e0203cb09cd 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4264,3 +4264,4 @@
 ( cvs diff -u -r 1.83.2.175 -r 1.83.2.176 src/mimeview.c;  ) > 3.7.10cvs58.patchset
 ( cvs diff -u -r 1.52.2.85 -r 1.52.2.86 src/prefs_folder_item.c;  ) > 3.7.10cvs59.patchset
 ( cvs diff -u -r 1.12.2.77 -r 1.12.2.78 src/prefs_template.c;  ) > 3.7.10cvs60.patchset
 ( cvs diff -u -r 1.83.2.175 -r 1.83.2.176 src/mimeview.c;  ) > 3.7.10cvs58.patchset
 ( cvs diff -u -r 1.52.2.85 -r 1.52.2.86 src/prefs_folder_item.c;  ) > 3.7.10cvs59.patchset
 ( cvs diff -u -r 1.12.2.77 -r 1.12.2.78 src/prefs_template.c;  ) > 3.7.10cvs60.patchset

+( cvs diff -u -r 1.382.2.589 -r 1.382.2.590 src/compose.c;  ) > 3.7.10cvs61.patchset

diff --git a/configure.ac b/configure.ac
index abfc7cb24fb6ac3f4f1d803d693d20392962fbb5..7ffff4886dcae518bc331d2b4ccbcb1b8c7b4148 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=60
+EXTRA_VERSION=61

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index c6bf6627e6d72b703e702c80c20bed6d159418b4..2ad073a6a8a4c381928393bfd2f6b45c64892768 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -8659,6 +8659,7 @@ static void compose_attach_property(GtkAction *action, gpointer data)
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); \
  \
        entry = gtk_entry_new(); \
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); \
  \
        entry = gtk_entry_new(); \

+       gtk_editable_set_editable(GTK_EDITABLE(entry), FALSE); \

        gtk_table_attach(GTK_TABLE(table), entry, 1, 2, top, (top + 1), \
                         GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); \
 }
        gtk_table_attach(GTK_TABLE(table), entry, 1, 2, top, (top + 1), \
                         GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); \
 }