[Commits] AUTHORS 1.100.2.79 1.100.2.79.2.1 ChangeLog 1.396.2.3397.2.2 1.396.2.3397.2.3 PATCHSETS 1.1.2.4232.2.2 1.1.2.4232.2.3 configure.ac 1.654.2.4297.2.2 1.654.2.4297.2.3

miras at claws-mail.org miras at claws-mail.org
Tue Nov 29 01:14:05 CET 2011


Update of /home/claws-mail/claws
In directory claws-mail:/tmp/cvs-serv12914

Modified Files:
      Tag: new-contacts
	AUTHORS ChangeLog PATCHSETS configure.ac 
Log Message:
2011-11-29 [mir]	3.7.10cvs16.4-new-contacts

	* AUTHORS
	* configure.ac
	* doc/man/claws-mail.1
	* manual/advanced.xml
	* manual/es/advanced.xml
	* po/bg.po
	* po/ca.po
	* po/cs.po
	* po/de.po
	* po/en_GB.po
	* po/es.po
	* po/fi.po
	* po/fr.po
	* po/hu.po
	* po/id.po
	* po/it.po
	* po/ja.po
	* po/lt.po
	* po/nl.po
	* po/pl.po
	* po/pt_BR.po
	* po/pt_PT.po
	* po/ru.po
	* po/sk.po
	* po/sv.po
	* po/uk.po
	* po/zh_CN.po
	* src/account.c
	* src/action.c
	* src/addr_compl.c
	* src/addrbook.c
	* src/addrbook.h
	* src/addrcustomattr.c
	* src/addrduplicates.c
	* src/addressadd.c
	* src/addressbook.c
	* src/addressbook_foldersel.c
	* src/addrgather.c
	* src/alertpanel.c
	* src/browseldap.c
	* src/codeconv.c
	* src/compose.c
	* src/editaddress.c
	* src/editaddress_other_attributes_ldap.c
	* src/editbook.c
	* src/editgroup.c
	* src/editjpilot.c
	* src/editldap.c
	* src/editldap_basedn.c
	* src/edittags.c
	* src/editvcard.c
	* src/exphtmldlg.c
	* src/expldifdlg.c
	* src/export.c
	* src/exportldif.c
	* src/filtering.c
	* src/filtering.h
	* src/folder.c
	* src/folder.h
	* src/folder_item_prefs.c
	* src/foldersel.c
	* src/folderview.c
	* src/grouplistdialog.c
	* src/headerview.c
	* src/image_viewer.c
	* src/imap_gtk.c
	* src/import.c
	* src/importldif.c
	* src/importmutt.c
	* src/importpine.c
	* src/jpilot.c
	* src/ldif.c
	* src/main.c
	* src/mainwindow.c
	* src/mainwindow.h
	* src/message_search.c
	* src/messageview.c
	* src/mh_gtk.c
	* src/mimeview.c
	* src/mimeview.h
	* src/mutt.c
	* src/news.c
	* src/noticeview.c
	* src/pine.c
	* src/prefs_account.c
	* src/prefs_actions.c
	* src/prefs_actions.h
	* src/prefs_common.c
	* src/prefs_common.h
	* src/prefs_compose_writing.c
	* src/prefs_customheader.c
	* src/prefs_display_header.c
	* src/prefs_ext_prog.c
	* src/prefs_filtering.c
	* src/prefs_filtering_action.c
	* src/prefs_folder_column.c
	* src/prefs_folder_item.c
	* src/prefs_image_viewer.c
	* src/prefs_logging.c
	* src/prefs_matcher.c
	* src/prefs_message.c
	* src/prefs_msg_colors.c
	* src/prefs_other.c
	* src/prefs_receive.c
	* src/prefs_send.c
	* src/prefs_spelling.c
	* src/prefs_summaries.c
	* src/prefs_summary_column.c
	* src/prefs_summary_open.c
	* src/prefs_template.c
	* src/prefs_toolbar.c
	* src/prefs_wrapping.c
	* src/printing.c
	* src/procheader.c
	* src/procheader.h
	* src/procmsg.c
	* src/procmsg.h
	* src/quote_fmt.c
	* src/send_message.c
	* src/sourcewindow.c
	* src/ssl_manager.c
	* src/statusbar.c
	* src/stock_pixmap.c
	* src/summary_search.c
	* src/summaryview.c
	* src/summaryview.h
	* src/textview.c
	* src/textview.h
	* src/undo.c
	* src/uri_opener.c
	* src/vcard.c
	* src/wizard.c
	* src/common/defs.h
	* src/common/ssl.c
	* src/gtk/Makefile.am
	* src/gtk/about.c
	* src/gtk/authors.h
	* src/gtk/colorlabel.c
	* src/gtk/colorsel.c
	* src/gtk/combobox.c
	* src/gtk/description_window.c
	* src/gtk/foldersort.c
	* src/gtk/gtkaspell.c
	* src/gtk/gtkaspell.h
	* src/gtk/gtkcmclist.c
	* src/gtk/gtkcmclist.h
	* src/gtk/gtkcmctree.c
	* src/gtk/gtkcmctree.h
	* src/gtk/gtkcmoptionmenu.c
	* src/gtk/gtksctree.c
	* src/gtk/gtkshruler.c
	* src/gtk/gtkshruler.h
	* src/gtk/gtkutils.c
	* src/gtk/gtkutils.h
	* src/gtk/gtkvscrollbutton.c
	* src/gtk/icon_legend.c
	* src/gtk/inputdialog.c
	* src/gtk/logwindow.c
	* src/gtk/menu.c
	* src/gtk/menu.h
	* src/gtk/pluginwindow.c
	* src/gtk/prefswindow.c
	* src/gtk/progressdialog.c
	* src/gtk/quicksearch.c
	* src/gtk/spell_entry.c
	* src/plugins/bogofilter/bogofilter_gtk.c
	* src/plugins/dillo_viewer/dillo_prefs.c
	* src/plugins/dillo_viewer/dillo_viewer.c
	* src/plugins/pgpcore/passphrase.c
	* src/plugins/pgpcore/prefs_gpg.c
	* src/plugins/pgpcore/select-keys.c
	* src/plugins/spamassassin/spamassassin_gtk.c
	* src/plugins/trayicon/trayicon.c
	* src/plugins/trayicon/trayicon_prefs.c
	    Applied patch 3.7.10cvs17 to 3.7.10cvs106 from the
	    gtk2 branch making new-addressbook branch in sync
	    with head. 

Index: configure.ac
===================================================================
RCS file: /home/claws-mail/claws/configure.ac,v
retrieving revision 1.654.2.4297.2.2
retrieving revision 1.654.2.4297.2.3
diff -u -d -r1.654.2.4297.2.2 -r1.654.2.4297.2.3
--- configure.ac	7 Sep 2011 15:52:23 -0000	1.654.2.4297.2.2
+++ configure.ac	29 Nov 2011 00:14:03 -0000	1.654.2.4297.2.3
@@ -12,7 +12,7 @@
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=16.3
+EXTRA_VERSION=16.4
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=-new-contacts
 
@@ -158,7 +158,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_INCLUDES -DGDK_PIXBUF_DISABLE_DEPRECATED -DGSEAL_ENABLE"
 #fi
 
 pthread_name=
@@ -183,6 +183,9 @@
 dnl Checks for iconv
 AM_ICONV
 
+dnl floor and ceil are  in -lm
+LIBS="$LIBS -lm"
+
 dnl
 dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
 dnl
@@ -465,12 +468,23 @@
 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.]),
+		[ac_cv_enable_gtk3=$enableval],[ac_cv_enable_gtk3=no])
+AM_CONDITIONAL(GTK3, false)
+AM_CONDITIONAL(GTK2, true)
+if test x"$ac_cv_enable_gtk3" = x"yes"; then
+	PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0 cairo)
+	AM_CONDITIONAL(GTK3, true)
+	AM_CONDITIONAL(GTK2, false)
+else
+	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18)
 
-dnl --disable-deprecated switch for GTK2 purification
-AC_ARG_ENABLE(deprecated, [  --disable-deprecated  disable deprecated GTK functions. ],
+	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: AUTHORS
===================================================================
RCS file: /home/claws-mail/claws/AUTHORS,v
retrieving revision 1.100.2.79
retrieving revision 1.100.2.79.2.1
diff -u -d -r1.100.2.79 -r1.100.2.79.2.1
--- AUTHORS	31 Aug 2011 16:54:51 -0000	1.100.2.79
+++ AUTHORS	29 Nov 2011 00:14:02 -0000	1.100.2.79.2.1
@@ -285,3 +285,5 @@
 	Sebastien Bigaret
 	Mikhail Efremov
 	Steve Rader
+	Hanno Meyer-Thurow
+	Bodo Graumann

Index: PATCHSETS
===================================================================
RCS file: /home/claws-mail/claws/PATCHSETS,v
retrieving revision 1.1.2.4232.2.2
retrieving revision 1.1.2.4232.2.3
diff -u -d -r1.1.2.4232.2.2 -r1.1.2.4232.2.3
--- PATCHSETS	7 Sep 2011 15:52:22 -0000	1.1.2.4232.2.2
+++ PATCHSETS	29 Nov 2011 00:14:02 -0000	1.1.2.4232.2.3
@@ -4222,3 +4222,4 @@
 ( cvs diff -u -r 1.9.2.48 -r 1.9.2.49 src/common/ssl.c;  ) > 3.7.10cvs16.patchset
 ( cvs diff -u -r 1.654.2.4297 -r 1.654.2.4298 configure.ac;  cvs diff -u -r 1.1.2.39 -r 1.1.2.40 commitHelper;  ) > 3.7.10cvs16.2-new-contacts.patchset
 ( cvs diff -u -r 1.654.2.4297.2.1 -r 1.654.2.4297.2.2 configure.ac;  cvs diff -u -r 1.155.2.97 -r 1.155.2.98 src/Makefile.am;  cvs diff -u -r 1.27.2.53 -r 1.27.2.54 src/addr_compl.c;  cvs diff -u -r 1.9.2.32 -r 1.9.2.33 src/addressadd.c;  cvs diff -u -r 1.2.16.8 -r 1.2.16.9 src/addressadd.h;  diff -u /dev/null src/addressbook-dbus.c;  diff -u /dev/null src/addressbook-dbus.h;  cvs diff -u -r 1.5.10.33 -r 1.5.10.34 src/addrgather.c;  cvs diff -u -r 1.3.12.7 -r 1.3.12.8 src/addrgather.h;  cvs diff -u -r 1.6.10.25 -r 1.6.10.26 src/addrharvest.c;  cvs diff -u -r 1.4.12.8 -r 1.4.12.9 src/addrharvest.h;  diff -u /dev/null src/claws-contacts.xml;  cvs diff -u -r 1.382.2.580 -r 1.382.2.581 src/compose.c;  cvs diff -u -r 1.50.2.62 -r 1.50.2.63 src/compose.h;  cvs diff -u -r 1.60.2.57 -r 1.60.2.58 src/filtering.c;  cvs diff -u -r 1.8.2.33 -r 1.8.2.34 src/headerview.c;  cvs diff -u -r 1.115.2.239 -r 1.115.2.240 src/main.c;  cvs diff -u -r 1.274.2.328 -r 1.274.2.329 src/mainwindow.c;  cvs diff -u -r 1.94.2.218 -r 1.94.2.219 src/messageview.c;  cvs diff -u -r 1.204.2.202 -r 1.204.2.203 src/prefs_common.c;  cvs diff -u -r 1.1.4.69 -r 1.1.4.70 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.89 -r 1.43.2.90 src/prefs_matcher.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.43.2.124 -r 1.43.2.125 src/toolbar.c;  cvs diff -u -r 1.14.2.77 -r 1.14.2.78 src/plugins/trayicon/trayicon.c;  ) > 3.7.10cvs16.3-new-contacts.patchset
+( cvs diff -u -r 1.100.2.79 -r 1.100.2.80 AUTHORS;  cvs diff -u -r 1.654.2.4297.2.2 -r 1.654.2.4297.2.3 configure.ac;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 doc/man/claws-mail.1;  cvs diff -u -r 1.1.2.57 -r 1.1.2.58 manual/advanced.xml;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 manual/es/advanced.xml;  cvs diff -u -r 1.21.2.9 -r 1.21.2.10 po/bg.po;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 po/ca.po;  cvs diff -u -r 1.9.2.23 -r 1.9.2.24 po/cs.po;  cvs diff -u -r 1.58.2.49 -r 1.58.2.50 po/de.po;  cvs diff -u -r 1.12.2.18 -r 1.12.2.19 po/en_GB.po;  cvs diff -u -r 1.60.2.63 -r 1.60.2.64 po/es.po;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 po/fi.po;  cvs diff -u -r 1.42.2.55 -r 1.42.2.56 po/fr.po;  cvs diff -u -r 1.5.2.20 -r 1.5.2.21 po/hu.po;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 po/id.po;  cvs diff -u -r 1.34.2.30 -r 1.34.2.31 po/it.po;  cvs diff -u -r 1.16.2.12 -r 1.16.2.13 po/ja.po;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 po/lt.po;  cvs diff -u -r 1.28.2.15 -r 1.28.2.16 po/nl.po;  cvs diff -u -r 1.10.2.18 -r 1.10.2.19 po/pl.po;  cvs diff -u -r 1.50.2.42 -r 1.50.2.43 po/pt_BR.po;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 po/pt_PT.po;  cvs diff -u -r 1.17.2.21 -r 1.17.2.22 po/ru.po;  cvs diff -u -r 1.2.2.34 -r 1.2.2.35 po/sk.po;  cvs diff -u -r 1.4.2.11 -r 1.4.2.12 po/sv.po;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 po/uk.po;  cvs diff -u -r 1.5.2.30 -r 1.5.2.31 po/zh_CN.po;  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.2.1 -r 1.27.2.53.2.2 src/addr_compl.c;  cvs diff -u -r 1.22.2.24 -r 1.22.2.25 src/addrbook.c;  cvs diff -u -r 1.7.2.4 -r 1.7.2.5 src/addrbook.h;  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.2.1 -r 1.9.2.32.2.2 src/addressadd.c;  cvs diff -u -r 1.60.2.143 -r 1.60.2.144 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.2.1 -r 1.5.10.33.2.2 src/addrgather.c;  cvs diff -u -r 1.17.2.43 -r 1.17.2.44 src/alertpanel.c;  cvs diff -u -r 1.2.4.26 -r 1.2.4.27 src/browseldap.c;  cvs diff -u -r 1.65.2.73 -r 1.65.2.74 src/codeconv.c;  cvs diff -u -r 1.382.2.580.2.1 -r 1.382.2.580.2.2 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.24 -r 1.1.2.25 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.1.4.22 -r 1.1.4.23 src/exportldif.c;  cvs diff -u -r 1.60.2.57.2.1 -r 1.60.2.57.2.2 src/filtering.c;  cvs diff -u -r 1.21.2.19 -r 1.21.2.20 src/filtering.h;  cvs diff -u -r 1.213.2.202 -r 1.213.2.203 src/folder.c;  cvs diff -u -r 1.87.2.64 -r 1.87.2.65 src/folder.h;  cvs diff -u -r 1.2.2.37 -r 1.2.2.38 src/folder_item_prefs.c;  cvs diff -u -r 1.26.2.46 -r 1.26.2.47 src/foldersel.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.8.2.33.2.1 -r 1.8.2.33.2.2 src/headerview.c;  cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/image_viewer.c;  cvs diff -u -r 1.1.2.66 -r 1.1.2.67 src/imap_gtk.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.18.2.32 -r 1.18.2.33 src/jpilot.c;  cvs diff -u -r 1.12.2.23 -r 1.12.2.24 src/ldif.c;  cvs diff -u -r 1.115.2.239.2.1 -r 1.115.2.239.2.2 src/main.c;  cvs diff -u -r 1.274.2.328.2.1 -r 1.274.2.328.2.2 src/mainwindow.c;  cvs diff -u -r 1.39.2.61 -r 1.39.2.62 src/mainwindow.h;  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.2.1 -r 1.94.2.218.2.2 src/messageview.c;  cvs diff -u -r 1.2.2.39 -r 1.2.2.40 src/mh_gtk.c;  cvs diff -u -r 1.83.2.170 -r 1.83.2.171 src/mimeview.c;  cvs diff -u -r 1.20.2.32 -r 1.20.2.33 src/mimeview.h;  cvs diff -u -r 1.6.10.18 -r 1.6.10.19 src/mutt.c;  cvs diff -u -r 1.101.2.67 -r 1.101.2.68 src/news.c;  cvs diff -u -r 1.5.2.25 -r 1.5.2.26 src/noticeview.c;  cvs diff -u -r 1.6.2.17 -r 1.6.2.18 src/pine.c;  cvs diff -u -r 1.105.2.168 -r 1.105.2.169 src/prefs_account.c;  cvs diff -u -r 1.60.2.73 -r 1.60.2.74 src/prefs_actions.c;  cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/prefs_actions.h;  cvs diff -u -r 1.204.2.202.2.1 -r 1.204.2.202.2.2 src/prefs_common.c;  cvs diff -u -r 1.103.2.133 -r 1.103.2.134 src/prefs_common.h;  cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/prefs_compose_writing.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.3.2.26 -r 1.3.2.27 src/prefs_ext_prog.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.69.2.1 -r 1.1.4.69.2.2 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.52.2.83 -r 1.52.2.84 src/prefs_folder_item.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_image_viewer.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.89.2.1 -r 1.43.2.89.2.2 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_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.28 -r 1.1.2.29 src/prefs_receive.c;  cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/prefs_send.c;  cvs diff -u -r 1.5.2.42 -r 1.5.2.43 src/prefs_spelling.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.27 -r 1.10.2.28 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.67 -r 1.30.2.68 src/prefs_toolbar.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.31 -r 1.1.2.32 src/printing.c;  cvs diff -u -r 1.47.2.54 -r 1.47.2.55 src/procheader.c;  cvs diff -u -r 1.11.2.12 -r 1.11.2.13 src/procheader.h;  cvs diff -u -r 1.150.2.117 -r 1.150.2.118 src/procmsg.c;  cvs diff -u -r 1.60.2.56 -r 1.60.2.57 src/procmsg.h;  cvs diff -u -r 1.8.2.44 -r 1.8.2.45 src/quote_fmt.c;  cvs diff -u -r 1.17.2.60 -r 1.17.2.61 src/send_message.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.5.2.29 -r 1.5.2.30 src/statusbar.c;  cvs diff -u -r 1.25.2.68 -r 1.25.2.69 src/stock_pixmap.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.430.2.1 -r 1.395.2.430.2.2 src/summaryview.c;  cvs diff -u -r 1.68.2.57 -r 1.68.2.58 src/summaryview.h;  cvs diff -u -r 1.96.2.232.2.1 -r 1.96.2.232.2.2 src/textview.c;  cvs diff -u -r 1.12.2.27 -r 1.12.2.28 src/textview.h;  cvs diff -u -r 1.13.2.22 -r 1.13.2.23 src/undo.c;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/uri_opener.c;  cvs diff -u -r 1.14.2.20 -r 1.14.2.21 src/vcard.c;  cvs diff -u -r 1.1.2.84 -r 1.1.2.85 src/wizard.c;  cvs diff -u -r 1.9.2.51 -r 1.9.2.52 src/common/defs.h;  cvs diff -u -r 1.9.2.49 -r 1.9.2.50 src/common/ssl.c;  cvs diff -u -r 1.20.2.24 -r 1.20.2.25 src/gtk/Makefile.am;  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.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.5.2.18 -r 1.5.2.19 src/gtk/gtkaspell.h;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/gtkcmclist.h;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/gtk/gtkcmctree.h;  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.1.4.16 -r 1.1.4.17 src/gtk/gtkshruler.c;  cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/gtk/gtkshruler.h;  cvs diff -u -r 1.5.2.95 -r 1.5.2.96 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.5.2.21 -r 1.5.2.22 src/gtk/gtkvscrollbutton.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.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.4.2.24 -r 1.4.2.25 src/gtk/menu.h;  cvs diff -u -r 1.5.2.59 -r 1.5.2.60 src/gtk/pluginwindow.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.103 -r 1.1.2.104 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.5.2.26 -r 1.5.2.27 src/plugins/dillo_viewer/dillo_prefs.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/passphrase.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.1.2.29 -r 1.1.2.30 src/plugins/pgpcore/select-keys.c;  cvs diff -u -r 1.23.2.55 -r 1.23.2.56 src/plugins/spamassassin/spamassassin_gtk.c;  cvs diff -u -r 1.14.2.77.2.1 -r 1.14.2.77.2.2 src/plugins/trayicon/trayicon.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/trayicon/trayicon_prefs.c;  ) > 3.7.10cvs16.4-new-contacts.patchset

Index: ChangeLog
===================================================================
RCS file: /home/claws-mail/claws/ChangeLog,v
retrieving revision 1.396.2.3397.2.2
retrieving revision 1.396.2.3397.2.3
diff -u -d -r1.396.2.3397.2.2 -r1.396.2.3397.2.3
--- ChangeLog	7 Sep 2011 15:52:21 -0000	1.396.2.3397.2.2
+++ ChangeLog	29 Nov 2011 00:14:02 -0000	1.396.2.3397.2.3
@@ -1,3 +1,183 @@
+2011-11-29 [mir]	3.7.10cvs16.4-new-contacts
+
+	* AUTHORS
+	* configure.ac
+	* doc/man/claws-mail.1
+	* manual/advanced.xml
+	* manual/es/advanced.xml
+	* po/bg.po
+	* po/ca.po
+	* po/cs.po
+	* po/de.po
+	* po/en_GB.po
+	* po/es.po
+	* po/fi.po
+	* po/fr.po
+	* po/hu.po
+	* po/id.po
+	* po/it.po
+	* po/ja.po
+	* po/lt.po
+	* po/nl.po
+	* po/pl.po
+	* po/pt_BR.po
+	* po/pt_PT.po
+	* po/ru.po
+	* po/sk.po
+	* po/sv.po
+	* po/uk.po
+	* po/zh_CN.po
+	* src/account.c
+	* src/action.c
+	* src/addr_compl.c
+	* src/addrbook.c
+	* src/addrbook.h
+	* src/addrcustomattr.c
+	* src/addrduplicates.c
+	* src/addressadd.c
+	* src/addressbook.c
+	* src/addressbook_foldersel.c
+	* src/addrgather.c
+	* src/alertpanel.c
+	* src/browseldap.c
+	* src/codeconv.c
+	* src/compose.c
+	* src/editaddress.c
+	* src/editaddress_other_attributes_ldap.c
+	* src/editbook.c
+	* src/editgroup.c
+	* src/editjpilot.c
+	* src/editldap.c
+	* src/editldap_basedn.c
+	* src/edittags.c
+	* src/editvcard.c
+	* src/exphtmldlg.c
+	* src/expldifdlg.c
+	* src/export.c
+	* src/exportldif.c
+	* src/filtering.c
+	* src/filtering.h
+	* src/folder.c
+	* src/folder.h
+	* src/folder_item_prefs.c
+	* src/foldersel.c
+	* src/folderview.c
+	* src/grouplistdialog.c
+	* src/headerview.c
+	* src/image_viewer.c
+	* src/imap_gtk.c
+	* src/import.c
+	* src/importldif.c
+	* src/importmutt.c
+	* src/importpine.c
+	* src/jpilot.c
+	* src/ldif.c
+	* src/main.c
+	* src/mainwindow.c
+	* src/mainwindow.h
+	* src/message_search.c
+	* src/messageview.c
+	* src/mh_gtk.c
+	* src/mimeview.c
+	* src/mimeview.h
+	* src/mutt.c
+	* src/news.c
+	* src/noticeview.c
+	* src/pine.c
+	* src/prefs_account.c
+	* src/prefs_actions.c
+	* src/prefs_actions.h
+	* src/prefs_common.c
+	* src/prefs_common.h
+	* src/prefs_compose_writing.c
+	* src/prefs_customheader.c
+	* src/prefs_display_header.c
+	* src/prefs_ext_prog.c
+	* src/prefs_filtering.c
+	* src/prefs_filtering_action.c
+	* src/prefs_folder_column.c
+	* src/prefs_folder_item.c
+	* src/prefs_image_viewer.c
+	* src/prefs_logging.c
+	* src/prefs_matcher.c
+	* src/prefs_message.c
+	* src/prefs_msg_colors.c
+	* src/prefs_other.c
+	* src/prefs_receive.c
+	* src/prefs_send.c
+	* src/prefs_spelling.c
+	* src/prefs_summaries.c
+	* src/prefs_summary_column.c
+	* src/prefs_summary_open.c
+	* src/prefs_template.c
+	* src/prefs_toolbar.c
+	* src/prefs_wrapping.c
+	* src/printing.c
+	* src/procheader.c
+	* src/procheader.h
+	* src/procmsg.c
+	* src/procmsg.h
+	* src/quote_fmt.c
+	* src/send_message.c
+	* src/sourcewindow.c
+	* src/ssl_manager.c
+	* src/statusbar.c
+	* src/stock_pixmap.c
+	* src/summary_search.c
+	* src/summaryview.c
+	* src/summaryview.h
+	* src/textview.c
+	* src/textview.h
+	* src/undo.c
+	* src/uri_opener.c
+	* src/vcard.c
+	* src/wizard.c
+	* src/common/defs.h
+	* src/common/ssl.c
+	* src/gtk/Makefile.am
+	* src/gtk/about.c
+	* src/gtk/authors.h
+	* src/gtk/colorlabel.c
+	* src/gtk/colorsel.c
+	* src/gtk/combobox.c
+	* src/gtk/description_window.c
+	* src/gtk/foldersort.c
+	* src/gtk/gtkaspell.c
+	* src/gtk/gtkaspell.h
+	* src/gtk/gtkcmclist.c
+	* src/gtk/gtkcmclist.h
+	* src/gtk/gtkcmctree.c
+	* src/gtk/gtkcmctree.h
+	* src/gtk/gtkcmoptionmenu.c
+	* src/gtk/gtksctree.c
+	* src/gtk/gtkshruler.c
+	* src/gtk/gtkshruler.h
+	* src/gtk/gtkutils.c
+	* src/gtk/gtkutils.h
+	* src/gtk/gtkvscrollbutton.c
+	* src/gtk/icon_legend.c
+	* src/gtk/inputdialog.c
+	* src/gtk/logwindow.c
+	* src/gtk/menu.c
+	* src/gtk/menu.h
+	* src/gtk/pluginwindow.c
+	* src/gtk/prefswindow.c
+	* src/gtk/progressdialog.c
+	* src/gtk/quicksearch.c
+	* src/gtk/spell_entry.c
+	* src/plugins/bogofilter/bogofilter_gtk.c
+	* src/plugins/dillo_viewer/dillo_prefs.c
+	* src/plugins/dillo_viewer/dillo_viewer.c
+	* src/plugins/pgpcore/passphrase.c
+	* src/plugins/pgpcore/prefs_gpg.c
+	* src/plugins/pgpcore/select-keys.c
+	* src/plugins/spamassassin/spamassassin_gtk.c
+	* src/plugins/trayicon/trayicon.c
+	* src/plugins/trayicon/trayicon_prefs.c
+	    Applied patch 3.7.10cvs17 to 3.7.10cvs106 from the
+	    gtk2 branch making new-addressbook branch in sync
+	    with head.
+
 2011-09-07 [mir]	3.7.10cvs16.3-new-contacts
 
 	* configure.ac



More information about the Commits mailing list