[Commits] addressbook.c 1.60.2.149 1.60.2.150 addrharvest.c 1.6.10.27 1.6.10.28 addrindex.c 1.28.2.49 1.28.2.50 addritem.c 1.13.2.22 1.13.2.23 compose.c 1.382.2.611 1.382.2.612 edittags.c 1.1.2.28 1.1.2.29 folder.c 1.213.2.210 1.213.2.211 imap.c 1.179.2.259 1.179.2.260 inc.c 1.149.2.109 1.149.2.110 ldif.c 1.12.2.25 1.12.2.26 mainwindow.c 1.274.2.350 1.274.2.351 mbox.c 1.28.2.52 1.28.2.53 mimeview.c 1.83.2.194 1.83.2.195 mutt.c 1.6.10.21 1.6.10.22 partial_download.c 1.1.2.27 1.1.2.28 prefs_filtering_action.c 1.1.4.78 1.1.4.79 prefs_toolbar.c 1.30.2.73 1.30.2.74 printing.c 1.1.2.38 1.1.2.39 procheader.c 1.47.2.58 1.47.2.59 procmime.c 1.49.2.149 1.49.2.150 procmsg.c 1.150.2.126 1.150.2.127 summaryview.c 1.395.2.452 1.395.2.453 textview.c 1.96.2.247 1.96.2.248
colin at claws-mail.org
colin at claws-mail.org
Wed Sep 12 11:23:15 CEST 2012
Update of /home/claws-mail/claws/src
In directory srv:/tmp/cvs-serv1241/src
Modified Files:
Tag: gtk2
addressbook.c addrharvest.c addrindex.c addritem.c compose.c
edittags.c folder.c imap.c inc.c ldif.c mainwindow.c mbox.c
mimeview.c mutt.c partial_download.c prefs_filtering_action.c
prefs_toolbar.c printing.c procheader.c procmime.c procmsg.c
summaryview.c textview.c
Log Message:
2012-09-12 [colin] 3.8.1cvs52
* src/addressbook.c
* src/addrharvest.c
* src/addrindex.c
* src/addritem.c
* src/compose.c
* src/edittags.c
* src/folder.c
* src/imap.c
* src/inc.c
* src/ldif.c
* src/mainwindow.c
* src/mbox.c
* src/mimeview.c
* src/mutt.c
* src/partial_download.c
* src/prefs_filtering_action.c
* src/prefs_toolbar.c
* src/printing.c
* src/procheader.c
* src/procmime.c
* src/procmsg.c
* src/summaryview.c
* src/textview.c
* src/common/utils.c
* src/etpan/imap-thread.c
* src/gtk/gtkaspell.c
* src/plugins/pgpcore/sgpgme.c
More fixes from bug #1961:
- Write-only variables
- Null pointer dereferences
- A couple other fixes for which the reporter
was unsure, but which showed problems.
More details in bug #1961 comments.
Index: edittags.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/edittags.c,v
retrieving revision 1.1.2.28
retrieving revision 1.1.2.29
diff -u -d -r1.1.2.28 -r1.1.2.29
--- edittags.c 7 Jul 2012 07:09:27 -0000 1.1.2.28
+++ edittags.c 12 Sep 2012 09:23:11 -0000 1.1.2.29
@@ -236,7 +236,7 @@
static void apply_popup_delete_all (GtkAction *action, gpointer data)
{
- GSList *cur;
+ GSList *cur, *tags;
GtkTreeModel *model;
SummaryView *summaryview = NULL;
@@ -252,13 +252,14 @@
if (mainwindow_get_mainwindow() != NULL)
summaryview = mainwindow_get_mainwindow()->summaryview;
- cur = tags_get_list();
+ cur = tags = tags_get_list();
for (; cur; cur = cur->next) {
gint id = GPOINTER_TO_INT(cur->data);
if (summaryview)
summary_set_tag(summaryview, -id, NULL);
tags_remove_tag(id);
}
+ g_slist_free(tags);
tags_write_tags();
APPLYWINDOW_UNLOCK();
@@ -756,13 +757,14 @@
static void apply_window_load_tags (void)
{
- GSList *cur;
+ GSList *cur, *tags;
gint id;
apply_window_list_view_clear_tags(applywindow.taglist);
- cur = tags_get_list();
+ cur = tags = tags_get_list();
for (; cur; cur = cur->next) {
id = GPOINTER_TO_INT(cur->data);
apply_window_list_view_insert_tag(applywindow.taglist, NULL, id);
}
+ g_slist_free(tags);
}
Index: inc.c
===================================================================
RCS file: /home/claws-mail/claws/src/inc.c,v
retrieving revision 1.149.2.109
retrieving revision 1.149.2.110
diff -u -d -r1.149.2.109 -r1.149.2.110
--- inc.c 27 Aug 2012 13:38:59 -0000 1.149.2.109
+++ inc.c 12 Sep 2012 09:23:12 -0000 1.149.2.110
@@ -183,7 +183,7 @@
if (cur_account && cur_account->inbox)
item = folder_find_item_from_identifier(cur_account->inbox);
- if (item == NULL && cur_account->folder)
+ if (item == NULL && cur_account && cur_account->folder)
item = cur_account->folder->inbox;
if (item == NULL)
item = folder_get_default_inbox();
Index: imap.c
===================================================================
RCS file: /home/claws-mail/claws/src/imap.c,v
retrieving revision 1.179.2.259
retrieving revision 1.179.2.260
diff -u -d -r1.179.2.259 -r1.179.2.260
--- imap.c 16 Aug 2012 14:24:08 -0000 1.179.2.259
+++ imap.c 12 Sep 2012 09:23:12 -0000 1.179.2.260
@@ -1749,7 +1749,6 @@
gint ok = MAILIMAP_NO_ERROR;
GHashTable *uid_hash;
gint last_num = 0;
- gboolean single = FALSE;
g_return_val_if_fail(folder != NULL, -1);
g_return_val_if_fail(dest != NULL, -1);
@@ -1763,8 +1762,6 @@
}
msginfo = (MsgInfo *)msglist->data;
- if (msglist->next == NULL)
- single = TRUE;
src = msginfo->folder;
if (src == dest) {
g_warning("the src folder is identical to the dest.\n");
@@ -3077,9 +3074,7 @@
GSList *result = NULL;
GSList * cur;
uncached_data *data = g_new0(uncached_data, 1);
- int finished;
- finished = 0;
cur = numlist;
data->total = g_slist_length(numlist);
data->ok = MAILIMAP_NO_ERROR;
@@ -3965,7 +3960,7 @@
GSList *uidlist, *elem;
int r = -1;
clist * lep_uidlist;
- gint ok, nummsgs = 0, lastuid_old;
+ gint ok, nummsgs = 0;
if (session == NULL) {
return -1;
@@ -4015,8 +4010,6 @@
return -1;
}
- lastuid_old = item->lastuid;
-
for (elem = uidlist; elem != NULL; elem = g_slist_next(elem)) {
guint msgnum;
@@ -4041,7 +4034,6 @@
gint nummsgs;
GSList *uidlist = NULL;
gchar *dir;
- gboolean selected_folder;
gint known_list_len = 0;
debug_print("get_num_list\n");
@@ -4085,9 +4077,6 @@
statusbar_print_all(_("Scanning folder %s ..."),
FOLDER_ITEM(item)->folder->name);
- selected_folder = (session->mbox != NULL) &&
- (!strcmp(session->mbox, item->item.path));
-
if (item->should_trash_cache) {
*old_uids_valid = FALSE;
debug_print("get_num_list: trashing num list\n");
@@ -5702,7 +5691,6 @@
const char *src;
char *dst, *res = g_malloc(2*strlen(mbox)+1);
- bitbuf = 0;
dst = res;
src = mbox;
if(!dst) return NULL;
@@ -5836,7 +5824,6 @@
/* Encode US-ASCII characters as themselves */
if (c < 0x80) {
ucs4 = c;
- utf8total = 1;
} else if (utf8total) {
/* save UTF8 bits into UCS4 */
ucs4 = (ucs4 << 6) | (c & 0x3FUL);
Index: summaryview.c
===================================================================
RCS file: /home/claws-mail/claws/src/summaryview.c,v
retrieving revision 1.395.2.452
retrieving revision 1.395.2.453
diff -u -d -r1.395.2.452 -r1.395.2.453
--- summaryview.c 8 Sep 2012 20:23:11 -0000 1.395.2.452
+++ summaryview.c 12 Sep 2012 09:23:12 -0000 1.395.2.453
@@ -3896,7 +3896,6 @@
static void summary_lock_row(SummaryView *summaryview, GtkCMCTreeNode *row)
{
- gboolean changed = FALSE;
GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
MsgInfo *msginfo;
@@ -3906,11 +3905,9 @@
summaryview->deleted--;
if (MSG_IS_MOVE(msginfo->flags)) {
summaryview->moved--;
- changed = TRUE;
}
if (MSG_IS_COPY(msginfo->flags)) {
summaryview->copied--;
- changed = TRUE;
}
procmsg_msginfo_set_to_folder(msginfo, NULL);
summary_msginfo_change_flags(msginfo, MSG_LOCKED, 0, MSG_DELETED,
@@ -6018,7 +6015,6 @@
for (; sel != NULL; sel = sel->next) {
MsgInfo *msginfo;
GSList *tags = NULL;
- gint id;
GtkCheckMenuItem *item;
msginfo = gtk_cmctree_node_get_row_data
(GTK_CMCTREE(summaryview->ctree),
@@ -6031,7 +6027,6 @@
for (; tags; tags = tags->next) {
gint num_checked = GPOINTER_TO_INT(g_hash_table_lookup(menu_allsel_table, tags->data));
- id = GPOINTER_TO_INT(tags->data);
item = g_hash_table_lookup(menu_table, GINT_TO_POINTER(tags->data));
if (item && !gtk_check_menu_item_get_active(item)) {
gtk_check_menu_item_set_active
@@ -6620,7 +6615,6 @@
GtkCMCTree *ctree = GTK_CMCTREE(widget);
GtkCMCTreeNode *node;
MessageView *messageview;
- TextView *textview;
GtkAdjustment *adj;
gboolean mod_pressed;
@@ -6631,7 +6625,6 @@
return FALSE;
messageview = summaryview->messageview;
- textview = messageview->mimeview->textview;
mod_pressed =
((event->state & (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
Index: mutt.c
===================================================================
RCS file: /home/claws-mail/claws/src/mutt.c,v
retrieving revision 1.6.10.21
retrieving revision 1.6.10.22
diff -u -d -r1.6.10.21 -r1.6.10.22
--- mutt.c 27 May 2012 17:30:52 -0000 1.6.10.21
+++ mutt.c 12 Sep 2012 09:23:12 -0000 1.6.10.22
@@ -212,9 +212,9 @@
list = NULL;
cnt = 0;
pStart = rcpList;
- while( *pStart ) {
+ while( pStart && *pStart ) {
ptr = pStart;
- address = name = NULL;
+ address = NULL;
pName = pAddr = NULL;
/* Chew up spaces */
while( *ptr ) {
Index: partial_download.c
===================================================================
RCS file: /home/claws-mail/claws/src/partial_download.c,v
retrieving revision 1.1.2.27
retrieving revision 1.1.2.28
diff -u -d -r1.1.2.27 -r1.1.2.28
--- partial_download.c 7 Jul 2012 07:09:28 -0000 1.1.2.27
+++ partial_download.c 12 Sep 2012 09:23:12 -0000 1.1.2.28
@@ -72,7 +72,6 @@
gchar uidl[POPBUFSIZE];
time_t recv_time;
time_t now;
- gint partial_recv;
gchar *sanitized_uid = NULL;
if (!msginfo->extradata)
@@ -112,7 +111,6 @@
gchar tmp[POPBUFSIZE];
strretchomp(buf);
recv_time = RECV_TIME_NONE;
- partial_recv = POP3_TOTALLY_RECEIVED;
if (sscanf(buf, "%s\t%ld\t%s", uidl, (long int *) &recv_time,
tmp) < 2) {
@@ -386,7 +384,6 @@
gchar uidl[POPBUFSIZE];
time_t recv_time;
time_t now;
- gint partial_recv;
gchar *sanitized_uid = g_strdup(login);
subst_for_filename(sanitized_uid);
@@ -416,7 +413,6 @@
gchar tmp[POPBUFSIZE];
strretchomp(buf);
recv_time = RECV_TIME_NONE;
- partial_recv = POP3_TOTALLY_RECEIVED;
if (sscanf(buf, "%s\t%ld\t%s", uidl, (long int *) &recv_time,
tmp) < 2) {
Index: compose.c
===================================================================
RCS file: /home/claws-mail/claws/src/compose.c,v
retrieving revision 1.382.2.611
retrieving revision 1.382.2.612
diff -u -d -r1.382.2.611 -r1.382.2.612
--- compose.c 12 Sep 2012 08:52:47 -0000 1.382.2.611
+++ compose.c 12 Sep 2012 09:23:11 -0000 1.382.2.612
@@ -889,10 +889,7 @@
for (i = 0; i < 8; i++) {
if (success[i] == FALSE) {
- GtkStyle *style;
-
g_warning("Compose: color allocation failed.\n");
- style = gtk_widget_get_style(GTK_WIDGET(text));
quote_color1 = quote_color2 = quote_color3 =
quote_bgcolor1 = quote_bgcolor2 = quote_bgcolor3 =
signature_color = uri_color = black;
@@ -2344,8 +2341,8 @@
}
if (fp != NULL) {
- gboolean prev_autowrap = compose->autowrap;
- GtkTextBuffer *buffer = textbuf;
+ gboolean prev_autowrap;
+ GtkTextBuffer *buffer;
BLOCK_WRAP();
while (fgets(buf, sizeof(buf), fp) != NULL) {
strcrchomp(buf);
@@ -2568,8 +2565,6 @@
gchar *tmp = g_strdup(begin);
gchar *o_tmp = tmp;
tmp[cur-begin]='\0';
- cur++;
- begin = cur;
while (*tmp == ' ' || *tmp == '\t')
tmp++;
compose_add_header_entry(compose, header, tmp, pref_type);
@@ -7036,8 +7031,6 @@
G_CALLBACK(compose_savemsg_select_cb),
compose);
- rowcount++;
-
return table;
}
Index: addrindex.c
===================================================================
RCS file: /home/claws-mail/claws/src/addrindex.c,v
retrieving revision 1.28.2.49
retrieving revision 1.28.2.50
diff -u -d -r1.28.2.49 -r1.28.2.50
--- addrindex.c 7 Jul 2012 07:09:26 -0000 1.28.2.49
+++ addrindex.c 12 Sep 2012 09:23:11 -0000 1.28.2.50
@@ -1572,7 +1572,6 @@
* \param file Address index file.
*/
static void addrindex_read_index( AddressIndex *addrIndex, XMLFile *file ) {
- guint prev_level;
XMLTag *xtag;
AddressInterface *iface = NULL, *dsIFace = NULL;
AddressDataSource *ds;
@@ -1580,7 +1579,6 @@
addrIndex->loadedFlag = FALSE;
for (;;) {
- prev_level = file->level;
rc = xml_parse_next_tag( file );
if( file->level == 0 ) return;
Index: ldif.c
===================================================================
RCS file: /home/claws-mail/claws/src/ldif.c,v
retrieving revision 1.12.2.25
retrieving revision 1.12.2.26
diff -u -d -r1.12.2.25 -r1.12.2.26
--- ldif.c 27 May 2012 17:30:51 -0000 1.12.2.25
+++ ldif.c 12 Sep 2012 09:23:12 -0000 1.12.2.26
@@ -718,7 +718,6 @@
mgu_free_list( listValue );
lastTag = NULL;
listValue = NULL;
- last64 = FALSE;
}
lastTag = g_strdup( tagName );
Index: procmsg.c
===================================================================
RCS file: /home/claws-mail/claws/src/procmsg.c,v
retrieving revision 1.150.2.126
retrieving revision 1.150.2.127
diff -u -d -r1.150.2.126 -r1.150.2.127
--- procmsg.c 8 Sep 2012 20:23:11 -0000 1.150.2.126
+++ procmsg.c 12 Sep 2012 09:23:12 -0000 1.150.2.127
@@ -827,7 +827,6 @@
debug_print("\n");
parse_again:
- nothing_to_sort = TRUE;
cur = orig;
while (cur) {
gchar *file = NULL;
@@ -844,6 +843,7 @@
nothing_to_sort = FALSE;
goto parse_again;
}
+ nothing_to_sort = TRUE;
cur = cur->next;
}
@@ -875,7 +875,7 @@
{
gchar *file = folder_item_fetch_msg(queue, msginfo->msgnum);
PrefsAccount *ac = procmsg_get_account_from_file(file);
- GSList *cur = elem;
+ GSList *cur;
g_free(file);
for (cur = elem; cur; cur = cur->next) {
MsgInfo *cur_msginfo = (MsgInfo *)cur->data;
@@ -1526,8 +1526,6 @@
gboolean save_clear_text = TRUE;
gchar *tmp_enc_file = NULL;
- int local = 0;
-
cm_return_val_if_fail(file != NULL, -1);
if ((fp = g_fopen(file, "rb")) == NULL) {
@@ -1671,7 +1669,6 @@
} else if (mailac && mailac->use_mail_command &&
mailac->mail_command && (* mailac->mail_command)) {
mailval = send_message_local(mailac->mail_command, fp);
- local = 1;
} else {
if (!mailac) {
mailac = account_find_from_smtp_server(from, smtpserver);
Index: prefs_toolbar.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_toolbar.c,v
retrieving revision 1.30.2.73
retrieving revision 1.30.2.74
diff -u -d -r1.30.2.73 -r1.30.2.74
--- prefs_toolbar.c 8 Sep 2012 20:23:11 -0000 1.30.2.73
+++ prefs_toolbar.c 12 Sep 2012 09:23:12 -0000 1.30.2.74
@@ -1602,11 +1602,9 @@
GdkEventButton *event,
ToolbarPage *prefs_toolbar )
{
- GtkWidget *event_widget, *button;
+ GtkWidget *event_widget;
gboolean restore = TRUE;
- button = prefs_toolbar->icon_button;
-
/* Test where mouse was clicked */
event_widget = gtk_get_event_widget((GdkEvent *)event);
if (event_widget != widget) {
Index: mbox.c
===================================================================
RCS file: /home/claws-mail/claws/src/mbox.c,v
retrieving revision 1.28.2.52
retrieving revision 1.28.2.53
diff -u -d -r1.28.2.52 -r1.28.2.53
--- mbox.c 7 Jul 2012 07:09:28 -0000 1.28.2.52
+++ mbox.c 12 Sep 2012 09:23:12 -0000 1.28.2.53
@@ -154,15 +154,11 @@
empty_lines = 0;
lines = 0;
- more = FALSE;
/* process all lines from mboxrc file */
while (fgets(buf, sizeof(buf), mbox_fp) != NULL) {
int offset;
- /* eof not reached, expect more lines */
- more = TRUE;
-
/* eat empty lines */
if (buf[0] == '\n' || buf[0] == '\r') {
empty_lines++;
Index: addressbook.c
===================================================================
RCS file: /home/claws-mail/claws/src/addressbook.c,v
retrieving revision 1.60.2.149
retrieving revision 1.60.2.150
diff -u -d -r1.60.2.149 -r1.60.2.150
--- addressbook.c 7 Jul 2012 07:09:26 -0000 1.60.2.149
+++ addressbook.c 12 Sep 2012 09:23:11 -0000 1.60.2.150
@@ -2900,7 +2900,7 @@
/* Confirm deletion */
delType = ADDRTREE_DEL_NONE;
if( obj->type == ADDR_ITEM_FOLDER ) {
- if( iface->externalQuery ) {
+ if( iface && iface->externalQuery ) {
message = g_strdup_printf( _(
"Do you want to delete the query " \
"results and addresses in '%s' ?" ),
@@ -2967,7 +2967,7 @@
cache = adbase->addressCache;
/* Remove query results folder */
- if( iface->externalQuery ) {
+ if( iface && iface->externalQuery ) {
AdapterFolder *adapter = ADAPTER_FOLDER(obj);
ItemFolder *folder = adapter->itemFolder;
@@ -3708,11 +3708,9 @@
static void addressbook_folder_remove_one_person( GtkCMCTree *clist, ItemPerson *person ) {
GtkCMCTreeNode *node;
- gint row;
if( person == NULL ) return;
node = gtk_cmctree_find_by_row_data( clist, NULL, person );
- row = gtk_cmclist_find_row_from_data( GTK_CMCLIST(clist), person );
if( node ) {
addressbook_folder_remove_node( clist, node );
}
@@ -3875,15 +3873,15 @@
if( obj->type == ADDR_DATASOURCE ) {
ads = ADAPTER_DSOURCE(obj);
- ds = ADAPTER_DSOURCE(obj)->dataSource;
+ ds = ads->dataSource;
if( ds ) {
/* Load root folder */
ItemFolder *rootFolder = NULL;
rootFolder = addrindex_ds_get_root_folder( ds );
addressbook_folder_load_person(
- ctreelist, addrindex_ds_get_root_folder( ds ) );
+ ctreelist, rootFolder );
addressbook_folder_load_group(
- ctreelist, addrindex_ds_get_root_folder( ds ) );
+ ctreelist, rootFolder );
}
}
else {
@@ -4577,8 +4575,6 @@
AddressDataSource *ds, gchar *searchTerm,
GtkCMCTreeNode *pNode )
{
- AddrBookBase *adbase;
- AddressCache *cache;
ItemFolder *folder;
gchar *name;
gint queryID;
@@ -4598,9 +4594,6 @@
else {
return;
}
- /* Get reference to address cache */
- adbase = ( AddrBookBase * ) ds->rawDataSource;
- cache = adbase->addressCache;
/* Create a folder for the search results */
name = g_strdup_printf( _queryFolderLabel_, searchTerm );
Index: prefs_filtering_action.c
===================================================================
RCS file: /home/claws-mail/claws/src/prefs_filtering_action.c,v
retrieving revision 1.1.4.78
retrieving revision 1.1.4.79
diff -u -d -r1.1.4.78 -r1.1.4.79
--- prefs_filtering_action.c 8 Sep 2012 20:23:11 -0000 1.1.4.78
+++ prefs_filtering_action.c 12 Sep 2012 09:23:12 -0000 1.1.4.79
@@ -543,6 +543,7 @@
gtk_combo_box_append_text(GTK_COMBO_BOX(tags_combo), (gpointer) name);
g_free(name);
}
+ g_slist_free(tags);
prefs_filtering_action_check_widget_width(tags_combo);
gtk_combo_box_set_active(GTK_COMBO_BOX(tags_combo), 0);
Index: mimeview.c
===================================================================
RCS file: /home/claws-mail/claws/src/mimeview.c,v
retrieving revision 1.83.2.194
retrieving revision 1.83.2.195
diff -u -d -r1.83.2.194 -r1.83.2.195
--- mimeview.c 8 Sep 2012 20:23:10 -0000 1.83.2.194
+++ mimeview.c 12 Sep 2012 09:23:12 -0000 1.83.2.195
@@ -1050,13 +1050,11 @@
icon = STOCK_PIXMAP_PRIVACY_FAILED;
break;
case SIGNATURE_CHECK_FAILED:
- button_text = _("Check again");
- func = check_signature_cb;
- icon = STOCK_PIXMAP_PRIVACY_UNKNOWN;
case SIGNATURE_CHECK_TIMEOUT:
button_text = _("Check again");
func = check_signature_cb;
icon = STOCK_PIXMAP_PRIVACY_UNKNOWN;
+ break;
default:
break;
}
Index: textview.c
===================================================================
RCS file: /home/claws-mail/claws/src/textview.c,v
retrieving revision 1.96.2.247
retrieving revision 1.96.2.248
diff -u -d -r1.96.2.247 -r1.96.2.248
--- textview.c 8 Sep 2012 20:23:11 -0000 1.96.2.247
+++ textview.c 12 Sep 2012 09:23:12 -0000 1.96.2.248
@@ -1361,7 +1361,7 @@
gtk_text_buffer_get_end_iter(buffer, &iter);
/* parse for clickable parts, and build a list of begin and end positions */
- for (walk = mybuf, n = 0;;) {
+ for (walk = mybuf;;) {
gint last_index = PARSE_ELEMS;
gchar *scanpos = NULL;
@@ -1481,7 +1481,7 @@
offset = gtk_text_iter_get_offset(&start_iter);
/* parse for clickable parts, and build a list of begin and end positions */
- for (walk = mybuf, n = 0;;) {
+ for (walk = mybuf;;) {
gint last_index = PARSE_ELEMS;
gchar *scanpos = NULL;
Index: folder.c
===================================================================
RCS file: /home/claws-mail/claws/src/folder.c,v
retrieving revision 1.213.2.210
retrieving revision 1.213.2.211
diff -u -d -r1.213.2.210 -r1.213.2.211
--- folder.c 8 Sep 2012 20:23:10 -0000 1.213.2.210
+++ folder.c 12 Sep 2012 09:23:12 -0000 1.213.2.211
@@ -407,7 +407,7 @@
cm_return_if_fail(item->folder != NULL);
cm_return_if_fail(item->folder->node != NULL);
- start_node = node = item->node;
+ start_node = item->node;
node = item->folder->node;
@@ -2775,13 +2775,11 @@
MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num)
{
- Folder *folder;
MsgInfo *msginfo = NULL;
cm_return_val_if_fail(item != NULL, NULL);
if (item->no_select)
return NULL;
- folder = item->folder;
if (!item->cache)
folder_item_read_cache(item);
@@ -2799,7 +2797,6 @@
MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
{
- Folder *folder;
MsgInfo *msginfo;
cm_return_val_if_fail(item != NULL, NULL);
@@ -2807,7 +2804,6 @@
if (item->no_select)
return FALSE;
- folder = item->folder;
if (!item->cache)
folder_item_read_cache(item);
@@ -3342,8 +3338,6 @@
tmp = folder_item_parent(tmp);
}
- tmp = folder_item_parent(src);
-
src_identifier = folder_item_get_identifier(src);
dst_identifier = folder_item_get_identifier(dest);
Index: addrharvest.c
===================================================================
RCS file: /home/claws-mail/claws/src/addrharvest.c,v
retrieving revision 1.6.10.27
retrieving revision 1.6.10.28
diff -u -d -r1.6.10.27 -r1.6.10.28
--- addrharvest.c 27 May 2012 17:30:48 -0000 1.6.10.27
+++ addrharvest.c 12 Sep 2012 09:23:11 -0000 1.6.10.28
@@ -577,13 +577,10 @@
mgu_str_ltc2space( buffer, '(', ')' );
g_strstrip( buffer );
- if( g_ascii_strcasecmp( buffer, email ) == 0 ) {
+ if( g_ascii_strcasecmp( buffer, email ) == 0 )
name = g_strdup("");
- }
- else {
- name = buffer;
+ else
name = conv_unmime_header(buffer, NULL, TRUE);
- }
/* Insert into address book */
#ifndef USE_NEW_ADDRBOOK
Index: addritem.c
===================================================================
RCS file: /home/claws-mail/claws/src/addritem.c,v
retrieving revision 1.13.2.22
retrieving revision 1.13.2.23
diff -u -d -r1.13.2.22 -r1.13.2.23
--- addritem.c 27 May 2012 17:30:49 -0000 1.13.2.22
+++ addritem.c 12 Sep 2012 09:23:11 -0000 1.13.2.23
@@ -589,7 +589,7 @@
* \param attrib Attribute to remove.
*/
void addritem_person_remove_attribute( ItemPerson *person, const gchar *attrib ) {
- cm_return_if_fail( person != NULL || attrib != NULL );
+ cm_return_if_fail( person != NULL && attrib != NULL );
GList *attrib_list;
attrib_list = person->listAttrib;
Index: mainwindow.c
===================================================================
RCS file: /home/claws-mail/claws/src/mainwindow.c,v
retrieving revision 1.274.2.350
retrieving revision 1.274.2.351
diff -u -d -r1.274.2.350 -r1.274.2.351
--- mainwindow.c 8 Sep 2012 20:23:10 -0000 1.274.2.350
+++ mainwindow.c 12 Sep 2012 09:23:12 -0000 1.274.2.351
@@ -2918,7 +2918,6 @@
}
break;
case WIDE_LAYOUT:
- ppaned = mainwin->hpaned;
container = mainwin->vpaned;
if (gtk_widget_get_parent(mainwin->messageview->vbox) != NULL) {
mainwin->messageview->visible = FALSE;
@@ -3391,7 +3390,6 @@
messageview_is_visible(mainwin->messageview));
summaryview = mainwin->summaryview;
- menu_path = "Menu/View/Sort/DontSort";
switch (summaryview->sort_key) {
case SORT_BY_NUMBER:
Index: printing.c
===================================================================
RCS file: /home/claws-mail/claws/src/Attic/printing.c,v
retrieving revision 1.1.2.38
retrieving revision 1.1.2.39
diff -u -d -r1.1.2.38 -r1.1.2.39
--- printing.c 7 Jul 2012 07:09:30 -0000 1.1.2.38
+++ printing.c 12 Sep 2012 09:23:12 -0000 1.1.2.39
@@ -884,7 +884,6 @@
PangoFontDescription *desc;
int start, ii;
PangoLayoutIter *iter;
- double start_pos;
gint header_end_pos;
gint num_header_lines;
gint dummy;
@@ -923,7 +922,6 @@
page_height = 0;
start = 0;
ii = 0;
- start_pos = 0.;
iter = pango_layout_get_iter(print_data->layout);
/* find the last character of the header */
Index: procheader.c
===================================================================
RCS file: /home/claws-mail/claws/src/procheader.c,v
retrieving revision 1.47.2.58
retrieving revision 1.47.2.59
diff -u -d -r1.47.2.58 -r1.47.2.59
--- procheader.c 7 Jul 2012 07:09:30 -0000 1.47.2.58
+++ procheader.c 12 Sep 2012 09:23:12 -0000 1.47.2.59
@@ -284,7 +284,7 @@
Header * procheader_parse_header(gchar * buf)
{
- gchar *p = buf;
+ gchar *p;
Header * header;
gboolean addr_field = FALSE;
Index: procmime.c
===================================================================
RCS file: /home/claws-mail/claws/src/procmime.c,v
retrieving revision 1.49.2.149
retrieving revision 1.49.2.150
diff -u -d -r1.49.2.149 -r1.49.2.150
--- procmime.c 8 Sep 2012 20:23:11 -0000 1.49.2.149
+++ procmime.c 12 Sep 2012 09:23:12 -0000 1.49.2.150
@@ -1536,7 +1536,6 @@
gchar buf[BUFFSIZE];
FILE *fp;
int result = 0;
- gboolean done = FALSE;
gboolean start_found = FALSE;
gboolean end_found = FALSE;
@@ -1572,10 +1571,9 @@
hentry[6].body, hentry[7].body,
mimeinfo->data.filename, lastoffset,
len, short_scan);
- if (result == 1 && short_scan) {
- done = TRUE;
+ if (result == 1 && short_scan)
break;
- }
+
}
if (buf[2 + boundary_len] == '-' &&
More information about the Commits
mailing list