+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
( 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
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=43
+EXTRA_VERSION=44
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
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);
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;
}
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);
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);
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);
dictionary_delete(gtkaspeller->dictionary);
- debug_print("Aspell: gtkaspeller %0x deleted.\n",
- (gint) gtkaspeller);
+ debug_print("Aspell: gtkaspeller %p deleted.\n",
+ gtkaspeller);
g_free(gtkaspeller);
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;
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);
}
/* 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");
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;
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) {
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;
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;
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;
}
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;
}