From: Colin Leroy Date: Tue, 14 Nov 2006 07:26:45 +0000 (+0000) Subject: 2006-11-14 [colin] 2.6.0cvs44 X-Git-Tag: rel_2_7_0~164 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=c231550e3aaecac6b02df34d693c4d62f4bdaab3 2006-11-14 [colin] 2.6.0cvs44 * src/compose.c * src/inc.c * src/messageview.c * src/news.c * src/pop.c * src/procmsg.c * src/gtk/gtkaspell.c Fix 64-bit-related warnings * src/ssl_manager.c Fix possible infinite loop * src/plugins/pgpcore/sgpgme.c Remove useless check --- diff --git a/ChangeLog b/ChangeLog index 57556f688..16d678b05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2006-11-14 [colin] 2.6.0cvs44 + + * src/compose.c + * src/inc.c + * src/messageview.c + * src/news.c + * src/pop.c + * src/procmsg.c + * src/gtk/gtkaspell.c + Fix 64-bit-related warnings + * src/ssl_manager.c + Fix possible infinite loop + * src/plugins/pgpcore/sgpgme.c + Remove useless check + 2006-11-13 [colin] 2.6.0cvs43 * src/gtk/Makefile.am diff --git a/PATCHSETS b/PATCHSETS index 2358655d6..dad3a0fd2 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2068,3 +2068,4 @@ ( cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/plugins/pgpcore/sgpgme.c; ) > 2.6.0cvs41.patchset ( cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/plugins/pgpinline/pgpinline.c; cvs diff -u -r 1.1.2.41 -r 1.1.2.42 src/plugins/pgpmime/pgpmime.c; ) > 2.6.0cvs42.patchset ( cvs diff -u -r 1.20.2.9 -r 1.20.2.10 src/gtk/Makefile.am; ) > 2.6.0cvs43.patchset +( cvs diff -u -r 1.382.2.329 -r 1.382.2.330 src/compose.c; cvs diff -u -r 1.149.2.61 -r 1.149.2.62 src/inc.c; cvs diff -u -r 1.94.2.109 -r 1.94.2.110 src/messageview.c; cvs diff -u -r 1.101.2.32 -r 1.101.2.33 src/news.c; cvs diff -u -r 1.56.2.45 -r 1.56.2.46 src/pop.c; cvs diff -u -r 1.150.2.82 -r 1.150.2.83 src/procmsg.c; cvs diff -u -r 1.3.2.22 -r 1.3.2.23 src/ssl_manager.c; cvs diff -u -r 1.9.2.43 -r 1.9.2.44 src/gtk/gtkaspell.c; cvs diff -u -r 1.1.2.36 -r 1.1.2.37 src/plugins/pgpcore/sgpgme.c; ) > 2.6.0cvs44.patchset diff --git a/configure.ac b/configure.ac index 4ac19e44d..fd09387b3 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=6 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=43 +EXTRA_VERSION=44 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/compose.c b/src/compose.c index 4aaadc89c..9e6aee626 100644 --- a/src/compose.c +++ b/src/compose.c @@ -2224,7 +2224,7 @@ static void compose_entries_set(Compose *compose, const gchar *mailto) gchar *subject = NULL; gchar *body = NULL; gchar *temp = NULL; - guint len = 0; + gsize len = 0; gchar *attach = NULL; scan_mailto_url(mailto, &to, &cc, NULL, &subject, &body, &attach); diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c index 136540a09..58bffba61 100644 --- a/src/gtk/gtkaspell.c +++ b/src/gtk/gtkaspell.c @@ -443,7 +443,7 @@ GtkAspell *gtkaspell_new(const gchar *dictionary_path, g_signal_connect(G_OBJECT(gtktext), "populate-popup", G_CALLBACK(button_press_intercept_cb), gtkaspell); - debug_print("Aspell: created gtkaspell %0x\n", (guint) gtkaspell); + debug_print("Aspell: created gtkaspell %p\n", gtkaspell); return gtkaspell; } @@ -475,7 +475,7 @@ void gtkaspell_delete(GtkAspell *gtkaspell) g_free((gchar *)gtkaspell->dictionary_path); gtkaspell->dictionary_path = NULL; - debug_print("Aspell: deleting gtkaspell %0x\n", (guint) gtkaspell); + debug_print("Aspell: deleting gtkaspell %p\n", gtkaspell); g_free(gtkaspell); @@ -633,8 +633,8 @@ static GtkAspeller *gtkaspeller_new(Dictionary *dictionary) gtkaspellcheckers->checkers, gtkaspeller); - debug_print("Aspell: Created a new gtkaspeller %0x\n", - (gint) gtkaspeller); + debug_print("Aspell: Created a new gtkaspeller %p\n", + gtkaspeller); } else { dictionary_delete(dict); @@ -692,8 +692,8 @@ static GtkAspeller *gtkaspeller_delete(GtkAspeller *gtkaspeller) g_slist_remove(gtkaspellcheckers->checkers, gtkaspeller); - debug_print("Aspell: Deleting gtkaspeller %0x.\n", - (gint) gtkaspeller); + debug_print("Aspell: Deleting gtkaspeller %p.\n", + gtkaspeller); gtkaspeller_real_delete(gtkaspeller); @@ -714,8 +714,8 @@ static GtkAspeller *gtkaspeller_real_delete(GtkAspeller *gtkaspeller) dictionary_delete(gtkaspeller->dictionary); - debug_print("Aspell: gtkaspeller %0x deleted.\n", - (gint) gtkaspeller); + debug_print("Aspell: gtkaspeller %p deleted.\n", + gtkaspeller); g_free(gtkaspeller); @@ -849,8 +849,8 @@ gboolean gtkaspell_set_sug_mode(GtkAspell *gtkaspell, gint themode) g_return_val_if_fail(gtkaspell->gtkaspeller, FALSE); g_return_val_if_fail(gtkaspell->gtkaspeller->config, FALSE); - debug_print("Aspell: setting sug mode of gtkaspeller %0x to %d\n", - (guint) gtkaspell->gtkaspeller, themode); + debug_print("Aspell: setting sug mode of gtkaspeller %p to %d\n", + gtkaspell->gtkaspeller, themode); config = gtkaspell->gtkaspeller->config; diff --git a/src/inc.c b/src/inc.c index 4c7e0a15b..c30b29951 100644 --- a/src/inc.c +++ b/src/inc.c @@ -1325,8 +1325,8 @@ static gint get_spool(FolderItem *dest, const gchar *mbox, PrefsAccount *account if ((lockfd = lock_mbox(mbox, LOCK_FLOCK)) < 0) return -1; - g_snprintf(tmp_mbox, sizeof(tmp_mbox), "%s%ctmpmbox.%08x", - get_tmp_dir(), G_DIR_SEPARATOR, (gint)mbox); + g_snprintf(tmp_mbox, sizeof(tmp_mbox), "%s%ctmpmbox.%p", + get_tmp_dir(), G_DIR_SEPARATOR, mbox); if (copy_mbox(mbox, tmp_mbox) < 0) { unlock_mbox(mbox, lockfd, LOCK_FLOCK); diff --git a/src/messageview.c b/src/messageview.c index b7007706d..461c271f3 100644 --- a/src/messageview.c +++ b/src/messageview.c @@ -616,8 +616,8 @@ static gint disposition_notification_send(MsgInfo *msginfo) } /* write to temporary file */ - g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg%d", - get_rc_dir(), G_DIR_SEPARATOR, (gint)msginfo); + g_snprintf(tmp, sizeof(tmp), "%s%ctmpmsg%p", + get_rc_dir(), G_DIR_SEPARATOR, msginfo); if ((fp = g_fopen(tmp, "wb")) == NULL) { FILE_OP_ERROR(tmp, "fopen"); diff --git a/src/news.c b/src/news.c index aa54544e1..a88a79e16 100644 --- a/src/news.c +++ b/src/news.c @@ -789,8 +789,8 @@ gint news_cancel_article(Folder * folder, MsgInfo * msginfo) FILE * tmpfp; gchar buf[BUFFSIZE]; - tmp = g_strdup_printf("%s%ctmp%d", g_get_tmp_dir(), - G_DIR_SEPARATOR, (gint)msginfo); + tmp = g_strdup_printf("%s%ctmp%p", g_get_tmp_dir(), + G_DIR_SEPARATOR, msginfo); if (tmp == NULL) return -1; diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c index b92bba5c3..878dbc01d 100644 --- a/src/plugins/pgpcore/sgpgme.c +++ b/src/plugins/pgpcore/sgpgme.c @@ -187,10 +187,6 @@ gchar *sgpgme_sigstat_info_short(gpgme_ctx_t ctx, gpgme_verify_result_t status) if (sig == NULL) { return g_strdup(_("The signature has not been checked.")); } - if (sig->fpr == NULL) { - g_warning(_("PGP Core: Can't get key fingerprint.")); - return g_strdup(_("PGP Core: Can't get key fingerprint.")); - } err = gpgme_get_key(ctx, sig->fpr, &key, 0); if (gpg_err_code(err) == GPG_ERR_NO_AGENT) { diff --git a/src/pop.c b/src/pop.c index effe156a3..fe24b0609 100644 --- a/src/pop.c +++ b/src/pop.c @@ -234,7 +234,7 @@ static gint pop3_getrange_uidl_recv(Pop3Session *session, const gchar *data, gchar id[IDLEN + 1]; gchar buf[POPBUFSIZE]; gint buf_len; - gint num; + guint32 num; time_t recv_time; gint partial_recv; const gchar *p = data; diff --git a/src/procmsg.c b/src/procmsg.c index 7486414dc..469ac08e8 100644 --- a/src/procmsg.c +++ b/src/procmsg.c @@ -1679,8 +1679,8 @@ send_mail: FILE *tmpfp; /* write to temporary file */ - tmp = g_strdup_printf("%s%ctmp%d", g_get_tmp_dir(), - G_DIR_SEPARATOR, (gint)file); + tmp = g_strdup_printf("%s%ctmp%p", g_get_tmp_dir(), + G_DIR_SEPARATOR, file); if ((tmpfp = g_fopen(tmp, "wb")) == NULL) { FILE_OP_ERROR(tmp, "fopen"); newsval = -1; diff --git a/src/ssl_manager.c b/src/ssl_manager.c index ad3d0fc65..19d653442 100644 --- a/src/ssl_manager.c +++ b/src/ssl_manager.c @@ -215,8 +215,8 @@ static char *get_server(char *str) int previous_dot_pos; first_pos = tmp; - while ((tmp = strstr(tmp,".")) != NULL) { - *tmp++; + while (tmp && (tmp = strstr(tmp,".")) != NULL) { + tmp++; previous_pos = last_pos; last_pos = tmp; } @@ -234,8 +234,8 @@ static char *get_port(char *str) char *ret = NULL, *tmp = g_strdup(str); char *previous_pos = NULL, *last_pos = NULL; - while ((tmp = strstr(tmp,".")) != NULL) { - *tmp++; + while (tmp && (tmp = strstr(tmp,".")) != NULL) { + tmp++; previous_pos = last_pos; last_pos = tmp; }