From 0e90ad90d38704ef603a504516d14a549e046209 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:35:59 +0200 Subject: [PATCH 01/69] Add a hint that this isn't a vanilla build --- src/gtk/about.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/gtk/about.c b/src/gtk/about.c index fa5b64d..6cdbd33 100644 --- a/src/gtk/about.c +++ b/src/gtk/about.c @@ -711,7 +711,7 @@ static void about_create(void) gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER); gtk_box_pack_start(GTK_BOX(vbox2), label, FALSE, FALSE, 0); markup = g_markup_printf_escaped - ("Claws Mail\nversion %s", + ("Claws Mail\nversion %s with local patches", VERSION); gtk_label_set_markup(GTK_LABEL(label), markup); g_free(markup); -- 1.6.3.2 From 248342916868d16a3fe04aa364424878e8947638 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:00 +0200 Subject: [PATCH 02/69] Remove unecessary increment. --- src/common/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/utils.c b/src/common/utils.c index 276bbb1..8902cbb 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -4000,7 +4000,7 @@ void get_hex_str(gchar *out, guchar ch) INT_TO_HEX(hex, ch >> 4); *out++ = hex; INT_TO_HEX(hex, ch & 0x0f); - *out++ = hex; + *out = hex; } #undef REF_DEBUG -- 1.6.3.2 From bafaae7aa510894db1d6dbfcf52061aaa8d349e1 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:00 +0200 Subject: [PATCH 03/69] Remove pointless increment. --- src/common/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/utils.c b/src/common/utils.c index 8902cbb..80ba256 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -5227,7 +5227,7 @@ size_t fast_strftime(gchar *buf, gint buflen, const gchar *format, struct tm *lt *curpos++ = *format++; } } - *curpos++ = '\0'; + *curpos = '\0'; return total_done; } -- 1.6.3.2 From 2d10929e4db362d8502137dba393a74cdb0e9f2a Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:00 +0200 Subject: [PATCH 04/69] Incrementing rowcount has no effect here. --- src/compose.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/compose.c b/src/compose.c index 6fe0204..2856ade 100644 --- a/src/compose.c +++ b/src/compose.c @@ -6662,8 +6662,6 @@ static GtkWidget *compose_create_others(Compose *compose) G_CALLBACK(compose_savemsg_select_cb), compose); - rowcount++; - return table; } -- 1.6.3.2 From ada626b07a8fa01a1724431019937a7fc36b5212 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:00 +0200 Subject: [PATCH 05/69] Report if writing to the queue message failed after a problem with the key selection has been detected. --- src/compose.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/compose.c b/src/compose.c index 2856ade..269f09c 100644 --- a/src/compose.c +++ b/src/compose.c @@ -5672,6 +5672,8 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item, err |= (fprintf(fp, "X-Claws-Encrypt:%d\n", compose->use_encryption) < 0); /* and if encdata was null, it means there's been a problem in * key selection */ + if (err == TRUE) + g_warning("failed to write queue message\n"); lock = FALSE; fclose(fp); claws_unlink(tmp); -- 1.6.3.2 From e6a65a7ae2ac9acbadc64eeac490f157ebacfd99 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:01 +0200 Subject: [PATCH 06/69] Remove code that seems to be dead since r1.35. --- src/mh.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/src/mh.c b/src/mh.c index 3cfa7a0..3c6593a 100644 --- a/src/mh.c +++ b/src/mh.c @@ -463,7 +463,6 @@ static gint mh_copy_msgs(Folder *folder, FolderItem *dest, MsgInfoList *msglist, FolderItem *src = NULL; gchar *srcfile; gchar *destfile; - gint filemode = 0; FolderItemPrefs *prefs; MsgInfo *msginfo = NULL; MsgInfoList *cur = NULL; @@ -572,11 +571,6 @@ static gint mh_copy_msgs(Folder *folder, FolderItem *dest, MsgInfoList *msglist, if (prefs && prefs->enable_folder_chmod && prefs->folder_chmod) { if (chmod(destfile, prefs->folder_chmod) < 0) FILE_OP_ERROR(destfile, "chmod"); - - /* for mark file */ - filemode = prefs->folder_chmod; - if (filemode & S_IRGRP) filemode |= S_IWGRP; - if (filemode & S_IROTH) filemode |= S_IWOTH; } if (relation) g_relation_insert(relation, msginfo, GINT_TO_POINTER(dest->last_num+1)); -- 1.6.3.2 From 3ae7f1acf6e4e520a9bf3ecb1f8bf75348fcab73 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:01 +0200 Subject: [PATCH 07/69] Initializing p once is enough. --- src/common/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/utils.c b/src/common/utils.c index 80ba256..391e02e 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -2856,7 +2856,7 @@ gint canonicalize_file_replace(const gchar *file) gchar *normalize_newlines(const gchar *str) { - const gchar *p = str; + const gchar *p; gchar *out, *outp; out = outp = g_malloc(strlen(str) + 1); -- 1.6.3.2 From 95d0b3b4eef6c61414d0111baddd02d467fe8f8c Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:01 +0200 Subject: [PATCH 08/69] prev_autowrap is already initialized through the macros. --- src/compose.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/compose.c b/src/compose.c index 269f09c..3a4beee 100644 --- a/src/compose.c +++ b/src/compose.c @@ -2232,7 +2232,7 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch) } if (fp != NULL) { - gboolean prev_autowrap = compose->autowrap; + gboolean prev_autowrap; GtkTextBuffer *buffer = textbuf; BLOCK_WRAP(); while (fgets(buf, sizeof(buf), fp) != NULL) { -- 1.6.3.2 From 9ca771eeb54f887fba4353b3716baca51606dc3e Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:01 +0200 Subject: [PATCH 09/69] buffer will be initialized by BLOC_WRAP(). --- src/compose.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/compose.c b/src/compose.c index 3a4beee..cf4ef36 100644 --- a/src/compose.c +++ b/src/compose.c @@ -2233,7 +2233,7 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch) if (fp != NULL) { gboolean prev_autowrap; - GtkTextBuffer *buffer = textbuf; + GtkTextBuffer *buffer; BLOCK_WRAP(); while (fgets(buf, sizeof(buf), fp) != NULL) { strcrchomp(buf); -- 1.6.3.2 From 9d2d35854e337a6be8651bbf5ce077789f37fad6 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:01 +0200 Subject: [PATCH 10/69] Initializing p once is enough. --- src/procheader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/procheader.c b/src/procheader.c index 5b9b545..a727289 100644 --- a/src/procheader.c +++ b/src/procheader.c @@ -274,7 +274,7 @@ gboolean procheader_headername_equal(char * hdr1, char * hdr2) Header * procheader_parse_header(gchar * buf) { - gchar *p = buf; + gchar *p; Header * header; if ((*buf == ':') || (*buf == ' ')) -- 1.6.3.2 From e47ef0306fb1f6747cd934cfb0627d72d21b8468 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:02 +0200 Subject: [PATCH 11/69] Fix white space. --- src/procheader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/procheader.c b/src/procheader.c index a727289..5479bb4 100644 --- a/src/procheader.c +++ b/src/procheader.c @@ -275,7 +275,7 @@ gboolean procheader_headername_equal(char * hdr1, char * hdr2) Header * procheader_parse_header(gchar * buf) { gchar *p; - Header * header; + Header *header; if ((*buf == ':') || (*buf == ' ')) return NULL; -- 1.6.3.2 From 2d0e80383c403e65e277a92bb662e12e69c12c9d Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:02 +0200 Subject: [PATCH 12/69] Initializing cur once is enough. --- src/procmsg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/procmsg.c b/src/procmsg.c index 1daa89a..35c07c0 100644 --- a/src/procmsg.c +++ b/src/procmsg.c @@ -821,7 +821,7 @@ static gboolean procmsg_is_last_for_account(FolderItem *queue, MsgInfo *msginfo, { 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; -- 1.6.3.2 From 1fd4b02da3eb3435d0dbbab0e920c5b9a800eb5b Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:02 +0200 Subject: [PATCH 13/69] Set start_node to item->node directly. There's no need to involve node. --- src/folder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/folder.c b/src/folder.c index 15c53c5..4a61ce2 100644 --- a/src/folder.c +++ b/src/folder.c @@ -404,7 +404,7 @@ void folder_item_remove(FolderItem *item) 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; -- 1.6.3.2 From 3dcc5640f3d709c11b1991a7f3dec052a6a3c797 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:02 +0200 Subject: [PATCH 14/69] Remove interim variable tags. Maybe tmp should be renamed to tags. --- src/prefs_filtering_action.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c index abae26f..f419f48 100644 --- a/src/prefs_filtering_action.c +++ b/src/prefs_filtering_action.c @@ -360,7 +360,7 @@ static void prefs_filtering_action_create(void) static GdkGeometry geometry; GList * accounts; - GSList *tmp, *tags; + GSList *tmp; GtkSizeGroup *size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); GtkSizeGroup *size_action = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); @@ -513,7 +513,7 @@ static void prefs_filtering_action_create(void) tags_combo = gtk_combo_box_new_text (); gtk_size_group_add_widget(size_action, tags_combo); - for (tmp = tags = tags_get_list() ; tmp != NULL; + for (tmp = tags_get_list() ; tmp != NULL; tmp = tmp->next) { gchar *name = g_strdup(tags_get_tag(GPOINTER_TO_INT(tmp->data))); -- 1.6.3.2 From 9579f44eddb94b5595d0a2e5972a0b8b349d30fe Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:03 +0200 Subject: [PATCH 15/69] Fix dead stores. The inner loops already take care of setting n to 0. --- src/textview.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/textview.c b/src/textview.c index 5d326f1..a791f35 100644 --- a/src/textview.c +++ b/src/textview.c @@ -1249,7 +1249,7 @@ static void textview_make_clickable_parts(TextView *textview, 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; @@ -1369,7 +1369,7 @@ static void textview_make_clickable_parts_later(TextView *textview, 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; -- 1.6.3.2 From 65b93c6d2ad3e77522b1bbfaa2de3b8bc6916fef Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:03 +0200 Subject: [PATCH 16/69] Don't ignore gnutls_certificate_verify_peers2()'s return code. --- src/common/ssl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/common/ssl.c b/src/common/ssl.c index 932a5ab..610d6c3 100644 --- a/src/common/ssl.c +++ b/src/common/ssl.c @@ -318,7 +318,8 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method) r = gnutls_certificate_verify_peers2(session, &status); - if (!ssl_certificate_check(cert, status, sockinfo->canonical_name, sockinfo->hostname, sockinfo->port)) { + if (r < 0 + || !ssl_certificate_check(cert, status, sockinfo->canonical_name, sockinfo->hostname, sockinfo->port)) { gnutls_x509_crt_deinit(cert); gnutls_certificate_free_credentials(xcred); gnutls_deinit(session); -- 1.6.3.2 From c99f9682aa1f83dca512b1b87de455cd9678a1f8 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:03 +0200 Subject: [PATCH 17/69] str will never be read from srcp. --- src/common/utils.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/utils.c b/src/common/utils.c index 391e02e..30d39c2 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -704,7 +704,7 @@ void eliminate_parenthesis(gchar *str, gchar op, gchar cl) register gchar *srcp, *destp; gint in_brace; - srcp = destp = str; + destp = str; while ((destp = strchr(destp, op))) { in_brace = 1; @@ -728,7 +728,7 @@ void extract_parenthesis(gchar *str, gchar op, gchar cl) register gchar *srcp, *destp; gint in_brace; - srcp = destp = str; + destp = str; while ((srcp = strchr(destp, op))) { if (destp > str) @@ -757,7 +757,7 @@ static void extract_parenthesis_with_skip_quote(gchar *str, gchar quote_chr, gint in_brace; gboolean in_quote = FALSE; - srcp = destp = str; + destp = str; while ((srcp = strchr_with_skip_quote(destp, quote_chr, op))) { if (destp > str) @@ -803,7 +803,7 @@ void eliminate_address_comment(gchar *str) register gchar *srcp, *destp; gint in_brace; - srcp = destp = str; + destp = str; while ((destp = strchr(destp, '"'))) { if ((srcp = strchr(destp + 1, '"'))) { @@ -820,7 +820,7 @@ void eliminate_address_comment(gchar *str) } } - srcp = destp = str; + destp = str; while ((destp = strchr_with_skip_quote(destp, '"', '('))) { in_brace = 1; -- 1.6.3.2 From 6891ac7fa12b102054e00886558d9b3acb73d152 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:03 +0200 Subject: [PATCH 18/69] Remove write-only variable gtktext. --- src/gtk/gtkaspell.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c index 6957550..867a705 100644 --- a/src/gtk/gtkaspell.c +++ b/src/gtk/gtkaspell.c @@ -911,12 +911,9 @@ static gboolean check_at(GtkAspell *gtkaspell, gint from_pos) { gint start, end; char buf[GTKASPELLWORDSIZE]; - GtkTextView *gtktext; cm_return_val_if_fail(from_pos >= 0, FALSE); - gtktext = gtkaspell->gtktext; - if (!get_word_from_pos(gtkaspell, from_pos, buf, sizeof(buf), &start, &end)) return FALSE; @@ -1264,10 +1261,7 @@ static void replace_real_word_cb(gpointer data, const gchar *newword) /* Accept this word for this session */ static void add_word_to_session_cb(GtkWidget *w, gpointer data) { - GtkTextView *gtktext; GtkAspell *gtkaspell = (GtkAspell *) data; - gtktext = gtkaspell->gtktext; - enchant_dict_add_to_session(gtkaspell->gtkaspeller->speller, gtkaspell->theword, strlen(gtkaspell->theword)); @@ -1731,12 +1725,10 @@ static GSList *make_sug_menu(GtkAspell *gtkaspell) { GtkWidget *item; char *caption; - GtkTextView *gtktext; GtkAccelGroup *accel; GList *l = gtkaspell->suggestions_list; gchar *utf8buf; GSList *list = NULL; - gtktext = gtkaspell->gtktext; if (l == NULL) return NULL; @@ -2189,10 +2181,6 @@ static void switch_to_alternate_cb(GtkWidget *w, static void set_point_continue(GtkAspell *gtkaspell) { - GtkTextView *gtktext; - - gtktext = gtkaspell->gtktext; - gtkaspell->ctx.set_position(gtkaspell->ctx.data, gtkaspell->orig_pos); if (gtkaspell->continue_check) -- 1.6.3.2 From 23e71d9c93c52c08e7503233b8317751aa39ab33 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:03 +0200 Subject: [PATCH 19/69] Don't intialize tmp twice. --- src/gtk/gtkaspell.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c index 867a705..0ef6253 100644 --- a/src/gtk/gtkaspell.c +++ b/src/gtk/gtkaspell.c @@ -1952,7 +1952,6 @@ static GSList *populate_submenu(GtkAspell *gtkaspell) int count = 0; Dictionary *dict; GSList *tmp; - tmp = gtkaspellcheckers->dictionary_list; for (tmp = gtkaspellcheckers->dictionary_list; tmp != NULL; tmp = g_slist_next(tmp)) { -- 1.6.3.2 From 5a460437b001f811c9b5684ea96aac7b65021049 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:04 +0200 Subject: [PATCH 20/69] This hbox doesn't seem to be used. --- src/gtk/gtkaspell.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c index 0ef6253..3ad9869 100644 --- a/src/gtk/gtkaspell.c +++ b/src/gtk/gtkaspell.c @@ -1441,8 +1441,6 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data) gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); gtk_widget_show(label); - hbox = gtk_hbox_new(TRUE, 0); - gtkut_stock_button_set_create(&confirm_area, &cancel_button, GTK_STOCK_CANCEL, &ok_button, GTK_STOCK_OK, -- 1.6.3.2 From 56bc880dbc8ac279bd5ee4e464af0a7bc2c8f619 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:04 +0200 Subject: [PATCH 21/69] Not sure about this one, but otherwise w_hbox would have no purpose. --- src/gtk/gtkaspell.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c index 3ad9869..0c80c72 100644 --- a/src/gtk/gtkaspell.c +++ b/src/gtk/gtkaspell.c @@ -1397,10 +1397,10 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data) icon = gtk_image_new_from_stock(GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG); gtk_misc_set_alignment (GTK_MISC (icon), 0.5, 0.0); - gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (w_hbox), icon, FALSE, FALSE, 0); vbox = gtk_vbox_new (FALSE, 12); - gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (w_hbox), vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); label = gtk_label_new(thelabel); -- 1.6.3.2 From 8122737790180e814a39993539bf74454ebe1c74 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:04 +0200 Subject: [PATCH 22/69] Remove write-only variable wordlen. --- src/gtk/gtkaspell.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c index 0c80c72..ee15186 100644 --- a/src/gtk/gtkaspell.c +++ b/src/gtk/gtkaspell.c @@ -1181,7 +1181,7 @@ static void replace_word_cb(GtkWidget *w, gpointer data) static void replace_real_word(GtkAspell *gtkaspell, const gchar *newword) { - int oldlen, newlen, wordlen; + int oldlen, newlen; gint origpos; gint pos; GtkTextView *gtktext; @@ -1196,7 +1196,6 @@ static void replace_real_word(GtkAspell *gtkaspell, const gchar *newword) origpos = gtkaspell->orig_pos; pos = origpos; oldlen = gtkaspell->end_pos - gtkaspell->start_pos; - wordlen = strlen(gtkaspell->theword); newlen = strlen(newword); /* FIXME: multybyte characters? */ -- 1.6.3.2 From bf4505f6520d02039f5a81b6cc1aa802c763d2b4 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:04 +0200 Subject: [PATCH 23/69] Remove write-only variable end. Mark parameter as unused. --- src/gtk/gtkaspell.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c index ee15186..6ef689e 100644 --- a/src/gtk/gtkaspell.c +++ b/src/gtk/gtkaspell.c @@ -513,15 +513,17 @@ static void entry_delete_cb(GtkTextBuffer *textbuf, GtkAspell *gtkaspell) { int origpos; - gint start, end; - + gint start; + + /* XXX: unused parameter. */ + (void)enditer; + cm_return_if_fail(gtkaspell->gtkaspeller->speller); if (!gtkaspell->check_while_typing) return; start = gtk_text_iter_get_offset(startiter); - end = gtk_text_iter_get_offset(enditer); origpos = get_textview_buffer_offset(gtkaspell->gtktext); if (start) { check_at(gtkaspell, start - 1); -- 1.6.3.2 From 64215f3e5212d136229d14c5b7a0d4b771aa77ba Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:04 +0200 Subject: [PATCH 24/69] Remove write-only variable is_group. --- src/addr_compl.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/addr_compl.c b/src/addr_compl.c index e16d33c..e32ff4c 100644 --- a/src/addr_compl.c +++ b/src/addr_compl.c @@ -246,14 +246,9 @@ static gint add_address(const gchar *name, const gchar *address, const gchar *nick, const gchar *alias, GList *grp_emails) { address_entry *ae; - gboolean is_group = FALSE; - if (!name || !address) { - if (!address && !nick && !alias && grp_emails) { - is_group = TRUE; - } else - return -1; - } + if ((!name || !address) && (nick || alias || !grp_emails)) + return -1; ae = g_new0(address_entry, 1); -- 1.6.3.2 From ff08cde7e185f3d6db70381bf7b0412156b7c309 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:04 +0200 Subject: [PATCH 25/69] Fix dead store. --- src/addrharvest.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/addrharvest.c b/src/addrharvest.c index 8cb51ef..df1c0c3 100644 --- a/src/addrharvest.c +++ b/src/addrharvest.c @@ -528,7 +528,6 @@ static void addrharvest_parse_address( name = g_strdup(""); } else { - name = buffer; name = conv_unmime_header(buffer, NULL); } -- 1.6.3.2 From 948c94767e9a5b39ad337f67c4c5e4ce56182b2f Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:05 +0200 Subject: [PATCH 26/69] Remove write-only variable prev_level. --- src/addrindex.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/addrindex.c b/src/addrindex.c index a6e0de5..8a9b91d 100644 --- a/src/addrindex.c +++ b/src/addrindex.c @@ -1569,7 +1569,6 @@ static int addrindex_write_ldap( FILE *fp, AddressDataSource *ds, gint lvl ) { * \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; @@ -1577,7 +1576,6 @@ static void addrindex_read_index( AddressIndex *addrIndex, XMLFile *file ) { addrIndex->loadedFlag = FALSE; for (;;) { - prev_level = file->level; rc = xml_parse_next_tag( file ); if( file->level == 0 ) return; -- 1.6.3.2 From 170f02db4d83a0ff3bf448a2c305f294777a3d58 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:05 +0200 Subject: [PATCH 27/69] bp and ep are pointers so use NULL instead of 0. --- src/compose.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/compose.c b/src/compose.c index cf4ef36..dd1898b 100644 --- a/src/compose.c +++ b/src/compose.c @@ -4270,7 +4270,7 @@ colorize: } } - bp = ep = 0; + bp = ep = NULL; if (scanpos) { /* check if URI can be parsed */ if (parser[last_index].parse(walk, scanpos, (const gchar **)&bp, -- 1.6.3.2 From cde1b675c376dc0a17ed6192a8e92c4bc90544e1 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:05 +0200 Subject: [PATCH 28/69] Mark a potential problem. --- src/compose.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/compose.c b/src/compose.c index dd1898b..de068be 100644 --- a/src/compose.c +++ b/src/compose.c @@ -4280,6 +4280,7 @@ colorize: } else walk = scanpos + strlen(parser[last_index].needle); + /* XXX: The values written to walk will no be read. Should they be written to o_walk? */ } if (bp && ep) { uri_start = walk_pos + (bp - o_walk); -- 1.6.3.2 From 276c1b361110806ead095eb9fc5937914cd494b7 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:05 +0200 Subject: [PATCH 29/69] Fix dead store. --- src/compose.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/compose.c b/src/compose.c index de068be..ccc4410 100644 --- a/src/compose.c +++ b/src/compose.c @@ -2440,7 +2440,6 @@ void compose_entry_append(Compose *compose, const gchar *address, gchar *o_tmp = tmp; tmp[cur-begin]='\0'; cur++; - begin = cur; while (*tmp == ' ' || *tmp == '\t') tmp++; compose_add_header_entry(compose, header, tmp); -- 1.6.3.2 From eefde2780c5e1af749060bea473eee66aaba3021 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:05 +0200 Subject: [PATCH 30/69] Remove redundant code. body_fmt will be overwritten anyway, and the same code exists in the else block below. --- src/compose.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/src/compose.c b/src/compose.c index ccc4410..90b4018 100644 --- a/src/compose.c +++ b/src/compose.c @@ -1712,11 +1712,6 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo, const gchar *body_fmt = NULL; MsgInfo *full_msginfo; - if (prefs_common.fw_quotefmt && *prefs_common.fw_quotefmt) - body_fmt = gettext(prefs_common.fw_quotefmt); - else - body_fmt = ""; - full_msginfo = procmsg_msginfo_get_full_info(msginfo); if (!full_msginfo) full_msginfo = procmsg_msginfo_copy(msginfo); -- 1.6.3.2 From 958a7d6e5a7ca9f78414671032eceb3d2630e0b5 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:06 +0200 Subject: [PATCH 31/69] Remove write-only variable style. --- src/compose.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/compose.c b/src/compose.c index 90b4018..31f746f 100644 --- a/src/compose.c +++ b/src/compose.c @@ -854,10 +854,7 @@ static void compose_create_tags(GtkTextView *text, Compose *compose) 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; -- 1.6.3.2 From e8ca03bc500e5690f1eee5a230c6f33b6dd92161 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:06 +0200 Subject: [PATCH 32/69] Remove write-only variable folder. --- src/folder.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/folder.c b/src/folder.c index 4a61ce2..3360fe4 100644 --- a/src/folder.c +++ b/src/folder.c @@ -2652,13 +2652,11 @@ void folder_item_write_cache(FolderItem *item) 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); @@ -2676,7 +2674,6 @@ MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num) MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid) { - Folder *folder; MsgInfo *msginfo; cm_return_val_if_fail(item != NULL, NULL); @@ -2684,7 +2681,6 @@ MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid) if (item->no_select) return FALSE; - folder = item->folder; if (!item->cache) folder_item_read_cache(item); -- 1.6.3.2 From 0f7d90ace2e4d903d34a7983cc9d25f862a64002 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:06 +0200 Subject: [PATCH 33/69] Fix dead store. --- src/folder.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/folder.c b/src/folder.c index 3360fe4..6863ea5 100644 --- a/src/folder.c +++ b/src/folder.c @@ -3212,8 +3212,6 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite tmp = folder_item_parent(tmp); } - tmp = folder_item_parent(src); - src_identifier = folder_item_get_identifier(src); dst_identifier = folder_item_get_identifier(dest); -- 1.6.3.2 From b3d5495d431ce9c9bc555ffdd990e7c974f5c0c1 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:06 +0200 Subject: [PATCH 34/69] Remove write-only variable finished --- src/imap.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/imap.c b/src/imap.c index 712d0fd..1630c0e 100644 --- a/src/imap.c +++ b/src/imap.c @@ -3073,9 +3073,7 @@ static GSList *imap_get_uncached_messages(IMAPSession *session, 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; -- 1.6.3.2 From 237b444ad3f24ce30db1871e3c2e4548fb669019 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:06 +0200 Subject: [PATCH 35/69] Remove write-only variable single. --- src/imap.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/imap.c b/src/imap.c index 1630c0e..fcf2f74 100644 --- a/src/imap.c +++ b/src/imap.c @@ -1737,7 +1737,6 @@ static gint imap_do_copy_msgs(Folder *folder, FolderItem *dest, gint ok = MAILIMAP_NO_ERROR; GRelation *uid_mapping; gint last_num = 0; - gboolean single = FALSE; g_return_val_if_fail(folder != NULL, -1); g_return_val_if_fail(dest != NULL, -1); @@ -1751,8 +1750,6 @@ static gint imap_do_copy_msgs(Folder *folder, FolderItem *dest, } 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"); -- 1.6.3.2 From 6f9c211c8ad278a473c5b07f0266bd99ab036a65 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:06 +0200 Subject: [PATCH 36/69] Remove write-only variable lastuid_old. --- src/imap.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/imap.c b/src/imap.c index fcf2f74..7ca805d 100644 --- a/src/imap.c +++ b/src/imap.c @@ -3953,7 +3953,7 @@ static gint get_list_of_uids(IMAPSession *session, Folder *folder, IMAPFolderIte GSList *uidlist, *elem; int r = -1; clist * lep_uidlist; - gint ok, nummsgs = 0, lastuid_old; + gint ok, nummsgs = 0; if (session == NULL) { return -1; @@ -4003,8 +4003,6 @@ static gint get_list_of_uids(IMAPSession *session, Folder *folder, IMAPFolderIte return -1; } - lastuid_old = item->lastuid; - for (elem = uidlist; elem != NULL; elem = g_slist_next(elem)) { guint msgnum; -- 1.6.3.2 From 8472fd6eb7992f811c9d6662fed303d64121e75b Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:07 +0200 Subject: [PATCH 37/69] Remove write-only variable selected_folder. --- src/imap.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/imap.c b/src/imap.c index 7ca805d..22f16ab 100644 --- a/src/imap.c +++ b/src/imap.c @@ -4027,7 +4027,6 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list, gint nummsgs; GSList *uidlist = NULL; gchar *dir; - gboolean selected_folder; gint known_list_len = 0; debug_print("get_num_list\n"); @@ -4071,9 +4070,6 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list, 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"); -- 1.6.3.2 From e0e1388115139b4915245df9da4a507795f206d2 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:07 +0200 Subject: [PATCH 38/69] Remove dead assignment. --- src/mainwindow.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/mainwindow.c b/src/mainwindow.c index ff0be72..038a0b9 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -3283,7 +3283,6 @@ void main_window_set_menu_sensitive(MainWindow *mainwin) messageview_is_visible(mainwin->messageview)); summaryview = mainwin->summaryview; - menu_path = "Menu/View/Sort/DontSort"; switch (summaryview->sort_key) { case SORT_BY_NUMBER: -- 1.6.3.2 From 7821d066d1f33e43e28a334a1dc67c0fae27f108 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:07 +0200 Subject: [PATCH 39/69] Remove dead assignment. --- src/imap.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/imap.c b/src/imap.c index 22f16ab..444b1e1 100644 --- a/src/imap.c +++ b/src/imap.c @@ -5686,7 +5686,6 @@ char* imap_modified_utf7_to_utf8(const char *mbox, gboolean change_spaces) const char *src; char *dst, *res = malloc(2*strlen(mbox)+1); - bitbuf = 0; dst = res; src = mbox; if(!dst) return NULL; -- 1.6.3.2 From add2985aa95cdc6b9fb10cbb6582358f76994305 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:07 +0200 Subject: [PATCH 40/69] Remove dead assignment. --- src/ldif.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/ldif.c b/src/ldif.c index aa7c73c..d8f3b74 100644 --- a/src/ldif.c +++ b/src/ldif.c @@ -721,7 +721,6 @@ static void ldif_read_file( LdifFile *ldifFile, AddressCache *cache ) { mgu_free_list( listValue ); lastTag = NULL; listValue = NULL; - last64 = FALSE; } lastTag = g_strdup( tagName ); -- 1.6.3.2 From 07f3afbcc5dd579666ae30156e242c85cb0ff0b8 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:07 +0200 Subject: [PATCH 41/69] Remove dead assignment. --- src/imap.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/imap.c b/src/imap.c index 444b1e1..232a4f6 100644 --- a/src/imap.c +++ b/src/imap.c @@ -5819,7 +5819,6 @@ char* imap_utf8_to_modified_utf7(const char *src, gboolean change_spaces) /* 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); -- 1.6.3.2 From f6153ec7beccb6a90ceaeba737818af7981f1a64 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:07 +0200 Subject: [PATCH 42/69] Remove dead assignment in main_window_toggle_message_view(). --- src/mainwindow.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/mainwindow.c b/src/mainwindow.c index 038a0b9..3ce57de 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -2837,7 +2837,6 @@ void main_window_toggle_message_view(MainWindow *mainwin) } break; case WIDE_LAYOUT: - ppaned = mainwin->hpaned; container = mainwin->vpaned; if (mainwin->messageview->vbox->parent != NULL) { mainwin->messageview->visible = FALSE; -- 1.6.3.2 From d5844b13a3a9a0f3b014e30c0cf5be3c6294dc5b Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:08 +0200 Subject: [PATCH 43/69] Remove dead assignment in mainwindow_tags_menu_item_activate_item_cb(). --- src/mainwindow.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/mainwindow.c b/src/mainwindow.c index 3ce57de..da16d60 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -1009,7 +1009,6 @@ static void mainwindow_tags_menu_item_activate_item_cb(GtkMenuItem *menu_item, 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 && !item->active) { gtk_check_menu_item_set_active -- 1.6.3.2 From 65c6c0c840a91323e697f761b7fc726982cea869 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:08 +0200 Subject: [PATCH 44/69] Remove dead assignments in proc_mbox(). --- src/mbox.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/mbox.c b/src/mbox.c index df32656..7306742 100644 --- a/src/mbox.c +++ b/src/mbox.c @@ -153,15 +153,11 @@ gint proc_mbox(FolderItem *dest, const gchar *mbox, gboolean apply_filter, 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++; -- 1.6.3.2 From de7dd832020d4540fe0d0e06adc5a10ca79e1079 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:08 +0200 Subject: [PATCH 45/69] Remove write-only variable mainbox_size in icon_list_clear() --- src/mimeview.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/mimeview.c b/src/mimeview.c index 6c3cb30..78290a7 100644 --- a/src/mimeview.c +++ b/src/mimeview.c @@ -2402,14 +2402,12 @@ static void icon_list_clear (MimeView *mimeview) static void icon_scroll_size_allocate_cb(GtkWidget *widget, GtkAllocation *size, MimeView *mimeview) { - GtkAllocation *mainbox_size; GtkAllocation *vbox_size; GtkAllocation *layout_size; GtkAdjustment *adj; adj = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll)); - mainbox_size = &mimeview->icon_mainbox->allocation; vbox_size = &mimeview->icon_vbox->allocation; layout_size = &mimeview->icon_scroll->allocation; -- 1.6.3.2 From 61d25ab31184d04883c972e89e3a21d6d580a6e3 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:08 +0200 Subject: [PATCH 46/69] Remove write-only variable textview in icon_key_pressed() --- src/mimeview.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/mimeview.c b/src/mimeview.c index 78290a7..ea93596 100644 --- a/src/mimeview.c +++ b/src/mimeview.c @@ -2105,15 +2105,12 @@ static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event, gint num; MimeInfo *partinfo; SummaryView *summaryview; - TextView *textview; num = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button), "icon_number")); partinfo = g_object_get_data(G_OBJECT(button), "partinfo"); if (!event) return FALSE; - textview = mimeview->textview; - switch (event->keyval) { case GDK_space: if (mimeview_scroll_page(mimeview, FALSE)) -- 1.6.3.2 From 6baddcb6be456490541ebb58e286cc25f95764b9 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:08 +0200 Subject: [PATCH 47/69] In the switch() block in update_signature_noticeview(), make it more obvious that that SIGNATURE_CHECK_FAILED and SIGNATURE_CHECK_TIMEOUT are treated the same. Also let them have their own break statement instead of falling through the default case. --- src/mimeview.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/mimeview.c b/src/mimeview.c index ea93596..70331b6 100644 --- a/src/mimeview.c +++ b/src/mimeview.c @@ -895,13 +895,11 @@ static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo, 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; } -- 1.6.3.2 From 7a63b46539888501366964e3201c9424255f5877 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:08 +0200 Subject: [PATCH 48/69] Remove dead assignment in mutt_parse_rcplist(). --- src/mutt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/mutt.c b/src/mutt.c index d6b1dd0..28c57a1 100644 --- a/src/mutt.c +++ b/src/mutt.c @@ -214,7 +214,7 @@ static GSList *mutt_parse_rcplist( gchar *rcpList, gint *addrCount ) { pStart = rcpList; while( *pStart ) { ptr = pStart; - address = name = NULL; + address = NULL; pName = pAddr = NULL; /* Chew up spaces */ while( *ptr ) { -- 1.6.3.2 From 285d5a628b4e9fade3485192297fba5b43fb4f7a Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:36:09 +0200 Subject: [PATCH 49/69] Remove write-only variable partial_recv. --- src/partial_download.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/partial_download.c b/src/partial_download.c index 3623027..f33c076 100644 --- a/src/partial_download.c +++ b/src/partial_download.c @@ -71,7 +71,6 @@ int partial_msg_in_uidl_list(MsgInfo *msginfo) gchar uidl[POPBUFSIZE]; time_t recv_time; time_t now; - gint partial_recv; gchar *sanitized_uid = NULL; if (!msginfo->extradata) @@ -111,7 +110,6 @@ int partial_msg_in_uidl_list(MsgInfo *msginfo) 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) { @@ -385,7 +383,6 @@ gchar *partial_get_filename(const gchar *server, const gchar *login, gchar uidl[POPBUFSIZE]; time_t recv_time; time_t now; - gint partial_recv; gchar *sanitized_uid = g_strdup(login); subst_for_filename(sanitized_uid); @@ -415,7 +412,6 @@ gchar *partial_get_filename(const gchar *server, const gchar *login, 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) { -- 1.6.3.2 From 179d39f8808925f94528a0624222c92ae5619f4c Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 5 Jul 2009 12:40:55 +0200 Subject: [PATCH 50/69] Remove write-only variable start_pos in printing_textview_cb_begin_print(). --- src/printing.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/printing.c b/src/printing.c index 8b28634..bad141f 100644 --- a/src/printing.c +++ b/src/printing.c @@ -875,7 +875,6 @@ static void printing_textview_cb_begin_print(GtkPrintOperation *op, GtkPrintCont PangoFontDescription *desc; int start, ii; PangoLayoutIter *iter; - double start_pos; gint header_end_pos; gint num_header_lines; gint dummy; @@ -914,7 +913,6 @@ static void printing_textview_cb_begin_print(GtkPrintOperation *op, GtkPrintCont 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 */ -- 1.6.3.2 From dc2561b28cf17024863f1f5d30e1974773a60ec9 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 28 Jun 2009 17:32:23 +0200 Subject: [PATCH 51/69] Remove write-only variable button in icon_window_button_press(). --- src/prefs_toolbar.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c index 55ddecc..e4456a9 100644 --- a/src/prefs_toolbar.c +++ b/src/prefs_toolbar.c @@ -1352,11 +1352,9 @@ static gboolean icon_window_button_press(GtkWidget *widget, 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) { -- 1.6.3.2 From a8ed79dececfffbdfe23ffdbba5aeeb0ff2d2546 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 28 Jun 2009 17:41:24 +0200 Subject: [PATCH 52/69] Remove write-only variable done in procmime_parse_multipart(). --- src/procmime.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/src/procmime.c b/src/procmime.c index 7182fd1..a68c4e7 100644 --- a/src/procmime.c +++ b/src/procmime.c @@ -1553,7 +1553,6 @@ static void procmime_parse_multipart(MimeInfo *mimeinfo, gboolean short_scan) gchar buf[BUFFSIZE]; FILE *fp; int result = 0; - gboolean done = FALSE; gboolean start_found = FALSE; gboolean end_found = FALSE; @@ -1589,10 +1588,8 @@ static void procmime_parse_multipart(MimeInfo *mimeinfo, gboolean short_scan) 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] == '-' && -- 1.6.3.2 From 6670eab6a86f3164af9db77eec0721125309b922 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 28 Jun 2009 17:42:55 +0200 Subject: [PATCH 53/69] Remove write-only variable local in procmsg_send_message_queue_full(). --- src/procmsg.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/procmsg.c b/src/procmsg.c index 35c07c0..bf18521 100644 --- a/src/procmsg.c +++ b/src/procmsg.c @@ -1458,8 +1458,6 @@ static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_ses 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) { @@ -1603,7 +1601,6 @@ send_mail: } 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); -- 1.6.3.2 From f3af0816c90b42d254ec35198690ad7026ac044b Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 28 Jun 2009 17:54:25 +0200 Subject: [PATCH 54/69] Remove adbase and cache in addressbook_perform_search(). --- src/addressbook.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/src/addressbook.c b/src/addressbook.c index da84a41..a22f3bd 100644 --- a/src/addressbook.c +++ b/src/addressbook.c @@ -4599,8 +4599,6 @@ static void addressbook_perform_search( AddressDataSource *ds, gchar *searchTerm, GtkCMCTreeNode *pNode ) { - AddrBookBase *adbase; - AddressCache *cache; ItemFolder *folder; gchar *name; gint queryID; @@ -4620,9 +4618,6 @@ static void addressbook_perform_search( 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 ); -- 1.6.3.2 From a4df244659021b68dacb53ec00cbb19d62cc4710 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 28 Jun 2009 17:59:53 +0200 Subject: [PATCH 55/69] How about we actually use rootFolder in addressbook_set_clist(). --- src/addressbook.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/addressbook.c b/src/addressbook.c index a22f3bd..7933efd 100644 --- a/src/addressbook.c +++ b/src/addressbook.c @@ -3903,9 +3903,9 @@ static void addressbook_set_clist( AddressObject *obj, gboolean refresh ) { 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 { -- 1.6.3.2 From db3d0ba8458f083aba175721264987b192d53961 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 28 Jun 2009 18:01:45 +0200 Subject: [PATCH 56/69] How about we actually use ads in addressbook_set_clist(). --- src/addressbook.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/addressbook.c b/src/addressbook.c index 7933efd..d58f675 100644 --- a/src/addressbook.c +++ b/src/addressbook.c @@ -3897,7 +3897,7 @@ static void addressbook_set_clist( AddressObject *obj, gboolean refresh ) { 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; -- 1.6.3.2 From a9915ecf5130113df1aa647bbf389b11df8d171f Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 28 Jun 2009 18:12:41 +0200 Subject: [PATCH 57/69] Remove write-only variable row in addressbook_folder_refresh_one_person() --- src/addressbook.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/addressbook.c b/src/addressbook.c index d58f675..0dbb424 100644 --- a/src/addressbook.c +++ b/src/addressbook.c @@ -3730,11 +3730,9 @@ static void addressbook_folder_refresh_one_person( GtkCMCTree *clist, ItemPerson 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 ); } -- 1.6.3.2 From eb6c317f5d4199ab613ed1690b539c2ea360907b Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 28 Jun 2009 18:29:49 +0200 Subject: [PATCH 58/69] Remove write-only variable i in imap_fetch_result_to_envelop_list() --- src/etpan/imap-thread.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c index ab21252..7d9b249 100644 --- a/src/etpan/imap-thread.c +++ b/src/etpan/imap-thread.c @@ -2677,10 +2677,8 @@ imap_fetch_result_to_envelop_list(clist * fetch_result, carray ** p_env_list) { clistiter * cur; - unsigned int i; carray * env_list; - i = 0; env_list = carray_new(16); if (fetch_result) { -- 1.6.3.2 From cb89a7f395767977b5c1a69bcadd09af977fb4c9 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 28 Jun 2009 18:37:38 +0200 Subject: [PATCH 59/69] Remove write-only variable textview in gboolean summary_key_pressed() --- src/summaryview.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/summaryview.c b/src/summaryview.c index 4c8eb44..5a50be0 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -6537,7 +6537,6 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event, GtkCMCTree *ctree = GTK_CMCTREE(widget); GtkCMCTreeNode *node; MessageView *messageview; - TextView *textview; GtkAdjustment *adj; gboolean mod_pressed; @@ -6548,7 +6547,6 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event, return FALSE; messageview = summaryview->messageview; - textview = messageview->mimeview->textview; mod_pressed = ((event->state & (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0); -- 1.6.3.2 From 3d1eb9f993905bc8eca592bd9c5d191210f537f3 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 28 Jun 2009 18:41:07 +0200 Subject: [PATCH 60/69] Remove write-only variable id in summary_tags_menu_item_activate_item_cb() --- src/summaryview.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/summaryview.c b/src/summaryview.c index 5a50be0..e898a09 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -5929,7 +5929,6 @@ static void summary_tags_menu_item_activate_item_cb(GtkMenuItem *menu_item, 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), @@ -5942,7 +5941,6 @@ static void summary_tags_menu_item_activate_item_cb(GtkMenuItem *menu_item, 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 && !item->active) { gtk_check_menu_item_set_active -- 1.6.3.2 From a8b13eb5909b73d1579b259aeedd034f58942492 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 28 Jun 2009 18:44:44 +0200 Subject: [PATCH 61/69] Remove write-only variable changed in summary_lock_row() --- src/summaryview.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/summaryview.c b/src/summaryview.c index e898a09..5c28d01 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -3796,7 +3796,6 @@ static void summary_mark_row(SummaryView *summaryview, GtkCMCTreeNode *row) static void summary_lock_row(SummaryView *summaryview, GtkCMCTreeNode *row) { - gboolean changed = FALSE; GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree); MsgInfo *msginfo; @@ -3806,11 +3805,9 @@ static void summary_lock_row(SummaryView *summaryview, GtkCMCTreeNode *row) 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, -- 1.6.3.2 From c33c306b1736c7790f59463c66963f97b4624095 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 28 Jun 2009 18:55:08 +0200 Subject: [PATCH 62/69] Fix a NULL pointer dereference in vcard_build_items(), assuming the check is necessary. --- src/vcard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/vcard.c b/src/vcard.c index 4ae3dc5..fec0018 100644 --- a/src/vcard.c +++ b/src/vcard.c @@ -345,8 +345,8 @@ static void vcard_build_items( if( *str != '\0' ) { ItemEMail *email = addritem_create_item_email(); addritem_email_set_address( email, str ); - str = nodeRemarks->data; if( nodeRemarks ) { + str = nodeRemarks->data; if( str ) { if( g_utf8_collate( str, "internet" ) != 0 ) { if( *str != '\0' ) -- 1.6.3.2 From 0b7704a7cb8d5b4a6fc9d9e339b8b97e24a6dd07 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 28 Jun 2009 20:09:54 +0200 Subject: [PATCH 63/69] Fix a NULL pointer dereference in mutt_parse_rcplist() if no closing parenthesis is found. --- src/mutt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/mutt.c b/src/mutt.c index 28c57a1..3efd9ce 100644 --- a/src/mutt.c +++ b/src/mutt.c @@ -212,7 +212,7 @@ static GSList *mutt_parse_rcplist( gchar *rcpList, gint *addrCount ) { list = NULL; cnt = 0; pStart = rcpList; - while( *pStart ) { + while( pStart && *pStart ) { ptr = pStart; address = NULL; pName = pAddr = NULL; -- 1.6.3.2 From cc8863ee811f0385273fbfb50ed048673efb8a69 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 28 Jun 2009 20:45:12 +0200 Subject: [PATCH 64/69] Fix a NULL pointer dereference in inc_finished(). --- src/inc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/inc.c b/src/inc.c index 4bdeaec..0c0c418 100644 --- a/src/inc.c +++ b/src/inc.c @@ -170,7 +170,7 @@ static void inc_finished(MainWindow *mainwin, gboolean new_messages, gboolean au 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(); -- 1.6.3.2 From 7084369900d7c3838696ec6590ddea2b7d2f9119 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 28 Jun 2009 21:00:03 +0200 Subject: [PATCH 65/69] Fix a cm_return_if_fail() condition in addritem_person_remove_attribute(). --- src/addritem.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/addritem.c b/src/addritem.c index 91a45cc..1cfe846 100644 --- a/src/addritem.c +++ b/src/addritem.c @@ -589,7 +589,7 @@ void addritem_person_add_attribute( * \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; -- 1.6.3.2 From 294853ce9a95faac867b5ce54e07e840d6d4f2ed Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 29 Jun 2009 14:57:41 +0200 Subject: [PATCH 66/69] Fix two NULL pointer dereferences in addressbook_treenode_delete_cb(). --- src/addressbook.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/addressbook.c b/src/addressbook.c index 0dbb424..4f0d3da 100644 --- a/src/addressbook.c +++ b/src/addressbook.c @@ -2926,7 +2926,7 @@ static void addressbook_treenode_delete_cb(GtkAction *action, gpointer data) /* 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' ?" ), @@ -2989,7 +2989,7 @@ static void addressbook_treenode_delete_cb(GtkAction *action, gpointer data) cache = adbase->addressCache; /* Remove query results folder */ - if( iface->externalQuery ) { + if( iface && iface->externalQuery ) { AdapterFolder *adapter = ADAPTER_FOLDER(obj); ItemFolder *folder = adapter->itemFolder; -- 1.6.3.2 From 95eaad6a2eba4d797a284f564f29b6e315fb8097 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 29 Jun 2009 17:03:44 +0200 Subject: [PATCH 67/69] Streamline create_description()'s prototype. It doesn't sue pass_hint for anything useful. --- src/plugins/pgpcore/passphrase.c | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c index c348f6b..1155fc3 100644 --- a/src/plugins/pgpcore/passphrase.c +++ b/src/plugins/pgpcore/passphrase.c @@ -58,8 +58,7 @@ static gint passphrase_deleted(GtkWidget *widget, GdkEventAny *event, static gboolean passphrase_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data); -static GtkWidget *create_description(const gchar *uid_hint, - const gchar *pass_hint, gint prev_bad, gint new_key); +static GtkWidget *create_description(const gchar *uid_hint, gint prev_bad, gint new_key); void gpgmegtk_set_passphrase_grab(gint yes) @@ -101,7 +100,7 @@ passphrase_mbox(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad, gi if (uid_hint || pass_hint) { GtkWidget *label, *icon; - label = create_description (uid_hint, pass_hint, prev_bad, new_key); + label = create_description (uid_hint, prev_bad, new_key); icon = gtk_image_new_from_stock(GTK_STOCK_DIALOG_AUTHENTICATION, GTK_ICON_SIZE_DIALOG); @@ -242,9 +241,9 @@ linelen (const gchar *s) } static GtkWidget * -create_description(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad, gint new_key) +create_description(const gchar *uid_hint, gint prev_bad, gint new_key) { - const gchar *uid = NULL, *info = NULL; + const gchar *uid = NULL; gchar *buf; GtkWidget *label; gchar *my_uid = NULL; @@ -252,10 +251,6 @@ create_description(const gchar *uid_hint, const gchar *pass_hint, gint prev_bad, uid = _("[no user id]"); else uid = uid_hint; - if (!pass_hint) - info = ""; - else - info = pass_hint; my_uid = g_strdup(uid); while (strchr(my_uid, '<')) -- 1.6.3.2 From aeb2372444f1f14a2724eadb25506182c86413b9 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 29 Jun 2009 17:05:42 +0200 Subject: [PATCH 68/69] Remove the write-only variable validity in sgpgme_verify_signature(). --- src/plugins/pgpcore/sgpgme.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c index 8410ab0..d256af2 100644 --- a/src/plugins/pgpcore/sgpgme.c +++ b/src/plugins/pgpcore/sgpgme.c @@ -84,7 +84,6 @@ gpgme_verify_result_t sgpgme_verify_signature(gpgme_ctx_t ctx, gpgme_data_t sig, SignatureStatus sgpgme_sigstat_gpgme_to_privacy(gpgme_ctx_t ctx, gpgme_verify_result_t status) { - unsigned long validity = 0; gpgme_signature_t sig = NULL; if (GPOINTER_TO_INT(status) == -GPG_ERR_SYSTEM_ERROR) { @@ -102,7 +101,6 @@ SignatureStatus sgpgme_sigstat_gpgme_to_privacy(gpgme_ctx_t ctx, gpgme_verify_re debug_print("sig == NULL\n"); return SIGNATURE_UNCHECKED; } - validity = sig->validity; debug_print("err code %d\n", gpg_err_code(sig->status)); switch (gpg_err_code(sig->status)) { -- 1.6.3.2 From 446036a6c52672b181afb94bdca0f7bcfffc86fd Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 29 Jun 2009 17:20:18 +0200 Subject: [PATCH 69/69] In procmsg_list_sort_by_account(), give nothing_to_sort the actual chance to be FALSE when its checked. XXX: This is a guess. --- src/procmsg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/procmsg.c b/src/procmsg.c index bf18521..b4f26d3 100644 --- a/src/procmsg.c +++ b/src/procmsg.c @@ -773,7 +773,6 @@ static GSList *procmsg_list_sort_by_account(FolderItem *queue, GSList *list) debug_print("\n"); parse_again: - nothing_to_sort = TRUE; cur = orig; while (cur) { gchar *file = NULL; @@ -790,6 +789,7 @@ parse_again: nothing_to_sort = FALSE; goto parse_again; } + nothing_to_sort = TRUE; cur = cur->next; } -- 1.6.3.2