sync with 0.8.6cvs11
authorPaul Mangan <paul@claws-mail.org>
Tue, 26 Nov 2002 11:19:34 +0000 (11:19 +0000)
committerPaul Mangan <paul@claws-mail.org>
Tue, 26 Nov 2002 11:19:34 +0000 (11:19 +0000)
ChangeLog
ChangeLog.claws
ChangeLog.jp
configure.in
src/compose.c
src/imap.c

index 72c826e..f707993 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+2002-11-26
+
+       * src/quote_fmt_parse.y: fixed a parse error (thanks to Andreas Hinz).
+
+2002-11-26
+
+       * src/account.[ch]:
+         account_find_from_message_file()
+         account_find_from_msginfo(): new. They find an account from the
+         headers like 'From:', 'X-Sylpheed-Account-Id:', and 'AID:' in the
+         specified message.
+       * src/compose.c:
+         compose_reedit(): restore messages' previous account on composition.
+         compose_write_headers(): add 'X-Sylpheed-Account-Id:' header
+         on draft mode.
+
+2002-11-26
+
+       * src/compose.c: cleaned up the code using compose_entry_set()
+         (don't use gtk_entry_set_text() directly).
+
+2002-11-25
+
+       * src/imap.c: imap_parse_namespace(): fixed a memory leak.
+
+2002-11-22
+
+       * updated autotools and libtool to the latest version.
+       * configure.in: added AC_PREREQ(2.50).
+
+2002-11-22
+
+       * src/textview.c: textview_set_font(): fix for message display in
+         UTF-8 locales (thanks to Sergey Vlasov).
+
 2002-11-21
 
        * src/imageview.[ch]: imageview_show_image(): resize images to fit
index 8272005..5b3a7d1 100644 (file)
@@ -1,3 +1,18 @@
+2002-11-26 [paul]      0.8.6claws12
+
+       * sync with 0.8.6cvs11
+         src/quote_fmt_parse.y  
+               no sync needed
+         src/account.[ch]       
+               not sync'ed
+         src/compose.c
+               compose_write_headers(): add 'X-Sylpheed-Account-Id:' header
+               on draft mode.
+               compose_reedit(): add check for 'X-Sylpheed-Account-Id:' 
+               header
+               
+       see ChangeLog 2002-11-25 and 2002-11-26
+
 2002-11-26 [colin]     0.8.6claws11
 
        * src/folderview.c
index 6061697..017c9b7 100644 (file)
@@ -1,3 +1,38 @@
+2002-11-26
+
+       * src/quote_fmt_parse.y: ¥Ñ¡¼¥¹¥¨¥é¡¼¤ò½¤Àµ(Andreas Hinz ¤µ¤ó thanks)¡£
+
+2002-11-26
+
+       * src/account.[ch]:
+         account_find_from_message_file()
+         account_find_from_msginfo(): ¿·µ¬¡£»ØÄꤷ¤¿¥á¥Ã¥»¡¼¥¸¤Î 'From:'¡¢
+         'X-Sylpheed-Account-Id:'¡¢'AID:' ¤Î¤è¤¦¤Ê¥Ø¥Ã¥À¤«¤é¥¢¥«¥¦¥ó¥È¤ò
+         ¸¡º÷¤¹¤ë¡£
+       * src/compose.c:
+         compose_reedit(): ¥á¥Ã¥»¡¼¥¸¤Î°ÊÁ°¤ÎºîÀ®»þ¤Î¥¢¥«¥¦¥ó¥È¤òÉü¸µ¡£
+         compose_write_headers(): Áð¹Æ¥â¡¼¥É¤Î¾ì¹ç 'X-Sylpheed-Account-Id:'
+         ¥Ø¥Ã¥À¤òÄɲá£
+
+2002-11-26
+
+       * src/compose.c: compose_entry_set() ¤ò»È¤Ã¤Æ¥³¡¼¥É¤òÀ°Íý
+         (gtk_entry_set_text() ¤òľÀÜ»ÈÍѤ·¤Ê¤¤)¡£
+
+2002-11-25
+
+       * src/imap.c: imap_parse_namespace(): ¥á¥â¥ê¥ê¡¼¥¯¤ò½¤Àµ¡£
+
+2002-11-22
+
+       * autotools ¤È libtool ¤òºÇ¿·ÈǤ˹¹¿·¡£
+       * configure.in: AC_PREREQ(2.50) ¤òÄɲá£
+
+2002-11-22
+
+       * src/textview.c: textview_set_font(): UTF-8 locale ¤Ç¤Î¥á¥Ã¥»¡¼¥¸
+         É½¼¨¤Î½¤Àµ(Sergey Vlasov ¤µ¤ó thanks)¡£
+
 2002-11-21
 
        * src/imageview.[ch]: imageview_show_image(): »ØÄꤵ¤ì¤ì¤Ð¥¦¥£¥ó¥É¥¦
index 830e98f..4ee54f5 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws11
+EXTRA_VERSION=claws12
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index d8e8a69..4e9b10e 100644 (file)
@@ -1786,27 +1786,6 @@ static void compose_reedit_set_entry(Compose *compose, MsgInfo *msginfo)
 #endif
        compose_show_first_last_header(compose, TRUE);
 
-#if 0 /* NEW COMPOSE GUI */
-       if (compose->bcc) {
-               GtkItemFactory *ifactory;
-               GtkWidget *menuitem;
-
-               ifactory = gtk_item_factory_from_widget(compose->menubar);
-               menuitem = gtk_item_factory_get_item(ifactory, "/View/Bcc");
-               gtk_check_menu_item_set_active
-                       (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
-       }
-       if (compose->replyto) {
-               GtkItemFactory *ifactory;
-               GtkWidget *menuitem;
-
-               ifactory = gtk_item_factory_from_widget(compose->menubar);
-               menuitem = gtk_item_factory_get_item
-                       (ifactory, "/View/Reply to");
-               gtk_check_menu_item_set_active
-                       (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
-       }
-#endif
 }
 
 #undef SET_ENTRY
@@ -2729,30 +2708,23 @@ static void compose_select_account(Compose *compose, PrefsAccount *account)
                gtk_widget_set_sensitive(menuitem, FALSE);
        }
 
-       if (account->set_autocc && account->auto_cc &&
-           compose->mode != COMPOSE_REEDIT) {
-               gtk_entry_set_text
-                       (GTK_ENTRY(compose->cc_entry), account->auto_cc);
-               menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
-               gtk_check_menu_item_set_active
-                       (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+       if (account->set_autocc) {
+               compose_entry_show(compose, COMPOSE_ENTRY_CC);
+               if (account->auto_cc && compose->mode != COMPOSE_REEDIT)
+                       compose_entry_set(compose, account->auto_cc,
+                                         COMPOSE_ENTRY_CC);
        }
        if (account->set_autobcc) {
-               menuitem = gtk_item_factory_get_item(ifactory, "/View/Bcc");
-               gtk_check_menu_item_set_active
-                       (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+               compose_entry_show(compose, COMPOSE_ENTRY_BCC);
                if (account->auto_bcc && compose->mode != COMPOSE_REEDIT)
-                       gtk_entry_set_text(GTK_ENTRY(compose->bcc_entry),
-                                          account->auto_bcc);
+                       compose_entry_set(compose, account->auto_bcc,
+                                         COMPOSE_ENTRY_BCC);
        }
        if (account->set_autoreplyto) {
-               menuitem = gtk_item_factory_get_item(ifactory,
-                                                    "/View/Reply to");
-               gtk_check_menu_item_set_active
-                       (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+               compose_entry_show(compose, COMPOSE_ENTRY_REPLY_TO);
                if (account->auto_replyto && compose->mode != COMPOSE_REEDIT)
-                       gtk_entry_set_text(GTK_ENTRY(compose->reply_entry),
-                                          account->auto_replyto);
+                       compose_entry_set(compose, account->auto_replyto,
+                                         COMPOSE_ENTRY_REPLY_TO);
        }
 
        menuitem = gtk_item_factory_get_item(ifactory, "/View/Ruler");
index db24098..0cbdc9d 100644 (file)
@@ -1967,7 +1967,6 @@ static void imap_parse_namespace(IMAPSession *session, IMAPFolder *folder)
                folder->ns_shared = imap_parse_namespace_str(str_array[2]);
        g_strfreev(str_array);
        g_free(ns_str);
-       return;
 }
 
 static IMAPNameSpace *imap_find_namespace_from_list(GList *ns_list,