2005-12-07 [colin] 1.9.100cvs74

	* src/prefs_toolbar.c
		Gtk fixes, patch by Fabien Vantard

diff --git a/ChangeLog b/ChangeLog
index 8156c2424f78f7a3f2f92836e59f772bd8221ed9..cf357628dd82ca1cb568f860ad838dc762613936 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-07 [colin]     1.9.100cvs74
+
+       * src/prefs_toolbar.c
+               Gtk fixes, patch by Fabien Vantard
+

 2005-12-07 [colin]     1.9.100cvs73
 
        * src/action.c
 2005-12-07 [colin]     1.9.100cvs73
 
        * src/action.c

diff --git a/PATCHSETS b/PATCHSETS
index f2194d9095492e91ee23a411a09fc88386017476..8e714db647ec7c3462c2f555ee7916713a0b692c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1057,3 +1057,4 @@
 ( cvs diff -u -r 1.654.2.1100 -r 1.654.2.1101 configure.ac;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 doc/Makefile.am;  cvs diff -u -r -1.1 -r -1.2 doc/faq/.cvsignore;  cvs diff -u -r -1.3 -r -1.4 doc/faq/Makefile.am;  cvs diff -u -r -1.1 -r -1.2 doc/faq/de/.cvsignore;  cvs diff -u -r -1.1 -r -1.2 doc/faq/de/Makefile.am;  cvs diff -u -r -1.3 -r -1.4 doc/faq/de/sylpheed-faq-1.html;  cvs diff -u -r -1.3 -r -1.4 doc/faq/de/sylpheed-faq-2.html;  cvs diff -u -r -1.1 -r -1.2 doc/faq/de/sylpheed-faq-3.html;  cvs diff -u -r -1.1 -r -1.2 doc/faq/de/sylpheed-faq.html;  cvs diff -u -r -1.1 -r -1.2 doc/faq/en/.cvsignore;  cvs diff -u -r -1.2 -r -1.3 doc/faq/en/Makefile.am;  cvs diff -u -r -1.7.10.1 -r -1.7.10.2 doc/faq/en/sylpheed-faq-1.html;  cvs diff -u -r -1.7.10.1 -r -1.7.10.2 doc/faq/en/sylpheed-faq-2.html;  cvs diff -u -r -1.4.10.1 -r -1.4.10.2 doc/faq/en/sylpheed-faq-3.html;  cvs diff -u -r -1.1 -r -1.2 doc/faq/en/sylpheed-faq-4.html;  cvs diff -u -r -1.3.10.1 -r -1.3.10.2 doc/faq/en/sylpheed-faq.html;  cvs diff -u -r -1.1 -r -1.2 doc/faq/es/.cvsignore;  cvs diff -u -r -1.3 -r -1.4 doc/faq/es/Makefile.am;  cvs diff -u -r -1.6 -r -1.7 doc/faq/es/sylpheed-faq-1.html;  cvs diff -u -r -1.6 -r -1.7 doc/faq/es/sylpheed-faq-2.html;  cvs diff -u -r -1.6 -r -1.7 doc/faq/es/sylpheed-faq-3.html;  cvs diff -u -r -1.3 -r -1.4 doc/faq/es/sylpheed-faq-4.html;  cvs diff -u -r -1.4 -r -1.5 doc/faq/es/sylpheed-faq.html;  cvs diff -u -r -1.1 -r -1.2 doc/faq/fr/.cvsignore;  cvs diff -u -r -1.1 -r -1.2 doc/faq/fr/Makefile.am;  cvs diff -u -r -1.5 -r -1.6 doc/faq/fr/sylpheed-faq-1.html;  cvs diff -u -r -1.3 -r -1.4 doc/faq/fr/sylpheed-faq-2.html;  cvs diff -u -r -1.3 -r -1.4 doc/faq/fr/sylpheed-faq-3.html;  cvs diff -u -r -1.3 -r -1.4 doc/faq/fr/sylpheed-faq.html;  cvs diff -u -r -1.1 -r -1.2 doc/faq/it/.cvsignore;  cvs diff -u -r -1.1 -r -1.2 doc/faq/it/Makefile.am;  cvs diff -u -r -1.3 -r -1.4 doc/faq/it/sylpheed-faq-1.html;  cvs diff -u -r -1.3 -r -1.4 doc/faq/it/sylpheed-faq-2.html;  cvs diff -u -r -1.3 -r -1.4 doc/faq/it/sylpheed-faq-3.html;  cvs diff -u -r -1.2 -r -1.3 doc/faq/it/sylpheed-faq.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/.cvsignore;  cvs diff -u -r -1.5 -r -1.6 doc/manual/Makefile.am;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/.cvsignore;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/Makefile.am;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-1.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-10.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-11.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-12.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-13.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-14.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-15.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-16.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-17.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-18.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-19.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-2.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-20.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-3.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-4.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-5.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-6.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-7.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-8.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-9.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/en/.cvsignore;  cvs diff -u -r -1.5 -r -1.6 doc/manual/en/Makefile.am;  cvs diff -u -r -1.5.2.3 -r -1.5.2.4 doc/manual/en/sylpheed-1.html;  cvs diff -u -r -1.4.2.1 -r -1.4.2.2 doc/manual/en/sylpheed-10.html;  cvs diff -u -r -1.5.2.1 -r -1.5.2.2 doc/manual/en/sylpheed-11.html;  cvs diff -u -r -1.4.2.2 -r -1.4.2.3 doc/manual/en/sylpheed-12.html;  cvs diff -u -r -1.4.2.2 -r -1.4.2.3 doc/manual/en/sylpheed-13.html;  cvs diff -u -r -1.4.2.2 -r -1.4.2.3 doc/manual/en/sylpheed-14.html;  cvs diff -u -r -1.4.2.2 -r -1.4.2.3 doc/manual/en/sylpheed-15.html;  cvs diff -u -r -1.4.2.2 -r -1.4.2.3 doc/manual/en/sylpheed-16.html;  cvs diff -u -r -1.4.2.2 -r -1.4.2.3 doc/manual/en/sylpheed-17.html;  cvs diff -u -r -1.4.2.3 -r -1.4.2.4 doc/manual/en/sylpheed-18.html;  cvs diff -u -r -1.4.2.3 -r -1.4.2.4 doc/manual/en/sylpheed-19.html;  cvs diff -u -r -1.5.2.2 -r -1.5.2.3 doc/manual/en/sylpheed-2.html;  cvs diff -u -r -1.5.2.3 -r -1.5.2.4 doc/manual/en/sylpheed-20.html;  cvs diff -u -r -1.4.2.2 -r -1.4.2.3 doc/manual/en/sylpheed-21.html;  cvs diff -u -r -1.1.4.2 -r -1.1.4.3 doc/manual/en/sylpheed-22.html;  cvs diff -u -r -1.4.2.1 -r -1.4.2.2 doc/manual/en/sylpheed-3.html;  cvs diff -u -r -1.6.2.3 -r -1.6.2.4 doc/manual/en/sylpheed-4.html;  cvs diff -u -r -1.4.2.2 -r -1.4.2.3 doc/manual/en/sylpheed-5.html;  cvs diff -u -r -1.5.2.3 -r -1.5.2.4 doc/manual/en/sylpheed-6.html;  cvs diff -u -r -1.5.2.2 -r -1.5.2.3 doc/manual/en/sylpheed-7.html;  cvs diff -u -r -1.5.2.2 -r -1.5.2.3 doc/manual/en/sylpheed-8.html;  cvs diff -u -r -1.5.2.2 -r -1.5.2.3 doc/manual/en/sylpheed-9.html;  cvs diff -u -r -1.5.2.3 -r -1.5.2.4 doc/manual/en/sylpheed.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/.cvsignore;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/Makefile.am;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-1.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-10.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-11.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-12.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-13.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-14.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-15.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-16.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-17.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-18.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-19.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-2.html;  cvs diff -u -r -1.1.14.1 -r -1.1.14.2 doc/manual/es/sylpheed-20.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-3.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-4.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-5.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-6.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-7.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-8.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-9.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/fr/.cvsignore;  cvs diff -u -r -1.1 -r -1.2 doc/manual/fr/Makefile.am;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-1.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-10.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-11.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-12.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-13.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-14.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-15.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-16.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-17.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-18.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-19.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-2.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-20.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-3.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-4.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-5.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-6.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-7.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-8.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-9.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/ja/.cvsignore;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/Makefile.am;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-1.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-10.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-11.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-12.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-13.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-14.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-15.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-16.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-17.html;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 doc/manual/ja/sylpheed-18.html;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 doc/manual/ja/sylpheed-19.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-2.html;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 doc/manual/ja/sylpheed-20.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-3.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-4.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-5.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-6.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-7.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-8.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-9.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed.sgml;  cvs diff -u -r 1.274.2.78 -r 1.274.2.79 src/mainwindow.c;  ) > 1.9.100cvs71.patchset
 ( cvs diff -u -r 1.654.2.1101 -r 1.654.2.1102 configure.ac;  cvs diff -u -r 1.274.2.79 -r 1.274.2.80 src/mainwindow.c;  cvs diff -u -r 1.11.2.3 -r 1.11.2.4 src/manual.c;  cvs diff -u -r 1.8.2.1 -r 1.8.2.2 src/manual.h;  cvs diff -u -r 1.9.2.19 -r 1.9.2.20 src/common/defs.h;  ) > 1.9.100cvs72.patchset
 ( cvs diff -u -r 1.12.2.27 -r 1.12.2.28 src/action.c;  cvs diff -u -r 1.382.2.202 -r 1.382.2.203 src/compose.c;  cvs diff -u -r 1.50.2.16 -r 1.50.2.17 src/compose.h;  cvs diff -u -r 1.13.2.8 -r 1.13.2.9 src/common/plugin.c;  cvs diff -u -r 1.13.2.17 -r 1.13.2.18 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.13.2.3 -r 1.13.2.4 src/plugins/demo/demo.c;  cvs diff -u -r 1.12.2.8 -r 1.12.2.9 src/plugins/dillo_viewer/dillo_viewer.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpcore/plugin.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpinline/plugin.c;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/plugins/pgpmime/plugin.c;  cvs diff -u -r 1.18.2.14 -r 1.18.2.15 src/plugins/spamassassin/spamassassin.c;  cvs diff -u -r 1.14.2.28 -r 1.14.2.29 src/plugins/trayicon/trayicon.c;  ) > 1.9.100cvs73.patchset
 ( cvs diff -u -r 1.654.2.1100 -r 1.654.2.1101 configure.ac;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 doc/Makefile.am;  cvs diff -u -r -1.1 -r -1.2 doc/faq/.cvsignore;  cvs diff -u -r -1.3 -r -1.4 doc/faq/Makefile.am;  cvs diff -u -r -1.1 -r -1.2 doc/faq/de/.cvsignore;  cvs diff -u -r -1.1 -r -1.2 doc/faq/de/Makefile.am;  cvs diff -u -r -1.3 -r -1.4 doc/faq/de/sylpheed-faq-1.html;  cvs diff -u -r -1.3 -r -1.4 doc/faq/de/sylpheed-faq-2.html;  cvs diff -u -r -1.1 -r -1.2 doc/faq/de/sylpheed-faq-3.html;  cvs diff -u -r -1.1 -r -1.2 doc/faq/de/sylpheed-faq.html;  cvs diff -u -r -1.1 -r -1.2 doc/faq/en/.cvsignore;  cvs diff -u -r -1.2 -r -1.3 doc/faq/en/Makefile.am;  cvs diff -u -r -1.7.10.1 -r -1.7.10.2 doc/faq/en/sylpheed-faq-1.html;  cvs diff -u -r -1.7.10.1 -r -1.7.10.2 doc/faq/en/sylpheed-faq-2.html;  cvs diff -u -r -1.4.10.1 -r -1.4.10.2 doc/faq/en/sylpheed-faq-3.html;  cvs diff -u -r -1.1 -r -1.2 doc/faq/en/sylpheed-faq-4.html;  cvs diff -u -r -1.3.10.1 -r -1.3.10.2 doc/faq/en/sylpheed-faq.html;  cvs diff -u -r -1.1 -r -1.2 doc/faq/es/.cvsignore;  cvs diff -u -r -1.3 -r -1.4 doc/faq/es/Makefile.am;  cvs diff -u -r -1.6 -r -1.7 doc/faq/es/sylpheed-faq-1.html;  cvs diff -u -r -1.6 -r -1.7 doc/faq/es/sylpheed-faq-2.html;  cvs diff -u -r -1.6 -r -1.7 doc/faq/es/sylpheed-faq-3.html;  cvs diff -u -r -1.3 -r -1.4 doc/faq/es/sylpheed-faq-4.html;  cvs diff -u -r -1.4 -r -1.5 doc/faq/es/sylpheed-faq.html;  cvs diff -u -r -1.1 -r -1.2 doc/faq/fr/.cvsignore;  cvs diff -u -r -1.1 -r -1.2 doc/faq/fr/Makefile.am;  cvs diff -u -r -1.5 -r -1.6 doc/faq/fr/sylpheed-faq-1.html;  cvs diff -u -r -1.3 -r -1.4 doc/faq/fr/sylpheed-faq-2.html;  cvs diff -u -r -1.3 -r -1.4 doc/faq/fr/sylpheed-faq-3.html;  cvs diff -u -r -1.3 -r -1.4 doc/faq/fr/sylpheed-faq.html;  cvs diff -u -r -1.1 -r -1.2 doc/faq/it/.cvsignore;  cvs diff -u -r -1.1 -r -1.2 doc/faq/it/Makefile.am;  cvs diff -u -r -1.3 -r -1.4 doc/faq/it/sylpheed-faq-1.html;  cvs diff -u -r -1.3 -r -1.4 doc/faq/it/sylpheed-faq-2.html;  cvs diff -u -r -1.3 -r -1.4 doc/faq/it/sylpheed-faq-3.html;  cvs diff -u -r -1.2 -r -1.3 doc/faq/it/sylpheed-faq.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/.cvsignore;  cvs diff -u -r -1.5 -r -1.6 doc/manual/Makefile.am;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/.cvsignore;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/Makefile.am;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-1.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-10.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-11.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-12.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-13.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-14.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-15.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-16.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-17.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-18.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-19.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-2.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-20.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-3.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-4.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-5.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-6.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-7.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-8.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed-9.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/de/sylpheed.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/en/.cvsignore;  cvs diff -u -r -1.5 -r -1.6 doc/manual/en/Makefile.am;  cvs diff -u -r -1.5.2.3 -r -1.5.2.4 doc/manual/en/sylpheed-1.html;  cvs diff -u -r -1.4.2.1 -r -1.4.2.2 doc/manual/en/sylpheed-10.html;  cvs diff -u -r -1.5.2.1 -r -1.5.2.2 doc/manual/en/sylpheed-11.html;  cvs diff -u -r -1.4.2.2 -r -1.4.2.3 doc/manual/en/sylpheed-12.html;  cvs diff -u -r -1.4.2.2 -r -1.4.2.3 doc/manual/en/sylpheed-13.html;  cvs diff -u -r -1.4.2.2 -r -1.4.2.3 doc/manual/en/sylpheed-14.html;  cvs diff -u -r -1.4.2.2 -r -1.4.2.3 doc/manual/en/sylpheed-15.html;  cvs diff -u -r -1.4.2.2 -r -1.4.2.3 doc/manual/en/sylpheed-16.html;  cvs diff -u -r -1.4.2.2 -r -1.4.2.3 doc/manual/en/sylpheed-17.html;  cvs diff -u -r -1.4.2.3 -r -1.4.2.4 doc/manual/en/sylpheed-18.html;  cvs diff -u -r -1.4.2.3 -r -1.4.2.4 doc/manual/en/sylpheed-19.html;  cvs diff -u -r -1.5.2.2 -r -1.5.2.3 doc/manual/en/sylpheed-2.html;  cvs diff -u -r -1.5.2.3 -r -1.5.2.4 doc/manual/en/sylpheed-20.html;  cvs diff -u -r -1.4.2.2 -r -1.4.2.3 doc/manual/en/sylpheed-21.html;  cvs diff -u -r -1.1.4.2 -r -1.1.4.3 doc/manual/en/sylpheed-22.html;  cvs diff -u -r -1.4.2.1 -r -1.4.2.2 doc/manual/en/sylpheed-3.html;  cvs diff -u -r -1.6.2.3 -r -1.6.2.4 doc/manual/en/sylpheed-4.html;  cvs diff -u -r -1.4.2.2 -r -1.4.2.3 doc/manual/en/sylpheed-5.html;  cvs diff -u -r -1.5.2.3 -r -1.5.2.4 doc/manual/en/sylpheed-6.html;  cvs diff -u -r -1.5.2.2 -r -1.5.2.3 doc/manual/en/sylpheed-7.html;  cvs diff -u -r -1.5.2.2 -r -1.5.2.3 doc/manual/en/sylpheed-8.html;  cvs diff -u -r -1.5.2.2 -r -1.5.2.3 doc/manual/en/sylpheed-9.html;  cvs diff -u -r -1.5.2.3 -r -1.5.2.4 doc/manual/en/sylpheed.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/.cvsignore;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/Makefile.am;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-1.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-10.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-11.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-12.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-13.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-14.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-15.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-16.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-17.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-18.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-19.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-2.html;  cvs diff -u -r -1.1.14.1 -r -1.1.14.2 doc/manual/es/sylpheed-20.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-3.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-4.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-5.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-6.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-7.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-8.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed-9.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/es/sylpheed.html;  cvs diff -u -r -1.1 -r -1.2 doc/manual/fr/.cvsignore;  cvs diff -u -r -1.1 -r -1.2 doc/manual/fr/Makefile.am;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-1.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-10.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-11.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-12.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-13.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-14.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-15.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-16.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-17.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-18.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-19.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-2.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-20.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-3.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-4.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-5.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-6.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-7.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-8.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed-9.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/fr/sylpheed.html;  cvs diff -u -r -1.2 -r -1.3 doc/manual/ja/.cvsignore;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/Makefile.am;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-1.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-10.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-11.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-12.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-13.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-14.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-15.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-16.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-17.html;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 doc/manual/ja/sylpheed-18.html;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 doc/manual/ja/sylpheed-19.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-2.html;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 doc/manual/ja/sylpheed-20.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-3.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-4.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-5.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-6.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-7.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-8.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed-9.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed.html;  cvs diff -u -r -1.1.1.1.16.1 -r -1.1.1.1.16.2 doc/manual/ja/sylpheed.sgml;  cvs diff -u -r 1.274.2.78 -r 1.274.2.79 src/mainwindow.c;  ) > 1.9.100cvs71.patchset
 ( cvs diff -u -r 1.654.2.1101 -r 1.654.2.1102 configure.ac;  cvs diff -u -r 1.274.2.79 -r 1.274.2.80 src/mainwindow.c;  cvs diff -u -r 1.11.2.3 -r 1.11.2.4 src/manual.c;  cvs diff -u -r 1.8.2.1 -r 1.8.2.2 src/manual.h;  cvs diff -u -r 1.9.2.19 -r 1.9.2.20 src/common/defs.h;  ) > 1.9.100cvs72.patchset
 ( cvs diff -u -r 1.12.2.27 -r 1.12.2.28 src/action.c;  cvs diff -u -r 1.382.2.202 -r 1.382.2.203 src/compose.c;  cvs diff -u -r 1.50.2.16 -r 1.50.2.17 src/compose.h;  cvs diff -u -r 1.13.2.8 -r 1.13.2.9 src/common/plugin.c;  cvs diff -u -r 1.13.2.17 -r 1.13.2.18 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.13.2.3 -r 1.13.2.4 src/plugins/demo/demo.c;  cvs diff -u -r 1.12.2.8 -r 1.12.2.9 src/plugins/dillo_viewer/dillo_viewer.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpcore/plugin.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpinline/plugin.c;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/plugins/pgpmime/plugin.c;  cvs diff -u -r 1.18.2.14 -r 1.18.2.15 src/plugins/spamassassin/spamassassin.c;  cvs diff -u -r 1.14.2.28 -r 1.14.2.29 src/plugins/trayicon/trayicon.c;  ) > 1.9.100cvs73.patchset

+( cvs diff -u -r 1.30.2.20 -r 1.30.2.21 src/prefs_toolbar.c;  ) > 1.9.100cvs74.patchset

diff --git a/configure.ac b/configure.ac
index ecca7643b6072f878a9455281515cbb12cc331c1..d0d3479a91a26c3456f4aa2c1b7561c2ff4d6c61 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=73
+EXTRA_VERSION=74

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index b8948598aa5ff5835398c7a34e47235c665d1fd8..4649c97d40b5ee80feac18d56429f6e911ffc917 100644 (file)
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -689,7 +689,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
        GtkWidget *btn_vbox;
        GtkWidget *up_btn;
        GtkWidget *down_btn;
        GtkWidget *btn_vbox;
        GtkWidget *up_btn;
        GtkWidget *down_btn;

- 
+

        debug_print("Creating custom toolbar window...\n");
 
        main_vbox = gtk_vbox_new(FALSE, 0);
        debug_print("Creating custom toolbar window...\n");
 
        main_vbox = gtk_vbox_new(FALSE, 0);


@@ -704,14 +704,15 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
 
        vbox_frame = gtk_vbox_new(FALSE, 0);
        gtk_container_add(GTK_CONTAINER(compose_frame), vbox_frame);
 
        vbox_frame = gtk_vbox_new(FALSE, 0);
        gtk_container_add(GTK_CONTAINER(compose_frame), vbox_frame);

-       
+

        /* available icons */
        scrolledwindow_list_view_icons = gtk_scrolled_window_new(NULL, NULL);
        gtk_container_set_border_width(GTK_CONTAINER(scrolledwindow_list_view_icons), 5);
        /* available icons */
        scrolledwindow_list_view_icons = gtk_scrolled_window_new(NULL, NULL);
        gtk_container_set_border_width(GTK_CONTAINER(scrolledwindow_list_view_icons), 5);

-       gtk_container_add(GTK_CONTAINER(vbox_frame), scrolledwindow_list_view_icons);
+       gtk_box_pack_start(GTK_BOX(vbox_frame), scrolledwindow_list_view_icons,
+                          TRUE, TRUE, 0);

        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow_list_view_icons), 
                                       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow_list_view_icons), 
                                       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);

-       
+

        list_view_icons = create_icon_list_view(prefs_toolbar);
        gtk_widget_show(list_view_icons);
        gtk_container_add(GTK_CONTAINER(scrolledwindow_list_view_icons), list_view_icons);
        list_view_icons = create_icon_list_view(prefs_toolbar);
        gtk_widget_show(list_view_icons);
        gtk_container_add(GTK_CONTAINER(scrolledwindow_list_view_icons), list_view_icons);


@@ -719,7 +720,8 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
        gtk_widget_set_size_request(list_view_icons, 225, 108);
 
        table = gtk_table_new (2, 3, FALSE);
        gtk_widget_set_size_request(list_view_icons, 225, 108);
 
        table = gtk_table_new (2, 3, FALSE);

-       gtk_container_add (GTK_CONTAINER (vbox_frame), table);
+       gtk_box_pack_start(GTK_BOX(vbox_frame), table,
+                          FALSE, FALSE, 0);

        gtk_container_set_border_width (GTK_CONTAINER (table), 8);
        gtk_table_set_row_spacings (GTK_TABLE (table), 8);
        gtk_table_set_col_spacings (GTK_TABLE (table), 8);
        gtk_container_set_border_width (GTK_CONTAINER (table), 8);
        gtk_table_set_row_spacings (GTK_TABLE (table), 8);
        gtk_table_set_col_spacings (GTK_TABLE (table), 8);


@@ -818,7 +820,7 @@ static void prefs_toolbar_create(ToolbarPage *prefs_toolbar)
        scrolledwindow_list_view_set = gtk_scrolled_window_new(NULL, NULL);
        gtk_box_pack_start(GTK_BOX(hbox_bottom), scrolledwindow_list_view_set, TRUE, TRUE, 0);
        gtk_container_set_border_width(GTK_CONTAINER(scrolledwindow_list_view_set), 1);
        scrolledwindow_list_view_set = gtk_scrolled_window_new(NULL, NULL);
        gtk_box_pack_start(GTK_BOX(hbox_bottom), scrolledwindow_list_view_set, TRUE, TRUE, 0);
        gtk_container_set_border_width(GTK_CONTAINER(scrolledwindow_list_view_set), 1);

-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow_list_view_icons), 
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwindow_list_view_set), 

                                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
        list_view_set = create_set_list_view(prefs_toolbar); 
                                        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
        list_view_set = create_set_list_view(prefs_toolbar);