2010-02-27 [holger] 3.7.5cvs25

	* src/prefs_toolbar.c
		Don't make toolbar item description for
		plugin registered items editable

diff --git a/ChangeLog b/ChangeLog
index 2f285b0f0d3b5f669b269433fbfafe375c0e28d9..45e4a3bde05f2bb1cda47522a38104cf5ee487a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-27 [holger]    3.7.5cvs25
+
+       * src/prefs_toolbar.c
+               Don't make toolbar item description for
+               plugin registered items editable
+
 2010-02-26 [colin]     3.7.5cvs24
 
        * src/toolbar.c

diff --git a/PATCHSETS b/PATCHSETS
index 13beaf81e858a1cf826b1203c5c784353ba29169..ee3fa603d52830e55743a1c8110896d324702d1e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3965,3 +3965,4 @@
 ( cvs diff -u -r 1.179.2.249 -r 1.179.2.250 src/imap.c;  cvs diff -u -r 1.34.2.21 -r 1.34.2.22 src/imap.h;  cvs diff -u -r 1.115.2.224 -r 1.115.2.225 src/main.c;  cvs diff -u -r 1.274.2.306 -r 1.274.2.307 src/mainwindow.c;  cvs diff -u -r 1.1.4.110 -r 1.1.4.111 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.26 -r 1.1.4.27 src/etpan/imap-thread.h;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/etpan/nntp-thread.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/etpan/nntp-thread.h;  ) > 3.7.5cvs22.patchset
 ( cvs diff -u -r 1.382.2.546 -r 1.382.2.547 src/compose.c;  ) > 3.7.5cvs23.patchset
 ( cvs diff -u -r 1.43.2.115 -r 1.43.2.116 src/toolbar.c;  ) > 3.7.5cvs24.patchset
+( cvs diff -u -r 1.30.2.60 -r 1.30.2.61 src/prefs_toolbar.c;  ) > 3.7.5cvs25.patchset

diff --git a/configure.ac b/configure.ac
index f446ed1b2cad467a0186841dc6c1861e2036fd54..995ac3bc4e2413f00c25abc4eeccf8e812b0edda 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=24
+EXTRA_VERSION=25
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index 7cfd701332e554b6f6da360d999d6c59712d4061..11657b2c38f704b2df6edac03c4b090d914a5e9e 100644 (file)
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -774,7 +774,7 @@ static void item_type_changed(GtkComboBox *item_type_combo,
         gtk_widget_hide(prefs_toolbar->item_action_combo);
         gtk_combo_box_set_active(GTK_COMBO_BOX(prefs_toolbar->item_plugin_combo), 0);
         gtk_button_set_label(GTK_BUTTON(prefs_toolbar->icon_button), "");
-        gtk_widget_set_sensitive(prefs_toolbar->item_text_entry, TRUE);
+        gtk_widget_set_sensitive(prefs_toolbar->item_text_entry, FALSE);
         gtk_widget_set_sensitive(prefs_toolbar->item_plugin_combo, TRUE);
         gtk_widget_set_sensitive(prefs_toolbar->icon_button, TRUE);
         plugin_selection_changed(GTK_COMBO_BOX(prefs_toolbar->item_plugin_combo), prefs_toolbar);