2006-12-25 [colin] 2.6.1cvs69
authorColin Leroy <colin@colino.net>
Mon, 25 Dec 2006 21:10:12 +0000 (21:10 +0000)
committerColin Leroy <colin@colino.net>
Mon, 25 Dec 2006 21:10:12 +0000 (21:10 +0000)
* src/partial_download.c
Fix marking for download or deletion
when the header isn't the first
* src/gtk/logwindow.c
Fix start of scrolling

ChangeLog
PATCHSETS
configure.ac
src/gtk/logwindow.c
src/partial_download.c

index fe54eee..da0869d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-25 [colin]     2.6.1cvs69
+
+       * src/partial_download.c
+               Fix marking for download or deletion
+               when the header isn't the first
+       * src/gtk/logwindow.c
+               Fix start of scrolling
+
 2006-12-23 [paul]      2.6.1cvs68
 
        * src/compose.c
index b420432..7350763 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.15.2.40 -r 1.15.2.41 src/summary_search.c;  ) > 2.6.1cvs66.patchset
 ( cvs diff -u -r 1.382.2.344 -r 1.382.2.345 src/compose.c;  ) > 2.6.1cvs67.patchset
 ( cvs diff -u -r 1.382.2.345 -r 1.382.2.346 src/compose.c;  ) > 2.6.1cvs68.patchset
+( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/partial_download.c;  cvs diff -u -r 1.1.4.23 -r 1.1.4.24 src/gtk/logwindow.c;  ) > 2.6.1cvs69.patchset
index 6dc301c..a11d294 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=68
+EXTRA_VERSION=69
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 7d4e07c..286c495 100644 (file)
@@ -137,6 +137,8 @@ LogWindow *log_window_create(void)
        logwin->text = text;
        logwin->hook_id = hooks_register_hook(LOG_APPEND_TEXT_HOOKLIST, log_window_append, logwin);
 
+       gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(text), logwin->end_mark);
+
        return logwin;
 }
 
@@ -310,7 +312,8 @@ static gboolean log_window_append(gpointer source, gpointer data)
        if (!logwindow->hidden) {
                GtkAdjustment *vadj = text->vadjustment;
                gfloat upper = vadj->upper - vadj->page_size;
-               if (vadj->value == upper)
+               if (vadj->value == upper || 
+                   (upper - vadj->value < 16 && vadj->value < 8))
                        gtk_text_view_scroll_mark_onscreen(text, logwindow->end_mark);
        }
 
index e91abea..6c199dd 100644 (file)
@@ -257,20 +257,19 @@ static int partial_uidl_mark_mail(MsgInfo *msginfo, int download)
                goto bail;
        }
        
-       while ((len = fread(buf, sizeof(gchar), sizeof(buf)-1, fp)) > 0) {
-               buf[len]='\0';
-               if (start) {
-                       start = FALSE;
-                       fprintf(fpnew, "SC-Marked-For-Download: %d\n", 
-                                       download);
-                       
-                       if(strlen(buf) > strlen("SC-Marked-For-Download: x\n")
-                       && !strncmp(buf, "SC-Marked-For-Download:", 
-                                   strlen("SC-Marked-For-Download:"))) {
-                               fprintf(fpnew, "%s", 
-                                buf+strlen("SC-Marked-For-Download: x\n"));
-                               continue;
-                       }
+       fprintf(fpnew, "SC-Marked-For-Download: %d\n", 
+                       download);
+       while (fgets(buf, sizeof(buf)-1, fp) != NULL) {
+               if(strlen(buf) > strlen("SC-Marked-For-Download: x\n")
+               && !strncmp(buf, "SC-Marked-For-Download:", 
+                           strlen("SC-Marked-For-Download:"))) {
+                       fprintf(fpnew, "%s", 
+                        buf+strlen("SC-Marked-For-Download: x\n"));
+                       continue;
+               } else if (strlen(buf) == strlen("SC-Marked-For-Download: x\n")
+               && !strncmp(buf, "SC-Marked-For-Download:", 
+                           strlen("SC-Marked-For-Download:"))) {
+                       continue;
                }
                fprintf(fpnew, "%s", buf);
        }