[Commits] defs.h 1.9.2.51 1.9.2.51.2.1 ssl.c 1.9.2.49 1.9.2.49.2.1
miras at claws-mail.org
miras at claws-mail.org
Tue Nov 29 01:15:26 CET 2011
Update of /home/claws-mail/claws/src/common
In directory claws-mail:/tmp/cvs-serv12914/src/common
Modified Files:
Tag: new-contacts
defs.h ssl.c
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: defs.h
===================================================================
RCS file: /home/claws-mail/claws/src/common/defs.h,v
retrieving revision 1.9.2.51
retrieving revision 1.9.2.51.2.1
diff -u -d -r1.9.2.51 -r1.9.2.51.2.1
--- defs.h 16 Feb 2011 07:16:17 -0000 1.9.2.51
+++ defs.h 29 Nov 2011 00:15:24 -0000 1.9.2.51.2.1
@@ -24,7 +24,7 @@
# include "config.h"
#endif
-#include <glibconfig.h>
+#include <glib.h>
#ifdef G_OS_WIN32
# include <glib/gwin32.h>
@@ -90,7 +90,7 @@
#define THEMES_URI "http://www.claws-mail.org/themes.php"
#define TOOLS_URI "http://www.claws-mail.org/tools.php"
#define MAILING_LIST_URI "http://www.claws-mail.org/MLs.php"
-#define USERS_ML_ADDR "claws-mail-users at dotsrc.org"
+#define USERS_ML_ADDR "users at lists.claws-mail.org"
#define GPL_URI "http://www.gnu.org/licenses/gpl.html"
#define DONATE_URI "http://www.claws-mail.org/sponsors.php"
#define RELEASE_NOTES_FILE "RELEASE_NOTES"
Index: ssl.c
===================================================================
RCS file: /home/claws-mail/claws/src/common/ssl.c,v
retrieving revision 1.9.2.49
retrieving revision 1.9.2.49.2.1
diff -u -d -r1.9.2.49 -r1.9.2.49.2.1
--- ssl.c 3 Sep 2011 11:40:10 -0000 1.9.2.49
+++ ssl.c 29 Nov 2011 00:15:24 -0000 1.9.2.49.2.1
@@ -263,9 +263,10 @@
r = gnutls_init(&session, GNUTLS_CLIENT);
if (session == NULL || r != 0)
return FALSE;
-
- gnutls_transport_set_lowat (session, 0);
+#if GNUTLS_VERSION_NUMBER < 0x030003
+ gnutls_transport_set_lowat (session, 0);
+#endif
gnutls_priority_set_direct(session, "NORMAL", NULL);
gnutls_record_disable_padding(session);
More information about the Commits
mailing list