sync with 0.7.4cvs37

diff --git a/ChangeLog b/ChangeLog
index 7f63aca951a89f9c31c8f3f17cf4c06f52fd8cfb..33844e911168118168f5a8b7f538b7e0302de8b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-04-11
+
+       * src/compose.c: compose_create(): set geometry hints to restrict
+         the maximum size of window.
+       * src/imap.c: imap_parse_list(): don't mark INBOX as \Noselect.
+         imap_get_uncached_messages()
+         imap_cmd_fetch(): ignore responses which don't include FETCH.
+

 2002-04-11
 
        * COPYING: re-licensed (removal of "NO-VIRUS CLAUSE" and addition of
 2002-04-11
 
        * COPYING: re-licensed (removal of "NO-VIRUS CLAUSE" and addition of

diff --git a/ChangeLog.claws b/ChangeLog.claws
index cdd082369998cedb5de769b89097a899b5db429b..19c370832dbafde0b0fa8e0d228a00e57a1a2df4 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-04-11 [paul]      0.7.4claws77
+
+       * sync with 0.7.4cvs37
+               see ChangeLog entry 2002-04-11
+

 2002-04-11 [paul]      0.7.4claws76
 
        * COPYING 
 2002-04-11 [paul]      0.7.4claws76
 
        * COPYING 

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 6308032f802a151830145a5eca0f58d2d05496a1..e02a727c354dc6839346cb5249c9521363403315 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,6 +1,15 @@
 2002-04-11
 
 2002-04-11
 

-       * COPYING: ºÆ¥é¥¤¥»¥ó¥¹("NO-VIRUS CLAUSE" ¤Îºï½ü¤È OpenSSL ¤ËÂФ¹¤ë
+       * src/compose.c: compose_create(): ¥¸¥ª¥á¥È¥ê¥Ò¥ó¥È¤òÀßÄꤷ¤Æ
+         ¥¦¥£¥ó¥É¥¦¤ÎºÇÂ祵¥¤¥º¤òÀ©¸Â¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+       * src/imap.c: imap_parse_list(): INBOX ¤ò \Noselect ¤È¤·¤Æ¥Þ¡¼¥¯
+         ¤·¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£
+         imap_get_uncached_messages()
+         imap_cmd_fetch(): FETCH ¤ò´Þ¤Þ¤Ê¤¤±þÅú¤ò̵»ë¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
+2002-04-11
+
+       * COPYING: ¥é¥¤¥»¥ó¥¹Êѹ¹("NO-VIRUS CLAUSE" ¤Îºï½ü¤È OpenSSL ¤ËÂФ¹¤ë

          ¾ò¹à¤ÎÄɲÃ)¡£
 
 2002-04-09
          ¾ò¹à¤ÎÄɲÃ)¡£
 
 2002-04-09

diff --git a/configure.in b/configure.in
index 4ee8f36de5095b21c7e6fc7fac16d721b27bfc22..b3f01be2b78cbdb9e56e5df1d54954dca684c987 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws76
+EXTRA_VERSION=claws77

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

diff --git a/src/compose.c b/src/compose.c
index f426b005bfd69431abd193e865b2f1aaa926067d..6c724ebc3ee20704a755d80d678bf9091aa5c98b 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -4280,6 +4280,8 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
         GtkPspell * gtkpspell = NULL;
 #endif
 
         GtkPspell * gtkpspell = NULL;
 #endif
 

+       static GdkGeometry geometry;
+

        g_return_val_if_fail(account != NULL, NULL);
 
        debug_print(_("Creating compose window...\n"));
        g_return_val_if_fail(account != NULL, NULL);
 
        debug_print(_("Creating compose window...\n"));


@@ -4296,6 +4298,14 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
        gtk_widget_set_usize(window, -1, prefs_common.compose_height);
        gtk_window_set_wmclass(GTK_WINDOW(window), "compose window", "Sylpheed");
        gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
        gtk_widget_set_usize(window, -1, prefs_common.compose_height);
        gtk_window_set_wmclass(GTK_WINDOW(window), "compose window", "Sylpheed");

+
+       if (!geometry.max_width) {
+               geometry.max_width = gdk_screen_width();
+               geometry.max_height = gdk_screen_height();
+       }
+       gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
+                                     &geometry, GDK_HINT_MAX_SIZE);
+

        gtk_signal_connect(GTK_OBJECT(window), "delete_event",
                           GTK_SIGNAL_FUNC(compose_delete_cb), compose);
        gtk_signal_connect(GTK_OBJECT(window), "destroy",
        gtk_signal_connect(GTK_OBJECT(window), "delete_event",
                           GTK_SIGNAL_FUNC(compose_delete_cb), compose);
        gtk_signal_connect(GTK_OBJECT(window), "destroy",

diff --git a/src/imap.c b/src/imap.c
index 254737077989ba3b18f605ce6b077ff350d17c93..f5edec7496eeb85f65341420855235cf9cc6090d 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -1143,7 +1143,8 @@ static GSList *imap_parse_list(IMAPSession *session, const gchar *real_path)
                new_item = folder_item_new(loc_name, loc_path);
                if (strcasestr(flags, "\\Noinferiors") != NULL)
                        new_item->no_sub = TRUE;
                new_item = folder_item_new(loc_name, loc_path);
                if (strcasestr(flags, "\\Noinferiors") != NULL)
                        new_item->no_sub = TRUE;

-               if (strcasestr(flags, "\\Noselect") != NULL)
+               if (strcmp(buf, "INBOX") != 0 &&
+                   strcasestr(flags, "\\Noselect") != NULL)

                        new_item->no_select = TRUE;
 
                item_list = g_slist_append(item_list, new_item);
                        new_item->no_select = TRUE;
 
                item_list = g_slist_append(item_list, new_item);


@@ -1484,6 +1485,10 @@ static GSList *imap_get_uncached_messages(IMAPSession *session,
                        g_free(tmp);
                        break;
                }
                        g_free(tmp);
                        break;
                }

+               if (strstr(tmp, "FETCH") == NULL) {
+                       g_free(tmp);
+                       continue;
+               }

                g_string_assign(str, tmp);
                g_free(tmp);
 
                g_string_assign(str, tmp);
                g_free(tmp);
 


@@ -2495,12 +2500,15 @@ static gint imap_cmd_fetch(SockInfo *sock, guint32 uid, const gchar *filename)
 
        imap_cmd_gen_send(sock, "UID FETCH %d BODY[]", uid);
 
 
        imap_cmd_gen_send(sock, "UID FETCH %d BODY[]", uid);
 

-       if (sock_gets(sock, buf, sizeof(buf)) < 0)
-               return IMAP_ERROR;
-       strretchomp(buf);
-       if (buf[0] != '*' || buf[1] != ' ')
-               return IMAP_ERROR;
-       log_print("IMAP4< %s\n", buf);
+       while ((ok = imap_cmd_gen_recv(sock, buf, sizeof(buf)))
+              == IMAP_SUCCESS) {
+               if (buf[0] != '*' || buf[1] != ' ')
+                       return IMAP_ERROR;
+               if (strstr(buf, "FETCH") != NULL)
+                       break;
+       }
+       if (ok != IMAP_SUCCESS)
+               return ok;

 
        cur_pos = strchr(buf, '{');
        g_return_val_if_fail(cur_pos != NULL, IMAP_ERROR);
 
        cur_pos = strchr(buf, '{');
        g_return_val_if_fail(cur_pos != NULL, IMAP_ERROR);