+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
( 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
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;
}
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);
}
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);
}