[Commits] [SCM] claws branch, master, updated. 3.9.1-9-g8891f6e

ticho at claws-mail.org ticho at claws-mail.org
Sun May 12 15:35:51 CEST 2013


The branch master of project "claws" (Claws Mail) has been updated
       via  8891f6e23e51b38c54c7b717fa0922cb101b76a2 (commit)
       via  42cbb5fdf01b3dd62ad047473cc11e0a2e92f4bc (commit)
      from  f3895e2fff2902b5cbca3239d1c77a83236152f0 (commit)


- Log -----------------------------------------------------------------
commit 8891f6e23e51b38c54c7b717fa0922cb101b76a2
Author: Andrej Kacian <andrej at kacian.sk>
Date:   Sun May 12 15:14:29 2013 +0200

    Fix compiler warning.

diff --git a/src/news.c b/src/news.c
index 7f2e00c..9c9080c 100644
--- a/src/news.c
+++ b/src/news.c
@@ -56,6 +56,7 @@
 #include "remotefolder.h"
 #include "alertpanel.h"
 #include "inc.h"
+#include "account.h"
 #ifdef USE_GNUTLS
 #  include "ssl.h"
 #endif

commit 42cbb5fdf01b3dd62ad047473cc11e0a2e92f4bc
Author: Andrej Kacian <andrej at kacian.sk>
Date:   Sun May 12 15:09:52 2013 +0200

    Do not try to destroy a NULL session after an unsuccesful NNTP connect attempt.

diff --git a/src/news.c b/src/news.c
index 3717569..7f2e00c 100644
--- a/src/news.c
+++ b/src/news.c
@@ -352,7 +352,8 @@ static Session *news_session_new(Folder *folder, const gchar *server, gushort po
 	
 	if (r != NEWSNNTP_NO_ERROR) {
 		log_error(LOG_PROTOCOL, _("Error logging in to %s:%d...\n"), server, port);
-		session_destroy(SESSION(session));
+		if (session != NULL)
+			session_destroy(SESSION(session));
 		return NULL;
 	}
 
@@ -443,7 +444,8 @@ static Session *news_session_new_for_folder(Folder *folder)
 	    else {
 	        /* An error state bail out */
 	        log_error(LOG_PROTOCOL, _("Error creating session with %s:%d\n"), ac->nntp_server, port);
-		session_destroy(SESSION(session));
+		if (session != NULL)
+			session_destroy(SESSION(session));
 		g_free(passwd);
 		if (ac->session_passwd) {
 			g_free(ac->session_passwd);

-----------------------------------------------------------------------

Summary of changes:
 src/news.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list