2004-10-19 [colin] 0.9.12cvs130.1

	* ChangeLog.claws
	* src/compose.c
	* src/common/utils.c
	* src/gtk/menu.c
		Sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index fb40a2de11d861da3bb4957ebd23371df689ef32..a29e23fd693448abdbe2a3d31b96df0d1e053169 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,11 @@
+2004-10-19 [colin]     0.9.12cvs130.1
+
+       * ChangeLog.claws
+       * src/compose.c
+       * src/common/utils.c
+       * src/gtk/menu.c
+               Sync with HEAD
+

 2004-10-19 [colin]     0.9.12cvs128.1
 
        * src/addrbook.c
 2004-10-19 [colin]     0.9.12cvs128.1
 
        * src/addrbook.c

diff --git a/ChangeLog.claws b/ChangeLog.claws
index a1f94997914e4f54f4cf38d9f2417d98b34d009c..c9ec3964f9690fc7067f557e8f887684036267ae 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,103 @@
+2004-10-19 [christoph] 0.9.12cvs130
+
+       * src/compose.c
+               fix wrong menu entry path
+
+       (Closes Bug 626 crashes after clicking 'reply' or 'reply to all')
+
+       * src/gtk/menu.c
+               add extra check for missing menu entries
+
+2004-10-19 [christoph] 0.9.12cvs129
+
+       * src/compose.c
+       * src/common/utils.c
+               use utils' generate_msgid() in compose.c
+
+2004-10-18 [christoph] 0.9.12cvs128
+
+       * src/plugins/pgpmime/passphrase.c
+       * src/plugins/pgpmime/pgpmime.c
+       * src/plugins/pgpmime/prefs_gpg.[ch]
+       * src/plugins/pgpmime/prefs_gpg.glade
+       * src/plugins/pgpmime/sgpgme.c
+               add GPG prefs
+
+2004-10-18 [christoph] 0.9.12cvs127
+
+       * src/addrbook.c
+       * src/addrcache.c
+       * src/addressbook.c
+       * src/codeconv.c
+       * src/compose.c
+       * src/customheader.c
+       * src/editaddress.c
+       * src/editgroup.c
+       * src/exporthtml.c
+       * src/folder.c
+       * src/folderview.c
+       * src/imap.c
+       * src/jpilot.c
+       * src/main.c
+       * src/matcher_parser_parse.y
+       * src/mbox.c
+       * src/pop.c
+       * src/prefs_account.c
+       * src/prefs_gtk.c
+       * src/prefs_msg_colors.c
+       * src/procheader.c
+       * src/procmime.[ch]
+       * src/procmsg.c
+       * src/summaryview.c
+       * src/textview.c
+       * src/common/base64.c
+       * src/common/partial_download.c
+       * src/common/socket.c
+       * src/common/sylpheed.c
+       * src/common/utils.[ch]
+       * src/gtk/filesel.c
+       * src/gtk/pluginwindow.c
+       * src/gtk/quicksearch.c
+       * src/plugins/pgpmime/pgpmime.c
+       * src/plugins/pgpmime/plugin.c
+       * src/plugins/pgpmime/select-keys.c
+       * src/plugins/pgpmime/sgpgme.c
+       * src/plugins/spamassassin/libspamc.c
+       * src/plugins/trayicon/trayicon.c
+       * src/plugins/trayicon/libeggtrayicon/eggtrayicon.[ch]
+       * src/plugins/trayicon/libeggtrayicon/gtkplugxembed.c
+               o don't use any GNU C extensions
+               o fix warnings
+               o replace some non-POSIX functions
+
+       * src/plugins/spamassassin/spamassassin.[ch]
+       * src/plugins/spamassassin/spamassassin_gtk.c
+       * src/plugins/clamav/clamav_plugin.[ch]
+       * src/plugins/clamav/clamav_plugin_gtk.c
+               replace statusbar_print_all() from common code because it is a
+               GUI function
+
+2004-10-17 [paul]
+
+       * po/es.po
+       * po/ko.po
+       * AUTHORS
+               update Spanish and Korean translations,
+               submitted by Ricardo Mones Lastra and
+               SungHyun Nam
+
+2004-10-13 [colin]     0.9.12cvs126
+
+       * src/compose.c
+               Don't convert message to forced encoding when 
+               drafting, plus minor magic-values cleanup.
+
+2004-10-13 [colin]     0.9.12cvs125
+
+       * po/POTFILES.in
+               Update POTFILES.in to reflect the source
+               place changes
+

 2004-10-08 [christoph] 0.9.12cvs124
 
        * m4/spamassassin.m4
 2004-10-08 [christoph] 0.9.12cvs124
 
        * m4/spamassassin.m4

diff --git a/PATCHSETS b/PATCHSETS
index da7ce51b6a57fcf58beb849d66136c25892a8853..afd5c40dd7a8b00cf9d650e0fcd54ab8984e9991 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -201,3 +201,4 @@
 ( cvs diff -u -r 1.382.2.50 -r 1.382.2.51 src/compose.c; ) > 0.9.12cvs126.1.patchset
 ( cvs diff -u -r 1.65.2.13 -r 1.65.2.15 src/codeconv.c; cvs diff -u -r 1.96.2.21 -r 1.96.2.22 src/textview.c; ) > 0.9.12cvs126.2.patchset
 ( cvs diff -u -r 1.22.2.1 -r 1.22.2.2 src/addrbook.c; cvs diff -u -r 1.15.2.1 -r 1.15.2.2 src/addrcache.c; cvs diff -u -r 1.60.2.11 -r 1.60.2.12 src/addressbook.c; cvs diff -u -r 1.65.2.15 -r 1.65.2.16 src/codeconv.c; cvs diff -u -r 1.382.2.51 -r 1.382.2.52 src/compose.c; cvs diff -u -r 1.5.2.2 -r 1.5.2.3 src/customheader.c; cvs diff -u -r 1.14.2.2 -r 1.14.2.3 src/editaddress.c; cvs diff -u -r 1.11.2.2 -r 1.11.2.3 src/editgroup.c; cvs diff -u -r 1.5 -r 1.6 src/exporthtml.c; cvs diff -u -r 1.213.2.17 -r 1.213.2.18 src/folder.c; cvs diff -u -r 1.207.2.18 -r 1.207.2.19 src/folderview.c; cvs diff -u -r 1.179.2.8 -r 1.179.2.9 src/imap.c; cvs diff -u -r 1.18.2.2 -r 1.18.2.3 src/jpilot.c; cvs diff -u -r 1.115.2.20 -r 1.115.2.21 src/main.c; cvs diff -u -r 1.25.2.4 -r 1.25.2.5 src/matcher_parser_parse.y; cvs diff -u -r 1.28.2.1 -r 1.28.2.2 src/mbox.c; cvs diff -u -r 1.56.2.25 -r 1.56.2.26 src/pop.c; cvs diff -u -r 1.105.2.9 -r 1.105.2.10 src/prefs_account.c; cvs diff -u -r 1.10.2.6 -r 1.10.2.7 src/prefs_gtk.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_msg_colors.c; cvs diff -u -r 1.47.2.9 -r 1.47.2.10 src/procheader.c; cvs diff -u -r 1.49.2.10 -r 1.49.2.11 src/procmime.c; cvs diff -u -r 1.17.2.5 -r 1.17.2.6 src/procmime.h; cvs diff -u -r 1.150.2.10 -r 1.150.2.11 src/procmsg.c; cvs diff -u -r 1.395.2.35 -r 1.395.2.36 src/summaryview.c; cvs diff -u -r 1.96.2.22 -r 1.96.2.23 src/textview.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/common/base64.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/common/partial_download.c; cvs diff -u -r 1.13.2.9 -r 1.13.2.10 src/common/socket.c; cvs diff -u -r 1.7.2.2 -r 1.7.2.3 src/common/sylpheed.c; cvs diff -u -r 1.36.2.8 -r 1.36.2.9 src/common/utils.c; cvs diff -u -r 1.20.2.7 -r 1.20.2.8 src/common/utils.h; cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/gtk/pluginwindow.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/quicksearch.c; cvs diff -u -r 1.13.2.3 -r 1.13.2.4 src/plugins/clamav/clamav_plugin.c; cvs diff -u -r 1.3 -r 1.4 src/plugins/clamav/clamav_plugin.h; cvs diff -u -r 1.9.2.4 -r 1.9.2.5 src/plugins/clamav/clamav_plugin_gtk.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/passphrase.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/prefs_gpg.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/prefs_gpg.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/select-keys.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpmime/sgpgme.c; cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/plugins/spamassassin/libspamc.c; cvs diff -u -r 1.18.2.3 -r 1.18.2.4 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.4.2.1 -r 1.4.2.2 src/plugins/spamassassin/spamassassin.h; cvs diff -u -r 1.23.2.5 -r 1.23.2.6 src/plugins/spamassassin/spamassassin_gtk.c; cvs diff -u -r 1.14.2.11 -r 1.14.2.12 src/plugins/trayicon/trayicon.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.c; ) > 0.9.12cvs128.1.patchset
 ( cvs diff -u -r 1.382.2.50 -r 1.382.2.51 src/compose.c; ) > 0.9.12cvs126.1.patchset
 ( cvs diff -u -r 1.65.2.13 -r 1.65.2.15 src/codeconv.c; cvs diff -u -r 1.96.2.21 -r 1.96.2.22 src/textview.c; ) > 0.9.12cvs126.2.patchset
 ( cvs diff -u -r 1.22.2.1 -r 1.22.2.2 src/addrbook.c; cvs diff -u -r 1.15.2.1 -r 1.15.2.2 src/addrcache.c; cvs diff -u -r 1.60.2.11 -r 1.60.2.12 src/addressbook.c; cvs diff -u -r 1.65.2.15 -r 1.65.2.16 src/codeconv.c; cvs diff -u -r 1.382.2.51 -r 1.382.2.52 src/compose.c; cvs diff -u -r 1.5.2.2 -r 1.5.2.3 src/customheader.c; cvs diff -u -r 1.14.2.2 -r 1.14.2.3 src/editaddress.c; cvs diff -u -r 1.11.2.2 -r 1.11.2.3 src/editgroup.c; cvs diff -u -r 1.5 -r 1.6 src/exporthtml.c; cvs diff -u -r 1.213.2.17 -r 1.213.2.18 src/folder.c; cvs diff -u -r 1.207.2.18 -r 1.207.2.19 src/folderview.c; cvs diff -u -r 1.179.2.8 -r 1.179.2.9 src/imap.c; cvs diff -u -r 1.18.2.2 -r 1.18.2.3 src/jpilot.c; cvs diff -u -r 1.115.2.20 -r 1.115.2.21 src/main.c; cvs diff -u -r 1.25.2.4 -r 1.25.2.5 src/matcher_parser_parse.y; cvs diff -u -r 1.28.2.1 -r 1.28.2.2 src/mbox.c; cvs diff -u -r 1.56.2.25 -r 1.56.2.26 src/pop.c; cvs diff -u -r 1.105.2.9 -r 1.105.2.10 src/prefs_account.c; cvs diff -u -r 1.10.2.6 -r 1.10.2.7 src/prefs_gtk.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/prefs_msg_colors.c; cvs diff -u -r 1.47.2.9 -r 1.47.2.10 src/procheader.c; cvs diff -u -r 1.49.2.10 -r 1.49.2.11 src/procmime.c; cvs diff -u -r 1.17.2.5 -r 1.17.2.6 src/procmime.h; cvs diff -u -r 1.150.2.10 -r 1.150.2.11 src/procmsg.c; cvs diff -u -r 1.395.2.35 -r 1.395.2.36 src/summaryview.c; cvs diff -u -r 1.96.2.22 -r 1.96.2.23 src/textview.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/common/base64.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/common/partial_download.c; cvs diff -u -r 1.13.2.9 -r 1.13.2.10 src/common/socket.c; cvs diff -u -r 1.7.2.2 -r 1.7.2.3 src/common/sylpheed.c; cvs diff -u -r 1.36.2.8 -r 1.36.2.9 src/common/utils.c; cvs diff -u -r 1.20.2.7 -r 1.20.2.8 src/common/utils.h; cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/gtk/pluginwindow.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/quicksearch.c; cvs diff -u -r 1.13.2.3 -r 1.13.2.4 src/plugins/clamav/clamav_plugin.c; cvs diff -u -r 1.3 -r 1.4 src/plugins/clamav/clamav_plugin.h; cvs diff -u -r 1.9.2.4 -r 1.9.2.5 src/plugins/clamav/clamav_plugin_gtk.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/passphrase.c; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/prefs_gpg.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/prefs_gpg.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/select-keys.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpmime/sgpgme.c; cvs diff -u -r 1.4.2.2 -r 1.4.2.3 src/plugins/spamassassin/libspamc.c; cvs diff -u -r 1.18.2.3 -r 1.18.2.4 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.4.2.1 -r 1.4.2.2 src/plugins/spamassassin/spamassassin.h; cvs diff -u -r 1.23.2.5 -r 1.23.2.6 src/plugins/spamassassin/spamassassin_gtk.c; cvs diff -u -r 1.14.2.11 -r 1.14.2.12 src/plugins/trayicon/trayicon.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/plugins/trayicon/libeggtrayicon/gtkplugxembed.c; ) > 0.9.12cvs128.1.patchset

+( cvs diff -u -r 1.2504.2.24 -r 1.2504.2.25 ChangeLog.claws; cvs diff -u -r 1.382.2.52 -r 1.382.2.53 src/compose.c; cvs diff -u -r 1.36.2.9 -r 1.36.2.10 src/common/utils.c; cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/gtk/menu.c; ) > 0.9.12cvs130.1.patchset

diff --git a/configure.ac b/configure.ac
index 28e5b5b53c4d1942c95716e2f3d6ff190b09052d..2780606db4244a40e822e4132dca01975a9b84dc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=128
+EXTRA_VERSION=130

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/common/utils.c b/src/common/utils.c
index fa121f9ba753379f57e90bd5cd876779a63f8dea..d8b7315e1a7118209c8196d5d1cb642f5a8393b4 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -3534,7 +3534,6 @@ gint g_int_compare(gconstpointer a, gconstpointer b)
 
 gchar *generate_msgid(const gchar *address, gchar *buf, gint len)
 {
 
 gchar *generate_msgid(const gchar *address, gchar *buf, gint len)
 {

-       /* steal from compose.c::compose_generate_msgid() */

        struct tm *lt;
        time_t t;
        gchar *addr;
        struct tm *lt;
        time_t t;
        gchar *addr;

diff --git a/src/compose.c b/src/compose.c
index 4895d5075b066c64945dc4509bd5a0a1df2aded7..943a3c41873f2e237beba496bd3ab35a7ec0d5c3 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -264,8 +264,6 @@ static void compose_convert_header          (gchar          *dest,
                                                 gchar          *src,
                                                 gint            header_len,
                                                 gboolean        addr_field);
                                                 gchar          *src,
                                                 gint            header_len,
                                                 gboolean        addr_field);

-static void compose_generate_msgid             (gchar          *buf,
-                                                gint            len);

 
 static void compose_attach_info_free           (AttachInfo     *ainfo);
 static void compose_attach_remove_selected     (Compose        *compose);
 
 static void compose_attach_info_free           (AttachInfo     *ainfo);
 static void compose_attach_remove_selected     (Compose        *compose);


@@ -939,8 +937,8 @@ static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
        compose = compose_create(account, COMPOSE_REPLY);
        ifactory = gtk_item_factory_from_widget(compose->menubar);
 
        compose = compose_create(account, COMPOSE_REPLY);
        ifactory = gtk_item_factory_from_widget(compose->menubar);
 

-       menu_set_active(ifactory, "/Message/Remove references", FALSE);
-       menu_set_sensitive(ifactory, "/Message/Remove references", TRUE);
+       menu_set_active(ifactory, "/Options/Remove references", FALSE);
+       menu_set_sensitive(ifactory, "/Options/Remove references", TRUE);

 
        compose->replyinfo = procmsg_msginfo_get_full_info(msginfo);
        if (!compose->replyinfo)
 
        compose->replyinfo = procmsg_msginfo_get_full_info(msginfo);
        if (!compose->replyinfo)


@@ -3423,7 +3421,7 @@ static gint compose_redirect_write_headers(Compose *compose, FILE *fp)
 
        /* Resent-Message-ID */
        if (compose->account->gen_msgid) {
 
        /* Resent-Message-ID */
        if (compose->account->gen_msgid) {

-               compose_generate_msgid(buf, sizeof(buf));
+               generate_msgid(compose->account->address, buf, sizeof(buf));

                fprintf(fp, "Resent-Message-ID: <%s>\n", buf);
                compose->msgid = g_strdup(buf);
        }
                fprintf(fp, "Resent-Message-ID: <%s>\n", buf);
                compose->msgid = g_strdup(buf);
        }


@@ -4118,7 +4116,7 @@ static gchar *compose_get_header(Compose *compose)
 
        /* Message-ID */
        if (compose->account->gen_msgid) {
 
        /* Message-ID */
        if (compose->account->gen_msgid) {

-               compose_generate_msgid(buf, sizeof(buf));
+               generate_msgid(compose->account->address, buf, sizeof(buf));

                g_string_sprintfa(header, "Message-ID: <%s>\n", buf);
                compose->msgid = g_strdup(buf);
        }
                g_string_sprintfa(header, "Message-ID: <%s>\n", buf);
                compose->msgid = g_strdup(buf);
        }


@@ -4293,28 +4291,6 @@ static void compose_convert_header(gchar *dest, gint len, gchar *src,
        g_free(tmpstr);
 }
 
        g_free(tmpstr);
 }
 

-static void compose_generate_msgid(gchar *buf, gint len)
-{
-       struct tm *lt;
-       time_t t;
-       gchar *addr;
-
-       t = time(NULL);
-       lt = localtime(&t);
-
-       addr = g_strconcat("@", get_domain_name(), NULL);
-
-       g_snprintf(buf, len, "%04d%02d%02d%02d%02d%02d.%08x%s",
-                  lt->tm_year + 1900, lt->tm_mon + 1,
-                  lt->tm_mday, lt->tm_hour,
-                  lt->tm_min, lt->tm_sec,
-                  (guint) rand(), addr);
-
-       debug_print("generated Message-ID: %s\n", buf);
-
-       g_free(addr);
-}
-

 static void compose_create_header_entry(Compose *compose) 
 {
        gchar *headers[] = {"To:", "Cc:", "Bcc:", "Newsgroups:", "Reply-To:", "Followup-To:", NULL};
 static void compose_create_header_entry(Compose *compose) 
 {
        gchar *headers[] = {"To:", "Cc:", "Bcc:", "Newsgroups:", "Reply-To:", "Followup-To:", NULL};

diff --git a/src/gtk/menu.c b/src/gtk/menu.c
index 2fd4de227d9b08451a5847bfe549d75d688c284c..8c1b062b82f1598f095e5a0823b05895ed61b50c 100644 (file)
--- a/src/gtk/menu.c
+++ b/src/gtk/menu.c
@@ -113,10 +113,8 @@ void menu_set_sensitive(GtkItemFactory *ifactory, const gchar *path,
        g_return_if_fail(ifactory != NULL);
 
        widget = gtk_item_factory_get_item(ifactory, path);
        g_return_if_fail(ifactory != NULL);
 
        widget = gtk_item_factory_get_item(ifactory, path);

-       if(widget == NULL) {
-               debug_print("unknown menu entry %s\n", path);
-               return;
-       }
+       g_return_if_fail(widget != NULL);
+

        gtk_widget_set_sensitive(widget, sensitive);
 }
 
        gtk_widget_set_sensitive(widget, sensitive);
 }
 


@@ -136,6 +134,8 @@ void menu_set_active(GtkItemFactory *ifactory, const gchar *path,
        g_return_if_fail(ifactory != NULL);
 
        widget = gtk_item_factory_get_item(ifactory, path);
        g_return_if_fail(ifactory != NULL);
 
        widget = gtk_item_factory_get_item(ifactory, path);

+       g_return_if_fail(widget != NULL);
+

        if (!GTK_IS_CHECK_MENU_ITEM(widget)) {
                debug_print("%s not check_menu_item\n", path);
                return;
        if (!GTK_IS_CHECK_MENU_ITEM(widget)) {
                debug_print("%s not check_menu_item\n", path);
                return;