[Commits] [SCM] claws branch, master, updated. 3.9.2-56-gace330d

[mones at claws-mail.org]

The branch master of project "claws" (Claws Mail) has been updated
       via  ace330d0e991cc03340135c5eafa509337ab5755 (commit)
       via  0ea8cc7e15b0f7d210f7b891df71ce0b5f9abd7d (commit)
       via  f671a64b5088b1e03a31333ed80701ce6467e9a1 (commit)
      from  4c94b229454fc50aada030922807eb6c616e6a67 (commit)


- Log -----------------------------------------------------------------
commit ace330d0e991cc03340135c5eafa509337ab5755
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Aug 2 10:00:34 2013 +0200

    Fix access beyond array bounds
    
    Which shouldn't happen, but keeps the compiler happy...

diff --git a/src/toolbar.c b/src/toolbar.c
index 690073a..5259f41 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -242,7 +242,7 @@ struct {
 struct {
 	const gchar  *conf_file;
 	GSList       *item_list;
-} toolbar_config[3] = {
+} toolbar_config[NUM_TOOLBARS] = {
 	{ "toolbar_main.xml",    NULL},
 	{ "toolbar_compose.xml", NULL}, 
   	{ "toolbar_msgview.xml", NULL}
@@ -767,7 +767,7 @@ void toolbar_read_config_file(ToolbarType source)
 		else if (source == TOOLBAR_MSGVIEW) 
 			toolbar_set_default(TOOLBAR_MSGVIEW);
 		else {		
-			g_warning("failed to write Toolbar Configuration to %s\n", toolbar_config[source].conf_file);
+			g_warning("refusing to write unknown Toolbar Configuration number %d\n", source);
 			return;
 		}
 
diff --git a/src/toolbar.h b/src/toolbar.h
index f0cd8c8..7eebad2 100644
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -34,6 +34,8 @@ typedef enum {
 	TOOLBAR_MSGVIEW
 } ToolbarType;
 
+#define NUM_TOOLBARS	3
+
 typedef enum 
 {
 	COMPOSEBUTTON_MAIL,

commit 0ea8cc7e15b0f7d210f7b891df71ce0b5f9abd7d
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Aug 2 09:58:16 2013 +0200

    Remove implicit declaration warning for “networkmanager_is_online”

diff --git a/src/news.c b/src/news.c
index 9df3090..6d91b4a 100644
--- a/src/news.c
+++ b/src/news.c
@@ -60,6 +60,7 @@
 #ifdef USE_GNUTLS
 #  include "ssl.h"
 #endif
+#include "main.h"
 
 #define NNTP_PORT	119
 #ifdef USE_GNUTLS

commit f671a64b5088b1e03a31333ed80701ce6467e9a1
Author: Ricardo Mones <ricardo at mones.org>
Date:   Fri Aug 2 09:53:28 2013 +0200

    Don't return FALSE when is NULL
    
    Yeah, their values are equal, but doesn't look nice ;-)

diff --git a/src/folder.c b/src/folder.c
index 2dd8f37..39ba0e4 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -2802,7 +2802,7 @@ MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
 	cm_return_val_if_fail(item != NULL, NULL);
 	cm_return_val_if_fail(msgid != NULL, NULL);
 	if (item->no_select)
-		return FALSE;
+		return NULL;
 	
 	if (!item->cache)
 		folder_item_read_cache(item);
@@ -2817,7 +2817,7 @@ GSList *folder_item_get_msg_list(FolderItem *item)
 {
 	cm_return_val_if_fail(item != NULL, NULL);
 	if (item->no_select)
-		return FALSE;
+		return NULL;
 	
 	if (item->cache == 0)
 		folder_item_read_cache(item);

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

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


hooks/post-receive
-- 
Claws Mail