+2001-10-19
+
+ * src/smtp.[ch]: smtp_from(): abort if auth failed.
+ * changed C++-style comments into C-style in some files, and
+ removed unnecessary commented out codes.
+
+2001-10-18
+
+ * src/about.c: added some items to compiled-in features.
+ * src/addr_compl.c: changed LOG_MESSAGE to debug_print.
+ * src/addressbook.c: changed "V-Card" to "vCard".
+ addressbook_edit_address_cb(): added
+ invalidate_address_completion() to the point address is changed.
+ * src/codeconv.c: changed C++-style comments into C-style.
+
2001-10-17
* src/compose.c: changed "Send" shortcut to Ctrl+Enter.
+2001-10-19 [paul] 0.6.3claws25
+
+ * sync with Sylpheed 0.6.3cvs8
+ see ChangeLog entries 2001-10-18 and 2001-10-19
+
2001-10-18 [christoph] 0.6.3claws24
* src/procmsg.c
+2001-10-19
+
+ * src/smtp.[ch]: smtp_from(): ǧ¾Ú¤Ë¼ºÇÔ¤·¤¿¾ì¹çÃæÃǤ¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+ * C++ ¥¹¥¿¥¤¥ë¤Î¥³¥á¥ó¥È¤ò C ¥¹¥¿¥¤¥ë¤ËÊѹ¹¤·¡¢ÉÔÍפʥ³¥á¥ó¥È¥¢¥¦¥È
+ ¤µ¤ì¤¿¥³¡¼¥É¤òºï½ü¡£
+
+2001-10-18
+
+ * src/about.c: ¥³¥ó¥Ñ¥¤¥ëºÑµ¡Ç½¤Ë¤¤¤¯¤Ä¤«¤Î¹àÌܤòÄɲá£
+ * src/addr_compl.c: LOG_MESSAGE ¤ò debug_print ¤ËÊѹ¹¡£
+ * src/addressbook.c: "V-Card" ¤ò "vCard" ¤ËÊѹ¹¡£
+ addressbook_edit_address_cb(): invalidate_address_completion()
+ ¤ò¥¢¥É¥ì¥¹¤¬Êѹ¹¤µ¤ì¤¿²Õ½ê¤ËÄɲá£
+ * src/codeconv.c: C++ ¥¹¥¿¥¤¥ë¤Î¥³¥á¥ó¥È¤ò C ¥¹¥¿¥¤¥ë¤ËÊѹ¹¡£
+
2001-10-17
* src/compose.c: ¡ÖÁ÷¿®¡×¥·¥ç¡¼¥È¥«¥Ã¥È¤ò Ctrl+Enter ¤ËÊѹ¹¡£
MICRO_VERSION=3
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=claws24
+EXTRA_VERSION=claws25
VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
dnl
dnl Specify a header configuration file
AM_CONFIG_HEADER(config.h)
-AM_PROG_LIBTOOL
AM_MAINTAINER_MODE
dnl Checks for programs.
AC_PROG_MAKE_SET
AC_PROG_CPP
dnl AC_PROG_RANLIB
+AM_PROG_LIBTOOL
AM_PROG_LEX
AC_PROG_YACC
{
{N_("/_File"), NULL, NULL, 0, "<Branch>"},
{N_("/_File/New _Book"), "<alt>B", addressbook_new_book_cb, 0, NULL},
- {N_("/_File/New _V-Card"), "<alt>D", addressbook_new_vcard_cb, 0, NULL},
+ {N_("/_File/New _vCard"), "<alt>D", addressbook_new_vcard_cb, 0, NULL},
#ifdef USE_JPILOT
{N_("/_File/New _J-Pilot"), "<alt>J", addressbook_new_jpilot_cb, 0, NULL},
#endif
{N_("/_Edit/_Paste"), "<ctl>V", NULL, 0, NULL},
{N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
{N_("/_Tools/Import _Mozilla"), NULL, NULL, 0, NULL},
- {N_("/_Tools/Import _V-Card"), NULL, NULL, 0, NULL},
+ {N_("/_Tools/Import _LDIF"), NULL, NULL, 0, NULL},
+ {N_("/_Tools/Import _vCard"), NULL, NULL, 0, NULL},
{N_("/_Tools/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Tools/Export _LDIF"), NULL, NULL, 0, NULL},
- {N_("/_Tools/Export V-_Card"), NULL, NULL, 0, NULL},
+ {N_("/_Tools/Export v_Card"), NULL, NULL, 0, NULL},
*/
static GtkItemFactoryEntry addressbook_tree_popup_entries[] =
static void addressbook_menubar_set_sensitive( gboolean sensitive ) {
menu_set_sensitive( addrbook.menu_factory, "/File/New Book", sensitive );
- menu_set_sensitive( addrbook.menu_factory, "/File/New V-Card", sensitive );
+ menu_set_sensitive( addrbook.menu_factory, "/File/New vCard", sensitive );
#ifdef USE_JPILOT
menu_set_sensitive( addrbook.menu_factory, "/File/New J-Pilot", sensitive );
#endif
/* Edit person - basic page */
ItemPerson *person = ( ItemPerson * ) obj;
if( addressbook_edit_person( abf, NULL, person, FALSE ) == NULL ) return;
- gtk_ctree_select( ctree, addrbook.opened);
+ gtk_ctree_select( ctree, addrbook.opened );
invalidate_address_completion();
return;
}
g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
_addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
- /* V-Card */
+ /* vCard */
atci = g_new0( AddressTypeControlItem, 1 );
atci->objectType = ADDR_VCARD;
atci->interfaceType = ADDR_IF_VCARD;
atci->showInTree = TRUE;
atci->treeExpand = TRUE;
atci->treeLeaf = TRUE;
- atci->displayName = _( "V-Card" );
+ atci->displayName = _( "vCard" );
atci->iconXpm = vcardxpm;
atci->maskXpm = vcardxpmmask;
atci->iconXpmOpen = vcardxpm;
atci->maskXpmOpen = vcardxpmmask;
- atci->menuCommand = "/File/New V-Card";
+ atci->menuCommand = "/File/New vCard";
g_hash_table_insert( _addressBookTypeHash_, &atci->objectType, atci );
_addressBookTypeList_ = g_list_append( _addressBookTypeList_, atci );
AddressInterface *addrindex_get_interface ( AddressIndex *addrIndex, AddressIfType ifType );
AddressDataSource *addrindex_index_add_datasource ( AddressIndex *addrIndex, AddressIfType ifType, gpointer dataSource );
AddressDataSource *addrindex_index_remove_datasource ( AddressIndex *addrIndex, AddressDataSource *dataSource );
-void addrindex_free_datasource ( AddressIndex *addrIndex, AddressDataSource *ds );
+void addrindex_free_datasource ( AddressIndex *addrIndex, AddressDataSource *ds );
gint addrindex_read_data ( AddressIndex *addrIndex );
gint addrindex_write_to ( AddressIndex *addrIndex, const gchar *newFile );
/*
* End of Source.
*/
-
-
strlen(mimehdr_charset) + strlen(mimehdr_enctype);
mimehdr_begin_len = strlen(mimehdr_init) +
strlen(mimehdr_charset) + strlen(mimehdr_enctype);
- /* line_len = 1; */
line_len = header_len;
destp = dest;
*dest = '\0';
wtmpp++;
}
- /*
- g_print("tmp = %s, tlen = %d, mb_seqlen = %d\n",
- tmp, tlen, mb_seqlen);
- */
+ /* g_print("tmp = %s, tlen = %d, mb_seqlen = %d\n",
+ tmp, tlen, mb_seqlen); */
if (tlen == 0 || raw_len == 0) {
g_free(tmp);
strlen(mimehdr_charset) + strlen(mimehdr_enctype);
mimehdr_begin_len = strlen(mimehdr_init) +
strlen(mimehdr_charset) + strlen(mimehdr_enctype);
- /* line_len = 1; */
line_len = header_len;
destp = dest;
*dest = '\0';
wtmpp++;
}
/* g_print("tmp = %s, tlen = %d, mb_seqlen = %d\n",
- tmp, tlen, mb_seqlen);
- */
+ tmp, tlen, mb_seqlen); */
if (tlen == 0) {
g_free(tmp);
#include "main.h"
#include "headerwindow.h"
#include "mainwindow.h"
-#include "prefs_common.h"
#include "procheader.h"
#include "procmsg.h"
#include "codeconv.h"
+#include "prefs_common.h"
#include "utils.h"
static GdkFont *normalfont;
void header_window_init(HeaderWindow *headerwin)
{
- /*
- if (!normalfont)
- normalfont = gdk_fontset_load(NORMAL_FONT);
- */
+ /* if (!normalfont)
+ normalfont = gdk_fontset_load(prefs_common.normalfont); */
if (!boldfont)
boldfont = gdk_fontset_load(BOLD_FONT);
}
gint error_num = 0;
gint new_msgs = 0;
- /* gtk_label_set_text(GTK_LABEL(inc_dialog->mainwin->statuslabel),
- _("Receiving")); */
-
while (inc_dialog->queue_list != NULL) {
session = inc_dialog->queue_list->data;
pop3_state = session->pop3_state;
num++;
}
- /* gtk_label_set_text(GTK_LABEL(inc_dialog->mainwin->statuslabel), ""); */
-
if (error_num && !prefs_common.noerrorpanel) {
if (inc_dialog->show_dialog)
manage_window_focus_in(inc_dialog->dialog->window,
recv_set_ui_func(NULL, NULL);
#if USE_THREADS
- //pthread_join(sockinfo->connect_thr, NULL);
+ /* pthread_join(sockinfo->connect_thr, NULL); */
#endif
automaton_destroy(atm);
text = GTK_TEXT(logwindow->text);
- /*gtk_text_freeze(text);*/
-
switch (type) {
case LOG_WARN:
color = &logwindow->warn_color;
if (head) gtk_text_insert(text, NULL, color, NULL, head, -1);
gtk_text_insert(text, NULL, color, NULL, str, -1);
-
- /*gtk_text_thaw(text);*/
}
static void key_pressed(GtkWidget *widget, GdkEventKey *event,
gtk_window_set_title(GTK_WINDOW(mainwin->window), buf);
g_free(buf);
- /* buf = g_strdup_printf(_("Current account: %s"), ac_name);
- gtk_label_set_text(GTK_LABEL(mainwin->ac_label), buf); */
gtk_label_set_text(GTK_LABEL(mainwin->ac_label), ac_name);
gtk_widget_queue_resize(mainwin->ac_button);
- /* g_free(buf); */
g_free(ac_name);
}
{
Pop3State *state = (Pop3State *)data;
- /*inc_progress_update(state, POP3_DELETE_SEND);*/
+ /* inc_progress_update(state, POP3_DELETE_SEND); */
pop3_gen_send(sock, "DELE %d", state->cur_msg);
MimeInfo *parent = old->parent;
MimeInfo *child;
- if (!parent) {
- g_warning("oops: Not top message");
- return;
- }
- if (new->next) {
- g_message("oops: new child should not have a sibling");
- return;
- }
+ g_return_if_fail(parent != NULL);
+ g_return_if_fail(new->next == NULL);
for (child = parent->children; child && child != old;
child = child->next)
if (eom) break;
}
- /*g_message ("** at " __PRETTY_FUNCTION__ ":%d:", __LINE__);*/
}
void procmime_scan_encoding(MimeInfo *mimeinfo, const gchar *encoding)
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2001 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#define SM_OK 0
#define SM_ERROR 128
#define SM_UNRECOVERABLE 129
-#define SM_AUTHFAIL 130
+#define SM_AUTHFAIL 130
#define ESMTP_8BITMIME 0x01
#define ESMTP_SIZE 0x02
window = gtk_window_new (GTK_WINDOW_DIALOG);
gtk_window_set_title (GTK_WINDOW (window), _("Search folder"));
gtk_widget_set_usize (window, 450, -1);
- /*gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);*/
gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);
gtk_container_set_border_width (GTK_CONTAINER (window), 8);
gtk_signal_connect(GTK_OBJECT(window), "delete_event",
/* compare subjects */
gint subject_compare(const gchar *s1, const gchar *s2)
{
- gint retval;
gchar *str1, *str2;
if (!s1 || !s2) return -1;
if (!*str1 || !*str2) return -1;
- retval = strcmp(str1, str2);
- /*
- if (retval == 0)
- g_print("\ns1 = %s\ns2 = %s\n"
- "str1 = %s\nstr2 = %s\nmatched.\n",
- s1, s2, str1, str2);
- */
- return retval;
+ return strcmp(str1, str2);
}
void trim_subject(gchar *str)
struct dirent *d;
gchar *prev_dir;
- /*g_print("dir = %s\n", dir);*/
+ /* g_print("dir = %s\n", dir); */
if (stat(dir, &s) < 0) {
FILE_OP_ERROR(dir, "stat");
}
prev_dir = g_get_current_dir();
- /*g_print("prev_dir = %s\n", prev_dir);*/
+ /* g_print("prev_dir = %s\n", prev_dir); */
if (!path_cmp(prev_dir, dir)) {
g_free(prev_dir);
continue;
}
- /*g_print("removing %s\n", d->d_name);*/
+ /* g_print("removing %s\n", d->d_name); */
if (S_ISDIR(s.st_mode)) {
if (remove_dir_recursive(d->d_name) < 0) {