[Commits] configure.ac 1.654.2.4301 1.654.2.4302 PATCHSETS 1.1.2.4236 1.1.2.4237 ChangeLog 1.396.2.3401 1.396.2.3402
colin at claws-mail.org
colin at claws-mail.org
Fri Oct 7 11:40:16 CEST 2011
Update of /home/claws-mail/claws
In directory claws-mail:/tmp/cvs-serv26650
Modified Files:
Tag: gtk2
configure.ac PATCHSETS ChangeLog
Log Message:
2011-10-07 [colin] 3.7.10cvs21
* configure.ac
* src/action.c
* src/addr_compl.c
* src/addrgather.c
* src/compose.c
* src/compose.h
* src/editldap.c
* src/mainwindow.c
* src/message_search.c
* src/mimeview.c
* src/mimeview.h
* src/prefs_account.c
* src/prefs_compose_writing.c
* src/prefs_filtering_action.c
* src/prefs_folder_item.c
* src/prefs_logging.c
* src/prefs_matcher.c
* src/prefs_message.c
* src/prefs_other.c
* src/prefs_receive.c
* src/prefs_summaries.c
* src/prefs_wrapping.c
* src/printing.c
* src/ssl_manager.c
* src/statusbar.c
* src/stock_pixmap.c
* src/summary_search.c
* src/textview.c
* src/gtk/Makefile.am
* src/gtk/colorlabel.c
* src/gtk/gtkutils.c
* src/gtk/gtkutils.h
* src/gtk/logwindow.c
* src/gtk/menu.c
* src/gtk/menu.h
* src/gtk/quicksearch.c
* src/gtk/spell_entry.c
* src/plugins/bogofilter/bogofilter_gtk.c
* src/plugins/dillo_viewer/dillo_viewer.c
* src/plugins/pgpcore/prefs_gpg.c
* src/plugins/spamassassin/spamassassin_gtk.c
Bug #2371, "Port to GTK+ 3.0". Third patch from Hanno, starting
the real job. GtkCMOptionMenu and GTKHSRuler disabled, should be
ported (especially GtkCMOptionMenu)
Index: configure.ac
===================================================================
RCS file: /home/claws-mail/claws/configure.ac,v
retrieving revision 1.654.2.4301
retrieving revision 1.654.2.4302
diff -u -d -r1.654.2.4301 -r1.654.2.4302
--- configure.ac 7 Oct 2011 09:17:47 -0000 1.654.2.4301
+++ configure.ac 7 Oct 2011 09:40:12 -0000 1.654.2.4302
@@ -12,7 +12,7 @@
MICRO_VERSION=10
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=20
+EXTRA_VERSION=21
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
@@ -157,7 +157,7 @@
CFLAGS="$CFLAGS -Wall"
#if test $USE_MAINTAINER_MODE = yes; then
-# CFLAGS="-g -Wall -Wno-pointer-sign -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES"
+# CFLAGS="-g -Wall -Wno-pointer-sign -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDESi -DGDK_PIXBUF_DISABLE_DEPRECATED -DGSEAL_ENABLE"
#fi
pthread_name=
@@ -464,11 +464,21 @@
dnl ************************
dnl Checks for GTK
-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10)
+AC_ARG_ENABLE(gtk3,
+ AS_HELP_STRING([--enable-gtk3],
+ [Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+ 3.0 is available.]),
+ [ac_cv_enable_gtk3=$enableval],[ac_cv_enable_gtk3=no])
+if test x"$ac_cv_enable_gtk3" = x"yes"; then
+ PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 cairo)
+ AC_SUBST(GTK3, 1)
+else
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10)
+ AC_SUBST(GTK2, 1)
dnl --disable-deprecated switch for GTK2 purification
AC_ARG_ENABLE(deprecated, [ --disable-deprecated disable deprecated GTK functions. ],
[GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], [])
+fi
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
Index: PATCHSETS
===================================================================
RCS file: /home/claws-mail/claws/PATCHSETS,v
retrieving revision 1.1.2.4236
retrieving revision 1.1.2.4237
diff -u -d -r1.1.2.4236 -r1.1.2.4237
--- PATCHSETS 7 Oct 2011 09:17:46 -0000 1.1.2.4236
+++ PATCHSETS 7 Oct 2011 09:40:13 -0000 1.1.2.4237
@@ -4224,3 +4224,4 @@
( cvs diff -u -r 1.9.2.49 -r 1.9.2.50 src/common/ssl.c; ) > 3.7.10cvs18.patchset
( cvs diff -u -r 1.100.2.79 -r 1.100.2.80 AUTHORS; cvs diff -u -r 1.61.2.98 -r 1.61.2.99 src/account.c; cvs diff -u -r 1.12.2.66 -r 1.12.2.67 src/action.c; cvs diff -u -r 1.27.2.53 -r 1.27.2.54 src/addr_compl.c; cvs diff -u -r 1.60.2.143 -r 1.60.2.144 src/addressbook.c; cvs diff -u -r 1.17.2.43 -r 1.17.2.44 src/alertpanel.c; cvs diff -u -r 1.382.2.580 -r 1.382.2.581 src/compose.c; cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/edittags.c; cvs diff -u -r 1.207.2.220 -r 1.207.2.221 src/folderview.c; cvs diff -u -r 1.14.2.28 -r 1.14.2.29 src/grouplistdialog.c; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/image_viewer.c; cvs diff -u -r 1.274.2.328 -r 1.274.2.329 src/mainwindow.c; cvs diff -u -r 1.83.2.170 -r 1.83.2.171 src/mimeview.c; cvs diff -u -r 1.5.2.25 -r 1.5.2.26 src/noticeview.c; cvs diff -u -r 1.1.4.69 -r 1.1.4.70 src/prefs_filtering_action.c; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/prefs_folder_column.c; cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/prefs_msg_colors.c; cvs diff -u -r 1.10.2.27 -r 1.10.2.28 src/prefs_summary_column.c; cvs diff -u -r 1.30.2.67 -r 1.30.2.68 src/prefs_toolbar.c; cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/printing.c; cvs diff -u -r 1.25.2.68 -r 1.25.2.69 src/stock_pixmap.c; cvs diff -u -r 1.395.2.430 -r 1.395.2.431 src/summaryview.c; cvs diff -u -r 1.96.2.232 -r 1.96.2.233 src/textview.c; cvs diff -u -r 1.13.2.22 -r 1.13.2.23 src/undo.c; cvs diff -u -r 1.1.2.84 -r 1.1.2.85 src/wizard.c; cvs diff -u -r 1.4.2.79 -r 1.4.2.80 src/gtk/about.c; cvs diff -u -r 1.1.2.73 -r 1.1.2.74 src/gtk/authors.h; cvs diff -u -r 1.2.2.33 -r 1.2.2.34 src/gtk/colorlabel.c; cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/gtk/colorsel.c; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/gtk/gtkcmclist.c; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/gtk/gtkcmctree.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/gtkcmoptionmenu.c; cvs diff -u -r 1.1.4.60 -r 1.1.4.61 src/gtk/gtksctree.c; cvs diff -u -r 1.5.2.95 -r 1.5.2.96 src/gtk/gtkutils.c; cvs diff -u -r 1.5.2.21 -r 1.5.2.22 src/gtk/gtkvscrollbutton.c; cvs diff -u -r 1.2.2.42 -r 1.2.2.43 src/gtk/inputdialog.c; cvs diff -u -r 1.1.4.37 -r 1.1.4.38 src/gtk/logwindow.c; cvs diff -u -r 1.5.2.42 -r 1.5.2.43 src/gtk/menu.c; cvs diff -u -r 1.12.2.56 -r 1.12.2.57 src/gtk/prefswindow.c; cvs diff -u -r 1.1.4.27 -r 1.1.4.28 src/gtk/progressdialog.c; cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/plugins/pgpcore/passphrase.c; cvs diff -u -r 1.14.2.77 -r 1.14.2.78 src/plugins/trayicon/trayicon.c; ) > 3.7.10cvs19.patchset
( cvs diff -u -r 1.61.2.99 -r 1.61.2.100 src/account.c; cvs diff -u -r 1.12.2.67 -r 1.12.2.68 src/action.c; cvs diff -u -r 1.27.2.54 -r 1.27.2.55 src/addr_compl.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/addrcustomattr.c; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/addrduplicates.c; cvs diff -u -r 1.9.2.32 -r 1.9.2.33 src/addressadd.c; cvs diff -u -r 1.60.2.144 -r 1.60.2.145 src/addressbook.c; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/addressbook_foldersel.c; cvs diff -u -r 1.5.10.33 -r 1.5.10.34 src/addrgather.c; cvs diff -u -r 1.17.2.44 -r 1.17.2.45 src/alertpanel.c; cvs diff -u -r 1.2.4.26 -r 1.2.4.27 src/browseldap.c; cvs diff -u -r 1.382.2.581 -r 1.382.2.582 src/compose.c; cvs diff -u -r 1.14.2.60 -r 1.14.2.61 src/editaddress.c; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/editaddress_other_attributes_ldap.c; cvs diff -u -r 1.5.12.16 -r 1.5.12.17 src/editbook.c; cvs diff -u -r 1.11.2.26 -r 1.11.2.27 src/editgroup.c; cvs diff -u -r 1.5.12.18 -r 1.5.12.19 src/editjpilot.c; cvs diff -u -r 1.8.2.40 -r 1.8.2.41 src/editldap.c; cvs diff -u -r 1.10.2.18 -r 1.10.2.19 src/editldap_basedn.c; cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/edittags.c; cvs diff -u -r 1.5.12.17 -r 1.5.12.18 src/editvcard.c; cvs diff -u -r 1.3.2.28 -r 1.3.2.29 src/exphtmldlg.c; cvs diff -u -r 1.1.4.33 -r 1.1.4.34 src/expldifdlg.c; cvs diff -u -r 1.8.2.31 -r 1.8.2.32 src/export.c; cvs diff -u -r 1.26.2.46 -r 1.26.2.47 src/foldersel.c; cvs diff -u -r 1.207.2.221 -r 1.207.2.222 src/folderview.c; cvs diff -u -r 1.14.2.29 -r 1.14.2.30 src/grouplistdialog.c; cvs diff -u -r 1.13.2.30 -r 1.13.2.31 src/import.c; cvs diff -u -r 1.14.2.26 -r 1.14.2.27 src/importldif.c; cvs diff -u -r 1.4.12.22 -r 1.4.12.23 src/importmutt.c; cvs diff -u -r 1.1.14.22 -r 1.1.14.23 src/importpine.c; cvs diff -u -r 1.274.2.329 -r 1.274.2.330 src/mainwindow.c; cvs diff -u -r 1.3.12.39 -r 1.3.12.40 src/message_search.c; cvs diff -u -r 1.94.2.218 -r 1.94.2.219 src/messageview.c; cvs diff -u -r 1.83.2.171 -r 1.83.2.172 src/mimeview.c; cvs diff -u -r 1.60.2.73 -r 1.60.2.74 src/prefs_actions.c; cvs diff -u -r 1.16.2.41 -r 1.16.2.42 src/prefs_customheader.c; cvs diff -u -r 1.16.2.43 -r 1.16.2.44 src/prefs_display_header.c; cvs diff -u -r 1.59.2.82 -r 1.59.2.83 src/prefs_filtering.c; cvs diff -u -r 1.1.4.70 -r 1.1.4.71 src/prefs_filtering_action.c; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/prefs_folder_column.c; cvs diff -u -r 1.43.2.89 -r 1.43.2.90 src/prefs_matcher.c; cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/prefs_msg_colors.c; cvs diff -u -r 1.1.2.41 -r 1.1.2.42 src/prefs_other.c; cvs diff -u -r 1.1.2.66 -r 1.1.2.67 src/prefs_summaries.c; cvs diff -u -r 1.10.2.28 -r 1.10.2.29 src/prefs_summary_column.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/prefs_summary_open.c; cvs diff -u -r 1.12.2.75 -r 1.12.2.76 src/prefs_template.c; cvs diff -u -r 1.30.2.68 -r 1.30.2.69 src/prefs_toolbar.c; cvs diff -u -r 1.1.2.32 -r 1.1.2.33 src/printing.c; cvs diff -u -r 1.9.2.26 -r 1.9.2.27 src/sourcewindow.c; cvs diff -u -r 1.3.2.35 -r 1.3.2.36 src/ssl_manager.c; cvs diff -u -r 1.15.2.65 -r 1.15.2.66 src/summary_search.c; cvs diff -u -r 1.395.2.431 -r 1.395.2.432 src/summaryview.c; cvs diff -u -r 1.96.2.233 -r 1.96.2.234 src/textview.c; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/uri_opener.c; cvs diff -u -r 1.4.2.80 -r 1.4.2.81 src/gtk/about.c; cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/gtk/colorsel.c; cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/gtk/combobox.c; cvs diff -u -r 1.5.2.31 -r 1.5.2.32 src/gtk/description_window.c; cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/gtk/foldersort.c; cvs diff -u -r 1.9.2.72 -r 1.9.2.73 src/gtk/gtkaspell.c; cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/gtk/gtkcmclist.c; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/gtk/gtkcmctree.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/gtkcmoptionmenu.c; cvs diff -u -r 1.5.2.96 -r 1.5.2.97 src/gtk/gtkutils.c; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/gtk/icon_legend.c; cvs diff -u -r 1.2.2.43 -r 1.2.2.44 src/gtk/inputdialog.c; cvs diff -u -r 1.1.4.38 -r 1.1.4.39 src/gtk/logwindow.c; cvs diff -u -r 1.5.2.59 -r 1.5.2.60 src/gtk/pluginwindow.c; cvs diff -u -r 1.12.2.57 -r 1.12.2.58 src/gtk/prefswindow.c; cvs diff -u -r 1.1.2.103 -r 1.1.2.104 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/plugins/pgpcore/passphrase.c; cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/plugins/pgpcore/select-keys.c; ) > 3.7.10cvs20.patchset
+( cvs diff -u -r 1.654.2.4301 -r 1.654.2.4302 configure.ac; cvs diff -u -r 1.12.2.68 -r 1.12.2.69 src/action.c; cvs diff -u -r 1.27.2.55 -r 1.27.2.56 src/addr_compl.c; cvs diff -u -r 1.5.10.34 -r 1.5.10.35 src/addrgather.c; cvs diff -u -r 1.382.2.582 -r 1.382.2.583 src/compose.c; cvs diff -u -r 1.50.2.62 -r 1.50.2.63 src/compose.h; cvs diff -u -r 1.8.2.41 -r 1.8.2.42 src/editldap.c; cvs diff -u -r 1.274.2.330 -r 1.274.2.331 src/mainwindow.c; cvs diff -u -r 1.3.12.40 -r 1.3.12.41 src/message_search.c; cvs diff -u -r 1.83.2.172 -r 1.83.2.173 src/mimeview.c; cvs diff -u -r 1.20.2.32 -r 1.20.2.33 src/mimeview.h; cvs diff -u -r 1.105.2.168 -r 1.105.2.169 src/prefs_account.c; cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/prefs_compose_writing.c; cvs diff -u -r 1.1.4.71 -r 1.1.4.72 src/prefs_filtering_action.c; cvs diff -u -r 1.52.2.83 -r 1.52.2.84 src/prefs_folder_item.c; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/prefs_logging.c; cvs diff -u -r 1.43.2.90 -r 1.43.2.91 src/prefs_matcher.c; cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/prefs_message.c; cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/prefs_other.c; cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/prefs_receive.c; cvs diff -u -r 1.1.2.67 -r 1.1.2.68 src/prefs_summaries.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/prefs_wrapping.c; cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/printing.c; cvs diff -u -r 1.3.2.36 -r 1.3.2.37 src/ssl_manager.c; cvs diff -u -r 1.5.2.29 -r 1.5.2.30 src/statusbar.c; cvs diff -u -r 1.25.2.69 -r 1.25.2.70 src/stock_pixmap.c; cvs diff -u -r 1.15.2.66 -r 1.15.2.67 src/summary_search.c; cvs diff -u -r 1.96.2.234 -r 1.96.2.235 src/textview.c; cvs diff -u -r 1.20.2.24 -r 1.20.2.25 src/gtk/Makefile.am; cvs diff -u -r 1.2.2.34 -r 1.2.2.35 src/gtk/colorlabel.c; cvs diff -u -r 1.5.2.97 -r 1.5.2.98 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.57 -r 1.4.2.58 src/gtk/gtkutils.h; cvs diff -u -r 1.1.4.39 -r 1.1.4.40 src/gtk/logwindow.c; cvs diff -u -r 1.5.2.43 -r 1.5.2.44 src/gtk/menu.c; cvs diff -u -r 1.4.2.24 -r 1.4.2.25 src/gtk/menu.h; cvs diff -u -r 1.1.2.104 -r 1.1.2.105 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/spell_entry.c; cvs diff -u -r 1.1.2.38 -r 1.1.2.39 src/plugins/bogofilter/bogofilter_gtk.c; cvs diff -u -r 1.12.2.29 -r 1.12.2.30 src/plugins/dillo_viewer/dillo_viewer.c; cvs diff -u -r 1.1.2.34 -r 1.1.2.35 src/plugins/pgpcore/prefs_gpg.c; cvs diff -u -r 1.23.2.55 -r 1.23.2.56 src/plugins/spamassassin/spamassassin_gtk.c; ) > 3.7.10cvs21.patchset
Index: ChangeLog
===================================================================
RCS file: /home/claws-mail/claws/ChangeLog,v
retrieving revision 1.396.2.3401
retrieving revision 1.396.2.3402
diff -u -d -r1.396.2.3401 -r1.396.2.3402
--- ChangeLog 7 Oct 2011 09:17:47 -0000 1.396.2.3401
+++ ChangeLog 7 Oct 2011 09:40:13 -0000 1.396.2.3402
@@ -1,3 +1,50 @@
+2011-10-07 [colin] 3.7.10cvs21
+
+ * configure.ac
+ * src/action.c
+ * src/addr_compl.c
+ * src/addrgather.c
+ * src/compose.c
+ * src/compose.h
+ * src/editldap.c
+ * src/mainwindow.c
+ * src/message_search.c
+ * src/mimeview.c
+ * src/mimeview.h
+ * src/prefs_account.c
+ * src/prefs_compose_writing.c
+ * src/prefs_filtering_action.c
+ * src/prefs_folder_item.c
+ * src/prefs_logging.c
+ * src/prefs_matcher.c
+ * src/prefs_message.c
+ * src/prefs_other.c
+ * src/prefs_receive.c
+ * src/prefs_summaries.c
+ * src/prefs_wrapping.c
+ * src/printing.c
+ * src/ssl_manager.c
+ * src/statusbar.c
+ * src/stock_pixmap.c
+ * src/summary_search.c
+ * src/textview.c
+ * src/gtk/Makefile.am
+ * src/gtk/colorlabel.c
+ * src/gtk/gtkutils.c
+ * src/gtk/gtkutils.h
+ * src/gtk/logwindow.c
+ * src/gtk/menu.c
+ * src/gtk/menu.h
+ * src/gtk/quicksearch.c
+ * src/gtk/spell_entry.c
+ * src/plugins/bogofilter/bogofilter_gtk.c
+ * src/plugins/dillo_viewer/dillo_viewer.c
+ * src/plugins/pgpcore/prefs_gpg.c
+ * src/plugins/spamassassin/spamassassin_gtk.c
+ Bug #2371, "Port to GTK+ 3.0". Third patch from Hanno, starting
+ the real job. GtkCMOptionMenu and GTKHSRuler disabled, should be
+ ported (especially GtkCMOptionMenu)
+
2011-10-07 [colin] 3.7.10cvs20
* src/account.c
More information about the Commits
mailing list