+2002-08-08
+
+ * src/procmsg.c: procmsg_read_mark_file(): check key duplication
+ to avoid memory leak.
+
+2002-08-08
+
+ * src/base64.c: include string.h for memcpy().
+ * src/gtksctree.c: use macro ABS() instead of function abs().
+ * src/prefs_account.c
+ src/prefs_common.c: renamed 'send' to 'p_send' so as not to
+ conflict with the function send() in sys/socket.h.
+ * src/mainwindow.c: commented out the unnecessary functions.
+ * src/utils.c: canonicalize_file_replace(): correct warning message.
+
2002-08-08
* src/utils.[ch]: get_tmp_file(): new. Returns the directory for
+2002-08-09 [paul] 0.8.1claws39
+
+ * sync with 0.8.1cvs21
+ see ChangeLog 2002-08-08
+
2002-08-08 [oliver] 0.8.1claws38
* src/mainwindow.c
+2002-08-08
+
+ * src/procmsg.c: procmsg_read_mark_file(): ¥á¥â¥ê¥ê¡¼¥¯¤òÈò¤±¤ë
+ ¤¿¤á¥¡¼¤Î½ÅÊ£¤ò¥Á¥§¥Ã¥¯¡£
+
+2002-08-08
+
+ * src/base64.c: memcpy() ¤Î¤¿¤á¤Ë string.h ¤ò include ¤·¤¿¡£
+ * src/gtksctree.c: ´Ø¿ô abs() ¤ÎÂå¤ï¤ê¤Ë¥Þ¥¯¥í ABS() ¤ò»ÈÍÑ¡£
+ * src/prefs_account.c
+ src/prefs_common.c: sys/socket.h Ãæ¤Î´Ø¿ô send() ¤È¾×Æͤ·¤Ê¤¤¤è¤¦¤Ë
+ 'send' ¤ò 'p_send' ¤Ë̾¾ÎÊѹ¹¤·¤¿¡£
+ * src/mainwindow.c: ÉÔÍפʴؿô¤ò¥³¥á¥ó¥È¥¢¥¦¥È¤·¤¿¡£
+ * src/utils.c: canonicalize_file_replace(): ·Ù¹ð¥á¥Ã¥»¡¼¥¸¤òÄûÀµ¡£
+
2002-08-08
* src/utils.[ch]: get_tmp_file(): ¿·µ¬¡£ ~/.sylpheed/ Ãæ¤Î¥Æ¥ó¥Ý¥é¥ê
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=claws38
+EXTRA_VERSION=claws39
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
dnl set $target
#include <glib.h>
#include <ctype.h>
+#include <string.h>
#include "base64.h"
#include "gtksctree.h"
+
enum {
ROW_POPUP_MENU,
EMPTY_POPUP_MENU,
g_return_if_fail (GTK_IS_SCTREE (sctree));
range = ((state & GDK_SHIFT_MASK) != 0) &&
- (GTK_CLIST(sctree)->selection_mode != GTK_SELECTION_SINGLE) &&
- (GTK_CLIST(sctree)->selection_mode != GTK_SELECTION_BROWSE);
+ (GTK_CLIST(sctree)->selection_mode != GTK_SELECTION_SINGLE) &&
+ (GTK_CLIST(sctree)->selection_mode != GTK_SELECTION_BROWSE);
additive = ((state & GDK_CONTROL_MASK) != 0) &&
(GTK_CLIST(sctree)->selection_mode != GTK_SELECTION_SINGLE) &&
(GTK_CLIST(sctree)->selection_mode != GTK_SELECTION_BROWSE);
/* This is the same threshold value that is used in gtkdnd.c */
- if (MAX (abs (sctree->dnd_press_x - event->x),
- abs (sctree->dnd_press_y - event->y)) <= 3)
+ if (MAX (ABS (sctree->dnd_press_x - event->x),
+ ABS (sctree->dnd_press_y - event->y)) <= 3)
return FALSE;
/* Handle any pending selections */
GtkWidget *smtp_uid_entry;
GtkWidget *smtp_pass_entry;
GtkWidget *pop_bfr_smtp_chkbtn;
-} send;
+} p_send;
static struct Compose {
GtkWidget *sigpath_entry;
/* Send */
{"add_date", "TRUE", &tmp_ac_prefs.add_date, P_BOOL,
- &send.date_chkbtn,
+ &p_send.date_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
{"generate_msgid", "TRUE", &tmp_ac_prefs.gen_msgid, P_BOOL,
- &send.msgid_chkbtn,
+ &p_send.msgid_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
{"add_custom_header", "FALSE", &tmp_ac_prefs.add_customhdr, P_BOOL,
- &send.customhdr_chkbtn,
+ &p_send.customhdr_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
{"use_smtp_auth", "FALSE", &tmp_ac_prefs.use_smtp_auth, P_BOOL,
- &send.smtp_auth_chkbtn,
+ &p_send.smtp_auth_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
{"smtp_auth_method", "0", &tmp_ac_prefs.smtp_auth_type, P_ENUM,
- &send.smtp_auth_type_optmenu,
+ &p_send.smtp_auth_type_optmenu,
prefs_account_smtp_auth_type_set_data_from_optmenu,
prefs_account_smtp_auth_type_set_optmenu},
{"smtp_user_id", NULL, &tmp_ac_prefs.smtp_userid, P_STRING,
- &send.smtp_uid_entry, prefs_set_data_from_entry, prefs_set_entry},
+ &p_send.smtp_uid_entry, prefs_set_data_from_entry, prefs_set_entry},
{"smtp_password", NULL, &tmp_ac_prefs.smtp_passwd, P_STRING,
- &send.smtp_pass_entry, prefs_set_data_from_entry, prefs_set_entry},
+ &p_send.smtp_pass_entry, prefs_set_data_from_entry, prefs_set_entry},
{"pop_before_smtp", "FALSE", &tmp_ac_prefs.pop_before_smtp, P_BOOL,
- &send.pop_bfr_smtp_chkbtn,
+ &p_send.pop_bfr_smtp_chkbtn,
prefs_set_data_from_toggle, prefs_set_toggle},
/* Compose */
_("Authenticate with POP3 before sending"));
gtk_widget_set_sensitive(pop_bfr_smtp_chkbtn, FALSE);
- send.date_chkbtn = date_chkbtn;
- send.msgid_chkbtn = msgid_chkbtn;
- send.customhdr_chkbtn = customhdr_chkbtn;
+ p_send.date_chkbtn = date_chkbtn;
+ p_send.msgid_chkbtn = msgid_chkbtn;
+ p_send.customhdr_chkbtn = customhdr_chkbtn;
- send.smtp_auth_chkbtn = smtp_auth_chkbtn;
- send.smtp_auth_type_optmenu = optmenu;
- send.smtp_uid_entry = smtp_uid_entry;
- send.smtp_pass_entry = smtp_pass_entry;
- send.pop_bfr_smtp_chkbtn = pop_bfr_smtp_chkbtn;
+ p_send.smtp_auth_chkbtn = smtp_auth_chkbtn;
+ p_send.smtp_auth_type_optmenu = optmenu;
+ p_send.smtp_uid_entry = smtp_uid_entry;
+ p_send.smtp_pass_entry = smtp_pass_entry;
+ p_send.pop_bfr_smtp_chkbtn = pop_bfr_smtp_chkbtn;
}
static void prefs_account_compose_create(void)
GtkWidget *checkbtn_queuemsg;
GtkWidget *optmenu_charset;
-} send;
+} p_send;
static struct Compose {
GtkWidget *checkbtn_autosig;
/* Send */
{"use_ext_sendmail", "FALSE", &prefs_common.use_extsend, P_BOOL,
- &send.checkbtn_extsend,
+ &p_send.checkbtn_extsend,
prefs_set_data_from_toggle, prefs_set_toggle},
{"ext_sendmail_cmd", DEFAULT_SENDMAIL_CMD,
&prefs_common.extsend_cmd, P_STRING,
- &send.entry_extsend, prefs_set_data_from_entry, prefs_set_entry},
+ &p_send.entry_extsend, prefs_set_data_from_entry, prefs_set_entry},
{"save_message", "TRUE", &prefs_common.savemsg, P_BOOL,
- &send.checkbtn_savemsg,
+ &p_send.checkbtn_savemsg,
prefs_set_data_from_toggle, prefs_set_toggle},
{"queue_message", "FALSE", &prefs_common.queue_msg, P_BOOL,
- &send.checkbtn_queuemsg,
+ &p_send.checkbtn_queuemsg,
prefs_set_data_from_toggle, prefs_set_toggle},
{"outgoing_charset", CS_AUTO, &prefs_common.outgoing_charset, P_STRING,
- &send.optmenu_charset,
+ &p_send.optmenu_charset,
prefs_common_charset_set_data_from_optmenu,
prefs_common_charset_set_optmenu},
FALSE, FALSE, 0);
gtk_label_set_justify(GTK_LABEL (label_charset_desc), GTK_JUSTIFY_LEFT);
- send.checkbtn_extsend = checkbtn_extsend;
- send.entry_extsend = entry_extsend;
- /* send.button_extsend = button_extsend; */
+ p_send.checkbtn_extsend = checkbtn_extsend;
+ p_send.entry_extsend = entry_extsend;
+ /* p_send.button_extsend = button_extsend; */
- send.checkbtn_savemsg = checkbtn_savemsg;
- send.checkbtn_queuemsg = checkbtn_queuemsg;
+ p_send.checkbtn_savemsg = checkbtn_savemsg;
+ p_send.checkbtn_queuemsg = checkbtn_queuemsg;
- send.optmenu_charset = optmenu;
+ p_send.optmenu_charset = optmenu;
}
static void prefs_common_recv_dialog_newmail_notify_toggle_cb(GtkWidget *w, gpointer data)
while (fread(&num, sizeof(num), 1, fp) == 1) {
if (fread(&perm_flags, sizeof(perm_flags), 1, fp) != 1) break;
+ flags = g_hash_table_lookup(mark_table, GUINT_TO_POINTER(num));
+ if (flags != NULL)
+ g_free(flags);
+
flags = g_new0(MsgFlags, 1);
flags->perm_flags = perm_flags;
gint move_file(const gchar *src, const gchar *dest, gboolean overwrite)
{
if (overwrite == FALSE && is_file_exist(dest)) {
- g_warning(_("move_file(): file %s already exists."), dest);
+ g_warning("move_file(): file %s already exists.", dest);
return -1;
}
return -1;
if (move_file(tmp_file, file, TRUE) < 0) {
- FILE_OP_ERROR(file, "rename");
+ g_warning("can't replace %s .\n", file);
unlink(tmp_file);
return -1;
}