2007-11-10 [colin] 3.0.2cvs131

	* src/news.c
		Fix debian bug 450698, 'nntp auth behavior changed
		without notice'

diff --git a/ChangeLog b/ChangeLog
index 79dda6a2aa039103f1aa26123a143370dc3fe84e..b5cb7fcdb961f27ecf591764193a7ec520e6fb85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-10 [colin]     3.0.2cvs131
+
+       * src/news.c
+               Fix debian bug 450698, 'nntp auth behavior changed 
+               without notice'
+

 2007-11-10 [colin]     3.0.2cvs130
 
        * configure.ac
 2007-11-10 [colin]     3.0.2cvs130
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index e3af9eb1a750f3adf8437f52b2f127cd0688c1ee..514f06e10df1fc69280bf2884e01088eaebe4fb7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3043,3 +3043,4 @@
 ( cvs diff -u -r 1.61.2.75 -r 1.61.2.76 src/account.c;  cvs diff -u -r 1.382.2.419 -r 1.382.2.420 src/compose.c;  cvs diff -u -r 1.94.2.162 -r 1.94.2.163 src/messageview.c;  cvs diff -u -r 1.105.2.115 -r 1.105.2.116 src/prefs_account.c;  cvs diff -u -r 1.49.2.34 -r 1.49.2.35 src/prefs_account.h;  ) > 3.0.2cvs128.patchset
 ( cvs diff -u -r 1.60.2.104 -r 1.60.2.105 src/addressbook.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/ldapupdate.c;  ) > 3.0.2cvs129.patchset
 ( cvs diff -u -r 1.654.2.3099 -r 1.654.2.3100 configure.ac;  cvs diff -u -r 1.149.2.84 -r 1.149.2.85 src/inc.c;  cvs diff -u -r 1.115.2.174 -r 1.115.2.175 src/main.c;  cvs diff -u -r 1.7.2.14 -r 1.7.2.15 src/main.h;  cvs diff -u -r 1.83.2.122 -r 1.83.2.123 src/mimeview.c;  cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/statusbar.c;  cvs diff -u -r 1.36.2.122 -r 1.36.2.123 src/common/utils.c;  cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/etpan/Makefile.am;  cvs diff -u -r 1.2.2.35 -r 1.2.2.36 src/gtk/filesel.c;  cvs diff -u -r 1.4.2.39 -r 1.4.2.40 src/gtk/gtkutils.h;  cvs diff -u -r 1.5.2.26 -r 1.5.2.27 src/gtk/menu.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/bogofilter/Makefile.am;  cvs diff -u -r 1.4.2.8 -r 1.4.2.9 src/plugins/clamav/Makefile.am;  cvs diff -u -r 1.4.2.6 -r 1.4.2.7 src/plugins/dillo_viewer/Makefile.am;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/pgpcore/Makefile.am;  cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/plugins/spamassassin/Makefile.am;  cvs diff -u -r 1.4.2.9 -r 1.4.2.10 src/plugins/trayicon/Makefile.am;  ) > 3.0.2cvs130.patchset
 ( cvs diff -u -r 1.61.2.75 -r 1.61.2.76 src/account.c;  cvs diff -u -r 1.382.2.419 -r 1.382.2.420 src/compose.c;  cvs diff -u -r 1.94.2.162 -r 1.94.2.163 src/messageview.c;  cvs diff -u -r 1.105.2.115 -r 1.105.2.116 src/prefs_account.c;  cvs diff -u -r 1.49.2.34 -r 1.49.2.35 src/prefs_account.h;  ) > 3.0.2cvs128.patchset
 ( cvs diff -u -r 1.60.2.104 -r 1.60.2.105 src/addressbook.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/ldapupdate.c;  ) > 3.0.2cvs129.patchset
 ( cvs diff -u -r 1.654.2.3099 -r 1.654.2.3100 configure.ac;  cvs diff -u -r 1.149.2.84 -r 1.149.2.85 src/inc.c;  cvs diff -u -r 1.115.2.174 -r 1.115.2.175 src/main.c;  cvs diff -u -r 1.7.2.14 -r 1.7.2.15 src/main.h;  cvs diff -u -r 1.83.2.122 -r 1.83.2.123 src/mimeview.c;  cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/statusbar.c;  cvs diff -u -r 1.36.2.122 -r 1.36.2.123 src/common/utils.c;  cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/etpan/Makefile.am;  cvs diff -u -r 1.2.2.35 -r 1.2.2.36 src/gtk/filesel.c;  cvs diff -u -r 1.4.2.39 -r 1.4.2.40 src/gtk/gtkutils.h;  cvs diff -u -r 1.5.2.26 -r 1.5.2.27 src/gtk/menu.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/bogofilter/Makefile.am;  cvs diff -u -r 1.4.2.8 -r 1.4.2.9 src/plugins/clamav/Makefile.am;  cvs diff -u -r 1.4.2.6 -r 1.4.2.7 src/plugins/dillo_viewer/Makefile.am;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/pgpcore/Makefile.am;  cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/plugins/spamassassin/Makefile.am;  cvs diff -u -r 1.4.2.9 -r 1.4.2.10 src/plugins/trayicon/Makefile.am;  ) > 3.0.2cvs130.patchset

+( cvs diff -u -r 1.101.2.44 -r 1.101.2.45 src/news.c;  ) > 3.0.2cvs131.patchset

diff --git a/configure.ac b/configure.ac
index a9903ace4796c623fa68b9c8fc63e059aa527cb4..ccf845d71991c8bbed03df445d8dd8e39330dcfc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=130
+EXTRA_VERSION=131

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 


@@ -493,7 +493,7 @@ if test $ac_cv_enable_maemo = yes; then
        AC_SUBST(MAEMO_LIBS)
        if test $ac_cv_enable_maemo = no; then
                #test for chinook
        AC_SUBST(MAEMO_LIBS)
        if test $ac_cv_enable_maemo = no; then
                #test for chinook

-               PKG_CHECK_MODULES(MAEMO, libosso hildon-1 hildon-fm-2 gnome-vfs-2.0, ac_cv_enable_maemo=yes,
+               PKG_CHECK_MODULES(MAEMO, libosso hildon-1 hildon-fm-2 gnome-vfs-2.0 hal, ac_cv_enable_maemo=yes,

                          ac_cv_enable_maemo=no)
                AC_SUBST(MAEMO_CFLAGS)
                AC_SUBST(MAEMO_LIBS)
                          ac_cv_enable_maemo=no)
                AC_SUBST(MAEMO_CFLAGS)
                AC_SUBST(MAEMO_LIBS)

diff --git a/src/news.c b/src/news.c
index 138d754d6643660df74c907ab1757e5ec5b648a9..6bd9928ed07cd10bbaa9401fdda8fd860d45eeda 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -362,7 +362,7 @@ static Session *news_session_new_for_folder(Folder *folder)
        session = news_session_new(folder, ac->nntp_server, port, userid, passwd);
 #endif
 
        session = news_session_new(folder, ac->nntp_server, port, userid, passwd);
 #endif
 

-       if ((session != NULL) && ac->use_nntp_auth && ac->use_nntp_auth_onconnect) {
+       if ((session != NULL) && ac->use_nntp_auth) { /* FIXME:  && ac->use_nntp_auth_onconnect */

                if (nntp_threaded_login(folder, userid, passwd) !=
                        NEWSNNTP_NO_ERROR) {
                        log_error(LOG_PROTOCOL, _("Error authenticating to %s:%d ...\n"), ac->nntp_server, port);
                if (nntp_threaded_login(folder, userid, passwd) !=
                        NEWSNNTP_NO_ERROR) {
                        log_error(LOG_PROTOCOL, _("Error authenticating to %s:%d ...\n"), ac->nntp_server, port);