sync with sylpheed 0.6.3cvs8
authorPaul Mangan <paul@claws-mail.org>
Fri, 19 Oct 2001 07:49:39 +0000 (07:49 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 19 Oct 2001 07:49:39 +0000 (07:49 +0000)
16 files changed:
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/addressbook.c
src/addrindex.h
src/codeconv.c
src/headerwindow.c
src/inc.c
src/logwindow.c
src/mainwindow.c
src/pop.c
src/procmime.c
src/smtp.h
src/summary_search.c
src/utils.c

index e0b76ce..ef24cfb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+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.
index bb11a54..d76506c 100644 (file)
@@ -1,3 +1,8 @@
+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
index bf70800..50c98ad 100644 (file)
@@ -1,3 +1,18 @@
+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 ¤ËÊѹ¹¡£
index cebdeac..33885e5 100644 (file)
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 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
@@ -42,7 +42,6 @@ AC_SUBST(LT_AGE)
 dnl Specify a header configuration file
 AM_CONFIG_HEADER(config.h)
 
-AM_PROG_LIBTOOL
 AM_MAINTAINER_MODE
 
 dnl Checks for programs.
@@ -55,6 +54,7 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_CPP
 dnl AC_PROG_RANLIB
+AM_PROG_LIBTOOL
 AM_PROG_LEX
 AC_PROG_YACC
 
index 62b9c89..bab65e9 100644 (file)
@@ -343,7 +343,7 @@ static GtkItemFactoryEntry addressbook_entries[] =
 {
        {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
@@ -377,10 +377,11 @@ static GtkItemFactoryEntry addressbook_entries[] =
        {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[] =
@@ -1001,7 +1002,7 @@ static void addressbook_to_clicked(GtkButton *button, gpointer data)
 
 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
@@ -1878,7 +1879,7 @@ static void addressbook_edit_address_cb( gpointer data, guint action, GtkWidget
                /* 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;
        }
@@ -3124,19 +3125,19 @@ void addrbookctl_build_map( GtkWidget *window ) {
        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 );
 
index 21750bd..64a402e 100644 (file)
@@ -101,7 +101,7 @@ void addrindex_print_index          ( AddressIndex *addrIndex, FILE *stream );
 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 );
@@ -128,5 +128,3 @@ GList *addrindex_ds_get_all_groups  ( AddressDataSource *ds );
 /*
 * End of Source.
 */
-
-
index 2d1d11d..ce65a88 100644 (file)
@@ -812,7 +812,6 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
                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';
@@ -934,10 +933,8 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
 
                                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);
@@ -1025,7 +1022,6 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
                      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';
@@ -1125,8 +1121,7 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
                                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);
index a854caa..df234ec 100644 (file)
 #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;
@@ -88,10 +88,8 @@ HeaderWindow *header_window_create(void)
 
 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);
 }
index 2acd948..f1f3c3f 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -414,9 +414,6 @@ static gint inc_start(IncProgressDialog *inc_dialog)
        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;
@@ -529,8 +526,6 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                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,
@@ -672,7 +667,7 @@ static IncState inc_pop3_session_do(IncSession *session)
        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);
 
index 3226267..ff0b0ca 100644 (file)
@@ -128,8 +128,6 @@ void log_window_append(const gchar *str, LogType type)
 
        text = GTK_TEXT(logwindow->text);
 
-       /*gtk_text_freeze(text);*/
-
        switch (type) {
        case LOG_WARN:
                color = &logwindow->warn_color;
@@ -147,8 +145,6 @@ void log_window_append(const gchar *str, LogType type)
 
        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,
index 5f1f6dc..60bd2c4 100644 (file)
@@ -1004,11 +1004,8 @@ static void main_window_show_cur_account(MainWindow *mainwin)
        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);
 }
index ab4de25..87bedcf 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -389,7 +389,7 @@ gint pop3_delete_send(SockInfo *sock, gpointer data)
 {
        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);
 
index 3f69882..dcfb883 100644 (file)
@@ -133,14 +133,8 @@ void procmime_mimeinfo_replace(MimeInfo *old, MimeInfo *new)
        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)
@@ -294,7 +288,6 @@ void procmime_scan_multipart_message(MimeInfo *mimeinfo, FILE *fp)
 
                if (eom) break;
        }
-       /*g_message ("** at " __PRETTY_FUNCTION__ ":%d:", __LINE__);*/
 }
 
 void procmime_scan_encoding(MimeInfo *mimeinfo, const gchar *encoding)
index 4004292..03b5404 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * 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
@@ -29,7 +29,7 @@
 #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
index 80f5ef2..fca8d71 100644 (file)
@@ -97,7 +97,6 @@ static void summary_search_create(SummaryView *summaryview)
        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",
index 66eeddc..0036352 100644 (file)
@@ -492,7 +492,6 @@ wchar_t *find_wspace(const wchar_t *s)
 /* compare subjects */
 gint subject_compare(const gchar *s1, const gchar *s2)
 {
-       gint retval;
        gchar *str1, *str2;
 
        if (!s1 || !s2) return -1;
@@ -508,14 +507,7 @@ gint subject_compare(const gchar *s1, const gchar *s2)
 
        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)
@@ -1430,7 +1422,7 @@ gint remove_dir_recursive(const gchar *dir)
        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");
@@ -1448,7 +1440,7 @@ gint remove_dir_recursive(const gchar *dir)
        }
 
        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);
@@ -1483,7 +1475,7 @@ gint remove_dir_recursive(const gchar *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) {