sync with sylpheed 0.5.1cvs7

diff --git a/ChangeLog b/ChangeLog
index c3202e48ee34d15e1ad6c11b145188b6ad116c08..0f2688dcc953f12f58a2377bd18b575ef710fdd4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2001-08-01
+
+       * src/mimeview.c: mimeview_view_file(): added -x option to the
+         metamail to prevent the suspention of the main process.
+         mimeview_button_pressed(): deactivate `Open' menu item if
+         content-type is application/octet-stream.
+
+2001-07-31
+
+       * src/imap.c: imap_parse_atom(): parse escaped characters properly.
+         get_quoted(): new. It handles the escape character '\'.
+       * src/folder.c: folder_read_list(): don't output warning if
+         folderlist.xml doesn't exist.
+       * src/main.c: main(): write folder list after setup.
+       * src/textview.c: textview_create()
+         src/compose.c: compose_create(): set default tab width to 8.
+

 2001-07-29
 
        * src/prefs_common.c: date_format_select_row(): fixed a bug that
 2001-07-29
 
        * src/prefs_common.c: date_format_select_row(): fixed a bug that

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8407bf339dd4647372c98fccd5c9f7a3a6ad78ee..bb202c39e11eb1984bffc02500c40f1dfdab7f84 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2001-08-01 [paul]
+
+       * configure.in
+               change to 0.5.1claws4
+
+       * sync with sylpheed 0.5.1cvs7
+

 2001-07-31 [alfons]
 
        * src/prefs_common.c, src/prefs_common.h, 
 2001-07-31 [alfons]
 
        * src/prefs_common.c, src/prefs_common.h, 

diff --git a/INSTALL b/INSTALL
index a150d818c37d5b7de089e56317c85e4f0d719332..17093cf39410e0193f6b9fc76cb40a347e3873eb 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -59,6 +59,7 @@ o FreeBSD 4.2-RELEASE
 o FreeBSD 5.0-CURRENT
 o NetBSD 1.4.2
 o NetBSD 1.5 + XPG4DL
 o FreeBSD 5.0-CURRENT
 o NetBSD 1.4.2
 o NetBSD 1.5 + XPG4DL

+o NetBSD 1.5.1

 o OpenBSD 2.7
 o OpenBSD 2.8 (i386)
 o OpenBSD 2.9
 o OpenBSD 2.7
 o OpenBSD 2.8 (i386)
 o OpenBSD 2.9

diff --git a/INSTALL.jp b/INSTALL.jp
index 9ab87e875b048f316b65fbf1eba8c35b3f1d8bf8..07b1ef61ae1cf1997d76e183fab17b88991dd88a 100644 (file)
--- a/INSTALL.jp
+++ b/INSTALL.jp
@@ -58,6 +58,7 @@ o FreeBSD 4.2-RELEASE
 o FreeBSD 5.0-CURRENT
 o NetBSD 1.4.2
 o NetBSD 1.5 + XPG4DL
 o FreeBSD 5.0-CURRENT
 o NetBSD 1.4.2
 o NetBSD 1.5 + XPG4DL

+o NetBSD 1.5.1

 o OpenBSD 2.7
 o OpenBSD 2.8 (i386)
 o OpenBSD 2.9
 o OpenBSD 2.7
 o OpenBSD 2.8 (i386)
 o OpenBSD 2.9

diff --git a/configure.in b/configure.in
index 576b101bcc30fbed8b79c5b3ba008e1ea288c880..54f1d2a330b94696360398f930deb880515a7501 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=5
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws3
+EXTRA_VERSION=claws4

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/compose.c b/src/compose.c
index ace57bb38ce18e765d6f03a7f30157daf20f06f1..919400b2957927d3735b160ed201ce0ae68bbb9e 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2991,6 +2991,7 @@ static Compose *compose_create(PrefsAccount *account)
                            (GTK_SCROLLED_WINDOW(scrolledwin)),
                            gtk_scrolled_window_get_vadjustment
                            (GTK_SCROLLED_WINDOW(scrolledwin)));
                            (GTK_SCROLLED_WINDOW(scrolledwin)),
                            gtk_scrolled_window_get_vadjustment
                            (GTK_SCROLLED_WINDOW(scrolledwin)));

+       GTK_STEXT(text)->default_tab_width = 8;

        gtk_stext_set_editable(GTK_STEXT(text), TRUE);
        if (prefs_common.smart_wrapping) {      
                gtk_stext_set_word_wrap(GTK_STEXT(text), TRUE);
        gtk_stext_set_editable(GTK_STEXT(text), TRUE);
        if (prefs_common.smart_wrapping) {      
                gtk_stext_set_word_wrap(GTK_STEXT(text), TRUE);

diff --git a/src/folder.c b/src/folder.c
index acf6a93ac43fd636e423ad31eecd7888251b87ad..df28f26fc051ee281eb2b61511825ffc705c1ac7 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -310,8 +310,11 @@ gint folder_read_list(void)
 {
        GNode *node;
        XMLNode *xmlnode;
 {
        GNode *node;
        XMLNode *xmlnode;

+       gchar *path;

 
 

-       node = xml_parse_file(folder_get_list_path());
+       path = folder_get_list_path();
+       if (!is_file_exist(path)) return -1;
+       node = xml_parse_file(path);

        if (!node) return -1;
 
        xmlnode = node->data;
        if (!node) return -1;
 
        xmlnode = node->data;

diff --git a/src/imap.c b/src/imap.c
index bb0494fa36ed8fcd87761979e30f37352d8aa623..924d964fd6221a5355a8b3efd77532dcc77272bc 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -212,6 +212,10 @@ static gchar *strchr_cpy                   (const gchar    *src,
                                                 gchar           ch,
                                                 gchar          *dest,
                                                 gint            len);
                                                 gchar           ch,
                                                 gchar          *dest,
                                                 gint            len);

+static gchar *get_quoted                       (const gchar    *src,
+                                                gchar           ch,
+                                                gchar          *dest,
+                                                gint            len);

 static gchar *search_array_contain_str         (GPtrArray      *array,
                                                 gchar          *str);
 static void imap_path_separator_subst          (gchar          *str,
 static gchar *search_array_contain_str         (GPtrArray      *array,
                                                 gchar          *str);
 static void imap_path_separator_subst          (gchar          *str,


@@ -1437,7 +1441,7 @@ static gchar *imap_parse_atom(SockInfo *sock, gchar *src,
        } else if (*cur_pos == '\"') {
                gchar *p;
 
        } else if (*cur_pos == '\"') {
                gchar *p;
 

-               p = strchr_cpy(cur_pos + 1, '\"', dest, dest_len);
+               p = get_quoted(cur_pos, '\"', dest, dest_len);

                cur_pos = p ? p : cur_pos + 2;
        } else if (*cur_pos == '{') {
                gchar buf[32];
                cur_pos = p ? p : cur_pos + 2;
        } else if (*cur_pos == '{') {
                gchar buf[32];


@@ -2258,6 +2262,30 @@ static gchar *strchr_cpy(const gchar *src, gchar ch, gchar *dest, gint len)
        return tmp + 1;
 }
 
        return tmp + 1;
 }
 

+static gchar *get_quoted(const gchar *src, gchar ch, gchar *dest, gint len)
+{
+       const gchar *p = src;
+       gint n = 0;
+
+       g_return_val_if_fail(*p == ch, NULL);
+
+       *dest = '\0';
+       p++;
+
+       while (*p != '\0' && *p != ch) {
+               if (n < len - 1) {
+                       if (*p == '\\' && *(p + 1) != '\0')
+                               p++;
+                       *dest++ = *p++;
+               } else
+                       p++;
+               n++;
+       }
+
+       *dest = '\0';
+       return (gchar *)(*p == ch ? p + 1 : p);
+}
+

 static gchar *search_array_contain_str(GPtrArray *array, gchar *str)
 {
        gint i;
 static gchar *search_array_contain_str(GPtrArray *array, gchar *str)
 {
        gint i;

diff --git a/src/main.c b/src/main.c
index 131497ca1fde2e5d9f7446d08aa7c6c9012a3bd6..67e6903d1d94c37e73c3e49488b7e53a898994f7 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -263,7 +263,10 @@ int main(int argc, char *argv[])
        account_read_config_all();
        account_save_config_all();
 
        account_read_config_all();
        account_save_config_all();
 

-       if (folder_read_list() < 0) setup(mainwin);
+       if (folder_read_list() < 0) {
+               setup(mainwin);
+               folder_write_list();
+       }

        account_set_missing_folder();
        folderview_set(folderview);
 
        account_set_missing_folder();
        folderview_set(folderview);
 

diff --git a/src/mimeview.c b/src/mimeview.c
index c807a93dd60027f5ae0c4c2258006e4c39fa792f..fc5e252ba270aaf39ead45216ca85456d5b145eb 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -564,6 +564,13 @@ static void mimeview_button_pressed(GtkWidget *widget, GdkEventButton *event,
                else
                        menu_set_sensitive(mimeview->popupfactory,
                                           "/Display as text", TRUE);
                else
                        menu_set_sensitive(mimeview->popupfactory,
                                           "/Display as text", TRUE);

+               if (partinfo &&
+                   partinfo->mime_type == MIME_APPLICATION_OCTET_STREAM)
+                       menu_set_sensitive(mimeview->popupfactory,
+                                          "/Open", FALSE);
+               else
+                       menu_set_sensitive(mimeview->popupfactory,
+                                          "/Open", TRUE);

 #if USE_GPGME
                menu_set_sensitive(mimeview->popupfactory,
                                   "/Check signature",
 #if USE_GPGME
                menu_set_sensitive(mimeview->popupfactory,
                                   "/Check signature",


@@ -787,7 +794,7 @@ static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
        static gchar *default_audio_cmdline = "play '%s'";
        static gchar *default_html_cmdline =
                "netscape -remote 'openURL(%s,raise)'";
        static gchar *default_audio_cmdline = "play '%s'";
        static gchar *default_html_cmdline =
                "netscape -remote 'openURL(%s,raise)'";

-       static gchar *mime_cmdline = "metamail -d -b -c %s '%s'";
+       static gchar *mime_cmdline = "metamail -d -b -x -c %s '%s'";

        gchar buf[1024];
        gchar m_buf[1024];
        const gchar *cmd;
        gchar buf[1024];
        gchar m_buf[1024];
        const gchar *cmd;

diff --git a/src/textview.c b/src/textview.c
index 2bf490c950b532d9d9cf6fc5b5cd4bfa4ee9111c..13b018bb8048562488aff30c73053c589f8e9211 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -151,6 +151,8 @@ TextView *textview_create(void)
        /* create GtkText widgets for single-byte and multi-byte character */
        text_sb = gtk_text_new(NULL, NULL);
        text_mb = gtk_text_new(NULL, NULL);
        /* create GtkText widgets for single-byte and multi-byte character */
        text_sb = gtk_text_new(NULL, NULL);
        text_mb = gtk_text_new(NULL, NULL);

+       GTK_TEXT(text_sb)->default_tab_width = 8;
+       GTK_TEXT(text_mb)->default_tab_width = 8;

        gtk_widget_show(text_sb);
        gtk_widget_show(text_mb);
        gtk_text_set_word_wrap(GTK_TEXT(text_sb), TRUE);
        gtk_widget_show(text_sb);
        gtk_widget_show(text_mb);
        gtk_text_set_word_wrap(GTK_TEXT(text_sb), TRUE);