0.8.11claws50

* src/news.c
        fix NEWS that got broken by a sync with sylpheed-main

diff --git a/ChangeLog.claws b/ChangeLog.claws
index d0f636cf7ef402e6f25e12282f3641b515c6373d..558e99b1ff460315cf6f42c045c1939b6b34a8fa 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-03-26 [christoph] 0.8.11claws50
+
+       * src/news.c
+               fix NEWS that got broken by a sync with sylpheed-main
+
 2003-03-26 [christoph] 0.8.11claws49
 
        * src/mimeview.c

diff --git a/configure.ac b/configure.ac
index f9f7cf14afd029600fe1e0245ef604bf952ab511..4a8bbce4decf46eb141b7f66a13bce3150b52605 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws49
+EXTRA_VERSION=claws50
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/news.c b/src/news.c
index 84577b42cb4c9a25539c27575adcc116a88b9201..a9b7d544f22d30a718cd1ed8048531847f9cbfef 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -846,7 +846,7 @@ gint news_get_num_list(Folder *folder, FolderItem *item, GSList **msgnum_list)
 
 #define READ_TO_LISTEND(hdr) \
        while (!(buf[0] == '.' && buf[1] == '\r')) { \
-               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) { \
+               if (sock_gets(session->nntp_sock->sock, buf, sizeof(buf)) < 0) { \
                        log_warning(_("error occurred while getting %s.\n"), hdr); \
                        return msginfo; \
                } \
@@ -871,7 +871,7 @@ MsgInfo *news_get_msginfo(Folder *folder, FolderItem *item, gint num)
                return NULL;
        }
        
-       if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+       if (sock_gets(session->nntp_sock->sock, buf, sizeof(buf)) < 0) {
                log_warning(_("error occurred while getting xover.\n"));
                return NULL;
        }
@@ -896,7 +896,7 @@ MsgInfo *news_get_msginfo(Folder *folder, FolderItem *item, gint num)
                return msginfo;
        }
 
-       if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+       if (sock_gets(session->nntp_sock->sock, buf, sizeof(buf)) < 0) {
                log_warning(_("error occurred while getting xhdr.\n"));
                return msginfo;
        }
@@ -910,7 +910,7 @@ MsgInfo *news_get_msginfo(Folder *folder, FolderItem *item, gint num)
                return msginfo;
        }
 
-       if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+       if (sock_gets(session->nntp_sock->sock, buf, sizeof(buf)) < 0) {
                log_warning(_("error occurred while getting xhdr.\n"));
                return msginfo;
        }
@@ -941,7 +941,7 @@ static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *ite
        }
 
        for (;;) {
-               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+               if (sock_gets(session->nntp_sock->sock, buf, sizeof(buf)) < 0) {
                        log_warning(_("error occurred while getting xover.\n"));
                        return newlist;
                }
@@ -980,7 +980,7 @@ static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *ite
        llast = newlist;
 
        for (;;) {
-               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+               if (sock_gets(session->nntp_sock->sock, buf, sizeof(buf)) < 0) {
                        log_warning(_("error occurred while getting xhdr.\n"));
                        return newlist;
                }
@@ -1010,7 +1010,7 @@ static GSList *news_get_msginfos_for_range(NNTPSession *session, FolderItem *ite
        llast = newlist;
 
        for (;;) {
-               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+               if (sock_gets(session->nntp_sock->sock, buf, sizeof(buf)) < 0) {
                        log_warning(_("error occurred while getting xhdr.\n"));
                        return newlist;
                }