2005-02-11 [colin] 1.0.1cvs4.3

	* src/compose.c
		revert 1.0.0cvs28.2, it doesn't work that well.

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 28689f2d59659d09c8b64f3ac92ae7665852ee2c..bb33bcae362781b2234786e13e00f682c48af795 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-02-11 [colin]     1.0.1cvs4.3
+
+       * src/compose.c
+               revert 1.0.0cvs28.2, it doesn't work that well.
+

 2005-02-11 [paul]      1.0.1cvs4.2
 
        * po/Makefile.in.in
 2005-02-11 [paul]      1.0.1cvs4.2
 
        * po/Makefile.in.in

diff --git a/PATCHSETS b/PATCHSETS
index aae9dc3787d146c928f963dc950aac6e298c93d2..16ff68890bb91028c76726b32182b508caed5815 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -371,3 +371,4 @@
 ( cvs diff -u -r 1.100.2.12 -r 1.100.2.13 AUTHORS; cvs diff -u -r 1.24.2.5 -r 1.24.2.6 Makefile.am; cvs diff -u -r 1.4.2.3 -r 1.4.2.4 autogen.sh; cvs diff -u -r 1.654.2.403 -r 1.654.2.404 configure.ac; cvs diff -u -r 0 -r 1 config/mkinstalldirs; cvs diff -u -r -1.1.16.1 -r -1.1.16.2 intl/.cvsignore; cvs diff -u -r -1.4 -r -1.5 intl/ChangeLog; cvs diff -u -r -1.3 -r -1.4 intl/VERSION; cvs diff -u -r -1.3 -r -1.4 intl/bindtextdom.c; cvs diff -u -r -1.3 -r -1.4 intl/config.charset; cvs diff -u -r -1.3 -r -1.4 intl/dcgettext.c; cvs diff -u -r -1.3 -r -1.4 intl/dcigettext.c; cvs diff -u -r -1.2 -r -1.3 intl/dcngettext.c; cvs diff -u -r -1.3 -r -1.4 intl/dgettext.c; cvs diff -u -r -1.2 -r -1.3 intl/dngettext.c; cvs diff -u -r -1.1 -r -1.2 intl/eval-plural.h; cvs diff -u -r -1.3 -r -1.4 intl/explodename.c; cvs diff -u -r -1.3 -r -1.4 intl/finddomain.c; cvs diff -u -r -1.3 -r -1.4 intl/gettext.c; cvs diff -u -r -1.3 -r -1.4 intl/gettextP.h; cvs diff -u -r -1.1 -r -1.2 intl/gmo.h; cvs diff -u -r -1.3 -r -1.4 intl/hash-string.h; cvs diff -u -r -1.3 -r -1.4 intl/intl-compat.c; cvs diff -u -r -1.3 -r -1.4 intl/l10nflist.c; cvs diff -u -r -1.1 -r -1.2 intl/libgnuintl.h.in; cvs diff -u -r -1.3 -r -1.4 intl/loadinfo.h; cvs diff -u -r -1.3 -r -1.4 intl/loadmsgcat.c; cvs diff -u -r -1.3 -r -1.4 intl/localcharset.c; cvs diff -u -r -1.1 -r -1.2 intl/localcharset.h; cvs diff -u -r -1.2 -r -1.3 intl/locale.alias; cvs diff -u -r -1.3 -r -1.4 intl/localealias.c; cvs diff -u -r -1.1 -r -1.2 intl/localename.c; cvs diff -u -r -1.1 -r -1.2 intl/log.c; cvs diff -u -r -1.2 -r -1.3 intl/ngettext.c; cvs diff -u -r -1.1 -r -1.2 intl/os2compat.c; cvs diff -u -r -1.1 -r -1.2 intl/os2compat.h; cvs diff -u -r -1.1 -r -1.2 intl/osdep.c; cvs diff -u -r -1.1 -r -1.2 intl/plural-exp.c; cvs diff -u -r -1.1 -r -1.2 intl/plural-exp.h; cvs diff -u -r -1.2 -r -1.3 intl/plural.c; cvs diff -u -r -1.2 -r -1.3 intl/plural.y; cvs diff -u -r -1.1 -r -1.2 intl/ref-add.sin; cvs diff -u -r -1.1 -r -1.2 intl/ref-del.sin; cvs diff -u -r -1.1 -r -1.2 intl/relocatable.c; cvs diff -u -r -1.1 -r -1.2 intl/relocatable.h; cvs diff -u -r -1.3 -r -1.4 intl/textdomain.c; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 m4/Makefile.am; cvs diff -u -r 0 -r 1 po/Makefile.in.in; cvs diff -u -r 1.155.2.17 -r 1.155.2.18 src/Makefile.am; cvs diff -u -r 1.61.2.21 -r 1.61.2.22 src/account.c; cvs diff -u -r 1.12.2.19 -r 1.12.2.20 src/action.c; cvs diff -u -r 1.27.2.8 -r 1.27.2.9 src/addr_compl.c; cvs diff -u -r 1.9.2.3 -r 1.9.2.4 src/addressadd.c; cvs diff -u -r 1.60.2.14 -r 1.60.2.15 src/addressbook.c; cvs diff -u -r 1.5.10.6 -r 1.5.10.7 src/addrgather.c; cvs diff -u -r 1.28.2.5 -r 1.28.2.6 src/addrindex.c; cvs diff -u -r 1.17.2.10 -r 1.17.2.11 src/alertpanel.c; cvs diff -u -r 1.2.4.4 -r 1.2.4.5 src/browseldap.c; cvs diff -u -r 1.65.2.22 -r 1.65.2.23 src/codeconv.c; cvs diff -u -r 1.15.2.4 -r 1.15.2.5 src/codeconv.h; cvs diff -u -r 1.382.2.96 -r 1.382.2.97 src/compose.c; cvs diff -u -r 1.50.2.7 -r 1.50.2.8 src/compose.h; cvs diff -u -r 1.23.2.7 -r 1.23.2.8 src/crash.c; cvs diff -u -r 1.14.2.5 -r 1.14.2.6 src/editaddress.c; cvs diff -u -r 1.5.12.2 -r 1.5.12.3 src/editbook.c; cvs diff -u -r 1.11.2.5 -r 1.11.2.6 src/editgroup.c; cvs diff -u -r 1.5.12.2 -r 1.5.12.3 src/editjpilot.c; cvs diff -u -r 1.8.2.3 -r 1.8.2.4 src/editldap.c; cvs diff -u -r 1.10.2.3 -r 1.10.2.4 src/editldap_basedn.c; cvs diff -u -r 1.5.12.2 -r 1.5.12.3 src/editvcard.c; cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/exphtmldlg.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/expldifdlg.c; cvs diff -u -r 1.8.2.6 -r 1.8.2.7 src/export.c; cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/exporthtml.c; cvs diff -u -r 1.60.2.3 -r 1.60.2.4 src/filtering.c; cvs diff -u -r 1.213.2.23 -r 1.213.2.24 src/folder.c; cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/folder_item_prefs.c; cvs diff -u -r 1.26.2.11 -r 1.26.2.12 src/foldersel.c; cvs diff -u -r 1.207.2.29 -r 1.207.2.30 src/folderview.c; cvs diff -u -r 1.14.2.7 -r 1.14.2.8 src/grouplistdialog.c; cvs diff -u -r 1.8.2.4 -r 1.8.2.5 src/headerview.c; cvs diff -u -r 1.179.2.15 -r 1.179.2.16 src/imap.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/imap_gtk.c; cvs diff -u -r 1.13.2.7 -r 1.13.2.8 src/import.c; cvs diff -u -r 1.14.2.3 -r 1.14.2.4 src/importldif.c; cvs diff -u -r 1.4.12.3 -r 1.4.12.4 src/importmutt.c; cvs diff -u -r 1.1.14.3 -r 1.1.14.4 src/importpine.c; cvs diff -u -r 1.149.2.20 -r 1.149.2.21 src/inc.c; cvs diff -u -r 1.12.2.1 -r 1.12.2.2 src/ldif.c; cvs diff -u -r 1.115.2.27 -r 1.115.2.28 src/main.c; cvs diff -u -r 1.274.2.31 -r 1.274.2.32 src/mainwindow.c; cvs diff -u -r 1.75.2.4 -r 1.75.2.5 src/matcher.c; cvs diff -u -r 1.28.2.3 -r 1.28.2.4 src/mbox.c; cvs diff -u -r 1.3.12.7 -r 1.3.12.8 src/message_search.c; cvs diff -u -r 1.94.2.44 -r 1.94.2.45 src/messageview.c; cvs diff -u -r 1.79.2.7 -r 1.79.2.8 src/mh.c; cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/mh_gtk.c; cvs diff -u -r 1.83.2.28 -r 1.83.2.29 src/mimeview.c; cvs diff -u -r 1.16.2.13 -r 1.16.2.14 src/msgcache.c; cvs diff -u -r 1.101.2.7 -r 1.101.2.8 src/news.c; cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/news_gtk.c; cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/noticeview.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/partial_download.c; cvs diff -u -r 1.56.2.32 -r 1.56.2.33 src/pop.c; cvs diff -u -r 1.105.2.16 -r 1.105.2.17 src/prefs_account.c; cvs diff -u -r 1.60.2.12 -r 1.60.2.13 src/prefs_actions.c; cvs diff -u -r 1.204.2.30 -r 1.204.2.31 src/prefs_common.c; cvs diff -u -r 1.16.2.7 -r 1.16.2.8 src/prefs_customheader.c; cvs diff -u -r 1.16.2.7 -r 1.16.2.8 src/prefs_display_header.c; cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/prefs_ext_prog.c; cvs diff -u -r 1.59.2.14 -r 1.59.2.15 src/prefs_filtering.c; cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/prefs_filtering_action.c; cvs diff -u -r 1.52.2.8 -r 1.52.2.9 src/prefs_folder_item.c; cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/prefs_fonts.c; cvs diff -u -r 1.10.2.11 -r 1.10.2.12 src/prefs_gtk.c; cvs diff -u -r 1.43.2.16 -r 1.43.2.17 src/prefs_matcher.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/prefs_msg_colors.c; cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/prefs_spelling.c; cvs diff -u -r 1.10.2.5 -r 1.10.2.6 src/prefs_summary_column.c; cvs diff -u -r 1.12.2.7 -r 1.12.2.8 src/prefs_template.c; cvs diff -u -r 1.3.2.16 -r 1.3.2.17 src/prefs_themes.c; cvs diff -u -r 1.30.2.9 -r 1.30.2.10 src/prefs_toolbar.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/prefs_wrapping.c; cvs diff -u -r 1.10.2.4 -r 1.10.2.5 src/privacy.c; cvs diff -u -r 1.47.2.14 -r 1.47.2.15 src/procheader.c; cvs diff -u -r 1.49.2.31 -r 1.49.2.32 src/procmime.c; cvs diff -u -r 1.150.2.19 -r 1.150.2.20 src/procmsg.c; cvs diff -u -r 1.8.2.1 -r 1.8.2.2 src/quote_fmt.c; cvs diff -u -r 1.17.2.1 -r 1.17.2.2 src/recv.c; cvs diff -u -r 1.17.2.6 -r 1.17.2.7 src/send_message.c; cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/setup.c; cvs diff -u -r 1.9.2.10 -r 1.9.2.11 src/sourcewindow.c; cvs diff -u -r 1.3.2.7 -r 1.3.2.8 src/ssl_manager.c; cvs diff -u -r 1.5.2.2 -r 1.5.2.3 src/statusbar.c; cvs diff -u -r 1.15.2.13 -r 1.15.2.14 src/summary_search.c; cvs diff -u -r 1.395.2.51 -r 1.395.2.52 src/summaryview.c; cvs diff -u -r 1.96.2.43 -r 1.96.2.44 src/textview.c; cvs diff -u -r 1.43.2.14 -r 1.43.2.15 src/toolbar.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/wizard.c; cvs diff -u -r 1.6.2.4 -r 1.6.2.5 src/common/nntp.c; cvs diff -u -r 1.13.2.2 -r 1.13.2.3 src/common/plugin.c; cvs diff -u -r 1.11.2.7 -r 1.11.2.8 src/common/smtp.c; cvs diff -u -r 1.9.2.6 -r 1.9.2.7 src/common/ssl.c; cvs diff -u -r 1.4 -r 1.5 src/common/ssl_certificate.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/common/string_match.c; cvs diff -u -r 1.7.2.3 -r 1.7.2.4 src/common/sylpheed.c; cvs diff -u -r 1.2.4.4 -r 1.2.4.5 src/common/template.c; cvs diff -u -r 1.36.2.22 -r 1.36.2.23 src/common/utils.c; cvs diff -u -r 1.4.2.6 -r 1.4.2.7 src/gtk/about.c; cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/gtk/colorlabel.c; cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/gtk/description_window.c; cvs diff -u -r 1.2.2.12 -r 1.2.2.13 src/gtk/filesel.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/foldersort.c; cvs diff -u -r 1.9.2.9 -r 1.9.2.10 src/gtk/gtkaspell.c; cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/gtk/gtkutils.c; cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/gtk/inputdialog.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/gtk/logwindow.c; cvs diff -u -r 1.5.2.13 -r 1.5.2.14 src/gtk/menu.c; cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/gtk/pluginwindow.c; cvs diff -u -r 1.12.2.15 -r 1.12.2.16 src/gtk/prefswindow.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/gtk/progressdialog.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/gtk/quicksearch.c; cvs diff -u -r 1.9.2.2 -r 1.9.2.3 src/gtk/sslcertwindow.c; cvs diff -u -r 1.13.2.5 -r 1.13.2.6 src/plugins/clamav/clamav_plugin.c; cvs diff -u -r 1.9.2.5 -r 1.9.2.6 src/plugins/clamav/clamav_plugin_gtk.c; cvs diff -u -r 1.13 -r 1.14 src/plugins/demo/demo.c; cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/plugins/dillo_viewer/dillo_prefs.c; cvs diff -u -r 1.12.2.3 -r 1.12.2.4 src/plugins/dillo_viewer/dillo_viewer.c; cvs diff -u -r 1.8.2.2 -r 1.8.2.3 src/plugins/image_viewer/plugin.c; cvs diff -u -r 1.7.2.9 -r 1.7.2.10 src/plugins/image_viewer/viewer.c; cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/plugins/image_viewer/viewerprefs.c; cvs diff -u -r 1.9.2.2 -r 1.9.2.3 src/plugins/mathml_viewer/mathml_viewer.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpmime/passphrase.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpmime/prefs_gpg.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpmime/select-keys.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpmime/sgpgme.c; cvs diff -u -r 1.18.2.5 -r 1.18.2.6 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.23.2.7 -r 1.23.2.8 src/plugins/spamassassin/spamassassin_gtk.c; cvs diff -u -r 1.14.2.14 -r 1.14.2.15 src/plugins/trayicon/trayicon.c; ) > 1.0.1cvs3.2.patchset
 ( cvs diff -u -r 1.396.2.21 -r 1.396.2.22 ChangeLog; cvs diff -u -r 1.2504.2.47 -r 1.2504.2.48 ChangeLog.claws; cvs diff -u -r 1.391.2.21 -r 1.391.2.22 ChangeLog.jp; cvs diff -u -r 1.654.2.404 -r 1.654.2.405 configure.ac; cvs diff -u -r 1.382.2.97 -r 1.382.2.98 src/compose.c; ) > 1.0.1cvs4.1.patchset
 ( cvs diff -u -r 1.6.2.3 -r 1.6.2.4 po/Makefile.in.in; ) > 1.0.1cvs4.2.patchset
 ( cvs diff -u -r 1.100.2.12 -r 1.100.2.13 AUTHORS; cvs diff -u -r 1.24.2.5 -r 1.24.2.6 Makefile.am; cvs diff -u -r 1.4.2.3 -r 1.4.2.4 autogen.sh; cvs diff -u -r 1.654.2.403 -r 1.654.2.404 configure.ac; cvs diff -u -r 0 -r 1 config/mkinstalldirs; cvs diff -u -r -1.1.16.1 -r -1.1.16.2 intl/.cvsignore; cvs diff -u -r -1.4 -r -1.5 intl/ChangeLog; cvs diff -u -r -1.3 -r -1.4 intl/VERSION; cvs diff -u -r -1.3 -r -1.4 intl/bindtextdom.c; cvs diff -u -r -1.3 -r -1.4 intl/config.charset; cvs diff -u -r -1.3 -r -1.4 intl/dcgettext.c; cvs diff -u -r -1.3 -r -1.4 intl/dcigettext.c; cvs diff -u -r -1.2 -r -1.3 intl/dcngettext.c; cvs diff -u -r -1.3 -r -1.4 intl/dgettext.c; cvs diff -u -r -1.2 -r -1.3 intl/dngettext.c; cvs diff -u -r -1.1 -r -1.2 intl/eval-plural.h; cvs diff -u -r -1.3 -r -1.4 intl/explodename.c; cvs diff -u -r -1.3 -r -1.4 intl/finddomain.c; cvs diff -u -r -1.3 -r -1.4 intl/gettext.c; cvs diff -u -r -1.3 -r -1.4 intl/gettextP.h; cvs diff -u -r -1.1 -r -1.2 intl/gmo.h; cvs diff -u -r -1.3 -r -1.4 intl/hash-string.h; cvs diff -u -r -1.3 -r -1.4 intl/intl-compat.c; cvs diff -u -r -1.3 -r -1.4 intl/l10nflist.c; cvs diff -u -r -1.1 -r -1.2 intl/libgnuintl.h.in; cvs diff -u -r -1.3 -r -1.4 intl/loadinfo.h; cvs diff -u -r -1.3 -r -1.4 intl/loadmsgcat.c; cvs diff -u -r -1.3 -r -1.4 intl/localcharset.c; cvs diff -u -r -1.1 -r -1.2 intl/localcharset.h; cvs diff -u -r -1.2 -r -1.3 intl/locale.alias; cvs diff -u -r -1.3 -r -1.4 intl/localealias.c; cvs diff -u -r -1.1 -r -1.2 intl/localename.c; cvs diff -u -r -1.1 -r -1.2 intl/log.c; cvs diff -u -r -1.2 -r -1.3 intl/ngettext.c; cvs diff -u -r -1.1 -r -1.2 intl/os2compat.c; cvs diff -u -r -1.1 -r -1.2 intl/os2compat.h; cvs diff -u -r -1.1 -r -1.2 intl/osdep.c; cvs diff -u -r -1.1 -r -1.2 intl/plural-exp.c; cvs diff -u -r -1.1 -r -1.2 intl/plural-exp.h; cvs diff -u -r -1.2 -r -1.3 intl/plural.c; cvs diff -u -r -1.2 -r -1.3 intl/plural.y; cvs diff -u -r -1.1 -r -1.2 intl/ref-add.sin; cvs diff -u -r -1.1 -r -1.2 intl/ref-del.sin; cvs diff -u -r -1.1 -r -1.2 intl/relocatable.c; cvs diff -u -r -1.1 -r -1.2 intl/relocatable.h; cvs diff -u -r -1.3 -r -1.4 intl/textdomain.c; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 m4/Makefile.am; cvs diff -u -r 0 -r 1 po/Makefile.in.in; cvs diff -u -r 1.155.2.17 -r 1.155.2.18 src/Makefile.am; cvs diff -u -r 1.61.2.21 -r 1.61.2.22 src/account.c; cvs diff -u -r 1.12.2.19 -r 1.12.2.20 src/action.c; cvs diff -u -r 1.27.2.8 -r 1.27.2.9 src/addr_compl.c; cvs diff -u -r 1.9.2.3 -r 1.9.2.4 src/addressadd.c; cvs diff -u -r 1.60.2.14 -r 1.60.2.15 src/addressbook.c; cvs diff -u -r 1.5.10.6 -r 1.5.10.7 src/addrgather.c; cvs diff -u -r 1.28.2.5 -r 1.28.2.6 src/addrindex.c; cvs diff -u -r 1.17.2.10 -r 1.17.2.11 src/alertpanel.c; cvs diff -u -r 1.2.4.4 -r 1.2.4.5 src/browseldap.c; cvs diff -u -r 1.65.2.22 -r 1.65.2.23 src/codeconv.c; cvs diff -u -r 1.15.2.4 -r 1.15.2.5 src/codeconv.h; cvs diff -u -r 1.382.2.96 -r 1.382.2.97 src/compose.c; cvs diff -u -r 1.50.2.7 -r 1.50.2.8 src/compose.h; cvs diff -u -r 1.23.2.7 -r 1.23.2.8 src/crash.c; cvs diff -u -r 1.14.2.5 -r 1.14.2.6 src/editaddress.c; cvs diff -u -r 1.5.12.2 -r 1.5.12.3 src/editbook.c; cvs diff -u -r 1.11.2.5 -r 1.11.2.6 src/editgroup.c; cvs diff -u -r 1.5.12.2 -r 1.5.12.3 src/editjpilot.c; cvs diff -u -r 1.8.2.3 -r 1.8.2.4 src/editldap.c; cvs diff -u -r 1.10.2.3 -r 1.10.2.4 src/editldap_basedn.c; cvs diff -u -r 1.5.12.2 -r 1.5.12.3 src/editvcard.c; cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/exphtmldlg.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/expldifdlg.c; cvs diff -u -r 1.8.2.6 -r 1.8.2.7 src/export.c; cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/exporthtml.c; cvs diff -u -r 1.60.2.3 -r 1.60.2.4 src/filtering.c; cvs diff -u -r 1.213.2.23 -r 1.213.2.24 src/folder.c; cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/folder_item_prefs.c; cvs diff -u -r 1.26.2.11 -r 1.26.2.12 src/foldersel.c; cvs diff -u -r 1.207.2.29 -r 1.207.2.30 src/folderview.c; cvs diff -u -r 1.14.2.7 -r 1.14.2.8 src/grouplistdialog.c; cvs diff -u -r 1.8.2.4 -r 1.8.2.5 src/headerview.c; cvs diff -u -r 1.179.2.15 -r 1.179.2.16 src/imap.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/imap_gtk.c; cvs diff -u -r 1.13.2.7 -r 1.13.2.8 src/import.c; cvs diff -u -r 1.14.2.3 -r 1.14.2.4 src/importldif.c; cvs diff -u -r 1.4.12.3 -r 1.4.12.4 src/importmutt.c; cvs diff -u -r 1.1.14.3 -r 1.1.14.4 src/importpine.c; cvs diff -u -r 1.149.2.20 -r 1.149.2.21 src/inc.c; cvs diff -u -r 1.12.2.1 -r 1.12.2.2 src/ldif.c; cvs diff -u -r 1.115.2.27 -r 1.115.2.28 src/main.c; cvs diff -u -r 1.274.2.31 -r 1.274.2.32 src/mainwindow.c; cvs diff -u -r 1.75.2.4 -r 1.75.2.5 src/matcher.c; cvs diff -u -r 1.28.2.3 -r 1.28.2.4 src/mbox.c; cvs diff -u -r 1.3.12.7 -r 1.3.12.8 src/message_search.c; cvs diff -u -r 1.94.2.44 -r 1.94.2.45 src/messageview.c; cvs diff -u -r 1.79.2.7 -r 1.79.2.8 src/mh.c; cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/mh_gtk.c; cvs diff -u -r 1.83.2.28 -r 1.83.2.29 src/mimeview.c; cvs diff -u -r 1.16.2.13 -r 1.16.2.14 src/msgcache.c; cvs diff -u -r 1.101.2.7 -r 1.101.2.8 src/news.c; cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/news_gtk.c; cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/noticeview.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/partial_download.c; cvs diff -u -r 1.56.2.32 -r 1.56.2.33 src/pop.c; cvs diff -u -r 1.105.2.16 -r 1.105.2.17 src/prefs_account.c; cvs diff -u -r 1.60.2.12 -r 1.60.2.13 src/prefs_actions.c; cvs diff -u -r 1.204.2.30 -r 1.204.2.31 src/prefs_common.c; cvs diff -u -r 1.16.2.7 -r 1.16.2.8 src/prefs_customheader.c; cvs diff -u -r 1.16.2.7 -r 1.16.2.8 src/prefs_display_header.c; cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/prefs_ext_prog.c; cvs diff -u -r 1.59.2.14 -r 1.59.2.15 src/prefs_filtering.c; cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/prefs_filtering_action.c; cvs diff -u -r 1.52.2.8 -r 1.52.2.9 src/prefs_folder_item.c; cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/prefs_fonts.c; cvs diff -u -r 1.10.2.11 -r 1.10.2.12 src/prefs_gtk.c; cvs diff -u -r 1.43.2.16 -r 1.43.2.17 src/prefs_matcher.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/prefs_msg_colors.c; cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/prefs_spelling.c; cvs diff -u -r 1.10.2.5 -r 1.10.2.6 src/prefs_summary_column.c; cvs diff -u -r 1.12.2.7 -r 1.12.2.8 src/prefs_template.c; cvs diff -u -r 1.3.2.16 -r 1.3.2.17 src/prefs_themes.c; cvs diff -u -r 1.30.2.9 -r 1.30.2.10 src/prefs_toolbar.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/prefs_wrapping.c; cvs diff -u -r 1.10.2.4 -r 1.10.2.5 src/privacy.c; cvs diff -u -r 1.47.2.14 -r 1.47.2.15 src/procheader.c; cvs diff -u -r 1.49.2.31 -r 1.49.2.32 src/procmime.c; cvs diff -u -r 1.150.2.19 -r 1.150.2.20 src/procmsg.c; cvs diff -u -r 1.8.2.1 -r 1.8.2.2 src/quote_fmt.c; cvs diff -u -r 1.17.2.1 -r 1.17.2.2 src/recv.c; cvs diff -u -r 1.17.2.6 -r 1.17.2.7 src/send_message.c; cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/setup.c; cvs diff -u -r 1.9.2.10 -r 1.9.2.11 src/sourcewindow.c; cvs diff -u -r 1.3.2.7 -r 1.3.2.8 src/ssl_manager.c; cvs diff -u -r 1.5.2.2 -r 1.5.2.3 src/statusbar.c; cvs diff -u -r 1.15.2.13 -r 1.15.2.14 src/summary_search.c; cvs diff -u -r 1.395.2.51 -r 1.395.2.52 src/summaryview.c; cvs diff -u -r 1.96.2.43 -r 1.96.2.44 src/textview.c; cvs diff -u -r 1.43.2.14 -r 1.43.2.15 src/toolbar.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/wizard.c; cvs diff -u -r 1.6.2.4 -r 1.6.2.5 src/common/nntp.c; cvs diff -u -r 1.13.2.2 -r 1.13.2.3 src/common/plugin.c; cvs diff -u -r 1.11.2.7 -r 1.11.2.8 src/common/smtp.c; cvs diff -u -r 1.9.2.6 -r 1.9.2.7 src/common/ssl.c; cvs diff -u -r 1.4 -r 1.5 src/common/ssl_certificate.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/common/string_match.c; cvs diff -u -r 1.7.2.3 -r 1.7.2.4 src/common/sylpheed.c; cvs diff -u -r 1.2.4.4 -r 1.2.4.5 src/common/template.c; cvs diff -u -r 1.36.2.22 -r 1.36.2.23 src/common/utils.c; cvs diff -u -r 1.4.2.6 -r 1.4.2.7 src/gtk/about.c; cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/gtk/colorlabel.c; cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/gtk/description_window.c; cvs diff -u -r 1.2.2.12 -r 1.2.2.13 src/gtk/filesel.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/foldersort.c; cvs diff -u -r 1.9.2.9 -r 1.9.2.10 src/gtk/gtkaspell.c; cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/gtk/gtkutils.c; cvs diff -u -r 1.2.2.4 -r 1.2.2.5 src/gtk/inputdialog.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/gtk/logwindow.c; cvs diff -u -r 1.5.2.13 -r 1.5.2.14 src/gtk/menu.c; cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/gtk/pluginwindow.c; cvs diff -u -r 1.12.2.15 -r 1.12.2.16 src/gtk/prefswindow.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/gtk/progressdialog.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/gtk/quicksearch.c; cvs diff -u -r 1.9.2.2 -r 1.9.2.3 src/gtk/sslcertwindow.c; cvs diff -u -r 1.13.2.5 -r 1.13.2.6 src/plugins/clamav/clamav_plugin.c; cvs diff -u -r 1.9.2.5 -r 1.9.2.6 src/plugins/clamav/clamav_plugin_gtk.c; cvs diff -u -r 1.13 -r 1.14 src/plugins/demo/demo.c; cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/plugins/dillo_viewer/dillo_prefs.c; cvs diff -u -r 1.12.2.3 -r 1.12.2.4 src/plugins/dillo_viewer/dillo_viewer.c; cvs diff -u -r 1.8.2.2 -r 1.8.2.3 src/plugins/image_viewer/plugin.c; cvs diff -u -r 1.7.2.9 -r 1.7.2.10 src/plugins/image_viewer/viewer.c; cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/plugins/image_viewer/viewerprefs.c; cvs diff -u -r 1.9.2.2 -r 1.9.2.3 src/plugins/mathml_viewer/mathml_viewer.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpmime/passphrase.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpmime/prefs_gpg.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpmime/select-keys.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpmime/sgpgme.c; cvs diff -u -r 1.18.2.5 -r 1.18.2.6 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.23.2.7 -r 1.23.2.8 src/plugins/spamassassin/spamassassin_gtk.c; cvs diff -u -r 1.14.2.14 -r 1.14.2.15 src/plugins/trayicon/trayicon.c; ) > 1.0.1cvs3.2.patchset
 ( cvs diff -u -r 1.396.2.21 -r 1.396.2.22 ChangeLog; cvs diff -u -r 1.2504.2.47 -r 1.2504.2.48 ChangeLog.claws; cvs diff -u -r 1.391.2.21 -r 1.391.2.22 ChangeLog.jp; cvs diff -u -r 1.654.2.404 -r 1.654.2.405 configure.ac; cvs diff -u -r 1.382.2.97 -r 1.382.2.98 src/compose.c; ) > 1.0.1cvs4.1.patchset
 ( cvs diff -u -r 1.6.2.3 -r 1.6.2.4 po/Makefile.in.in; ) > 1.0.1cvs4.2.patchset

+( cvs diff -u -r 1.382.2.98 -r 1.382.2.99 src/compose.c; ) > 1.0.1cvs4.3.patchset

diff --git a/configure.ac b/configure.ac
index 0ce040e1c29e08998c3cb50d92d107cae0b752f1..60499725b156aa548661e0629d1fcad5167b1e58 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=4
 EXTRA_RELEASE=
 BINARY_AGE=0
 EXTRA_VERSION=4
 EXTRA_RELEASE=

-EXTRA_GTK2_VERSION=.2
+EXTRA_GTK2_VERSION=.3

 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/compose.c b/src/compose.c
index f3789f0ace9144c66362768b676426a700e1dc72..5cc69db67ad3107e2a6162ee7f8be7843dbfdfb7 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -4943,10 +4943,6 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        gtk_text_view_set_editable(GTK_TEXT_VIEW(text), TRUE);
        clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
        gtk_text_buffer_add_selection_clipboard(buffer, clipboard);
        gtk_text_view_set_editable(GTK_TEXT_VIEW(text), TRUE);
        clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
        gtk_text_buffer_add_selection_clipboard(buffer, clipboard);

-       clipboard = gtk_clipboard_get(GDK_SELECTION_SECONDARY);
-       gtk_text_buffer_add_selection_clipboard(buffer, clipboard);
-       clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
-       gtk_text_buffer_add_selection_clipboard(buffer, clipboard);

        
        gtk_container_add(GTK_CONTAINER(scrolledwin), text);
 
        
        gtk_container_add(GTK_CONTAINER(scrolledwin), text);