[Commits] etpan-thread-manager.c 1.1.4.17 1.1.4.18 imap-thread.c 1.1.4.120 1.1.4.121 nntp-thread.c 1.1.2.21 1.1.2.22

mones at claws-mail.org mones at claws-mail.org
Sun Sep 16 23:56:23 CEST 2012


Update of /home/claws-mail/claws/src/etpan
In directory srv:/tmp/cvs-serv31257/src/etpan

Modified Files:
      Tag: gtk2
	etpan-thread-manager.c imap-thread.c nntp-thread.c 
Log Message:
2012-09-16 [mones]	3.8.1cvs60

        * src/action.c                                                          
                Removed dup calls with ignored result
        * src/addr_compl.c                                                      
                Removed unused var is_group and simplified logic around it      
        * src/addrharvest.c                                                     
        * src/matcher.c
        * src/procmsg.c                                                         
        * src/etpan/etpan-thread-manager.c                                      
                Use unused var r to verify result and emit messages on error
        * src/compose.c                                                         
                Move color variable into conditional usage blocks
                Remove assigned but not used vars: lock, titles, count          
        * src/edittags.c
                Remove assigned but not used var actions                        
        * src/folderview.c
                Remove assigned but not used vars: from_parent, src_node        
        * src/imap_gtk.c
        * src/mh_gtk.c                                                          
                Remove malloc-ed but not used var: old_path                     
        * src/news.c
                Comment unused vars from commented block: tofetch, fetched      
        * src/prefs_account.c
                Remove assigned but not used var: privacy_enabled
        * src/prefs_actions.c
        * src/prefs_customheader.c
                Remove assigned but not used var: store
        * src/prefs_filtering.c
                Remove assigned but not used var: n_rows
        * src/prefs_template.c
                Remove assigned but not used vars: model, list_store
        * src/prefs_toolbar.c
                Remove assigned but not used var: win_titles
        * src/printing.c
                Remove assigned but not used vars: orientation, line, baseline,
                off_chars 
        * src/etpan/imap-thread.c
                Remove assigned but not used var: value, r
                Refactor to check correct memory allocation
        * src/etpan/nntp-thread.c
                Remove assigned but not used var: value
        * src/gtk/gtkaspell.c
                Remove assigned but not used vars: textbuf, exist
                Remove unused function: find_gtkaspeller
        * src/gtk/gtkcmctree.c
                Remove unused function: gtk_cmctree_get_offset
        * src/gtk/gtkshruler.c
                Remove assigned but not used vars: ruler, priv 

Index: etpan-thread-manager.c
===================================================================
RCS file: /home/claws-mail/claws/src/etpan/Attic/etpan-thread-manager.c,v
retrieving revision 1.1.4.17
retrieving revision 1.1.4.18
diff -u -d -r1.1.4.17 -r1.1.4.18
--- etpan-thread-manager.c	7 Jul 2012 07:09:33 -0000	1.1.4.17
+++ etpan-thread-manager.c	16 Sep 2012 21:56:21 -0000	1.1.4.18
@@ -281,6 +281,9 @@
   
   ch = 1;
   r = write(manager->notify_fds[1], &ch, 1);
+  if (r < 0) {
+    g_warning("error writing notification to etpan thread manager");
+  }
 }
 
 static void manager_ack(struct etpan_thread_manager * manager)
@@ -289,6 +292,9 @@
   char ch;
   ssize_t r;
   r = read(manager->notify_fds[0], &ch, 1);
+  if (r != 1) {
+    g_warning("error reading notification from etpan thread manager");
+  }
 #else
   /* done in the GIOChannel handler in imap-thread.c and nntp-thread.c */
 #endif
@@ -590,12 +596,9 @@
   
   for(i = 0 ; i < carray_count(op_to_notify) ; i ++) {
     struct etpan_thread_op * op;
-    int cancelled;
     
     op = carray_get(op_to_notify, i);
     
-    cancelled = etpan_thread_op_cancelled(op);
-    
     etpan_thread_op_lock(op);
     
     if (!op->callback_called) {

Index: nntp-thread.c
===================================================================
RCS file: /home/claws-mail/claws/src/etpan/Attic/nntp-thread.c,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -d -r1.1.2.21 -r1.1.2.22
--- nntp-thread.c	7 Jul 2012 07:09:33 -0000	1.1.2.21
+++ nntp-thread.c	16 Sep 2012 21:56:21 -0000	1.1.2.22
@@ -96,12 +96,9 @@
 static void delete_nntp(Folder *folder, newsnntp *nntp)
 {
 	chashdatum key;
-	chashdatum value;
 
 	key.data = &folder;
 	key.len = sizeof(folder);
-	value.data = nntp;
-	value.len = 0;
 	chash_delete(session_hash, &key, NULL);
 	
 	key.data = &nntp;

Index: imap-thread.c
===================================================================
RCS file: /home/claws-mail/claws/src/etpan/Attic/imap-thread.c,v
retrieving revision 1.1.4.120
retrieving revision 1.1.4.121
diff -u -d -r1.1.4.120 -r1.1.4.121
--- imap-thread.c	12 Sep 2012 09:23:13 -0000	1.1.4.120
+++ imap-thread.c	16 Sep 2012 21:56:21 -0000	1.1.4.121
@@ -61,12 +61,9 @@
 static void delete_imap(Folder *folder, mailimap *imap)
 {
 	chashdatum key;
-	chashdatum value;
 
 	key.data = &folder;
 	key.len = sizeof(folder);
-	value.data = imap;
-	value.len = 0;
 	chash_delete(session_hash, &key, NULL);
 	
 	key.data = &imap;
@@ -2679,30 +2676,24 @@
 static int imap_add_envelope_fetch_att(struct mailimap_fetch_type * fetch_type)
 {
 	struct mailimap_fetch_att * fetch_att;
-	int r;
+	int i;
 	char * header;
 	clist * hdrlist;
 	struct mailimap_header_list * imap_hdrlist;
 	struct mailimap_section * section;
+	char *headers[] = {
+			"Date", "From", "To", "Cc", "Subject", "Message-ID",
+			"References", "In-Reply-To", NULL
+		};
 
 	hdrlist = clist_new();
-  
-	header = strdup("Date");
-	r = clist_append(hdrlist, header);
-	header = strdup("From");
-	r = clist_append(hdrlist, header);
-	header = strdup("To");
-	r = clist_append(hdrlist, header);
-	header = strdup("Cc");
-	r = clist_append(hdrlist, header);
-	header = strdup("Subject");
-	r = clist_append(hdrlist, header);
-	header = strdup("Message-ID");
-	r = clist_append(hdrlist, header);
-	header = strdup("References");
-	r = clist_append(hdrlist, header);
-	header = strdup("In-Reply-To");
-	r = clist_append(hdrlist, header);
+	i = 0;
+	while (headers[i] != NULL) {
+  		header = strdup(headers[i]);
+		if (header == NULL || clist_append(hdrlist, header) != 0)
+			return MAIL_ERROR_MEMORY;
+		++i;
+	}
   
 	imap_hdrlist = mailimap_header_list_new(hdrlist);
 	section = mailimap_section_new_header_fields(imap_hdrlist);



More information about the Commits mailing list