2006-04-21 [colin] 2.1.1cvs21

* src/folderview.c
	* src/mainwindow.c
		Fix occasional flicker in folderview
	* src/common/utils.c
		Fix bug #943 (Incorrectly parsed email address
		list in short headers on message view and in
		printouts)
This commit is contained in:
Colin Leroy 2006-04-21 16:52:18 +00:00
parent 7cbb80874f
commit 5dbaced0a2
6 changed files with 48 additions and 6 deletions

View file

@ -1,3 +1,13 @@
2006-04-21 [colin] 2.1.1cvs21
* src/folderview.c
* src/mainwindow.c
Fix occasional flicker in folderview
* src/common/utils.c
Fix bug #943 (Incorrectly parsed email address
list in short headers on message view and in
printouts)
2006-04-20 [colin] 2.1.1cvs20
* src/imap.c

View file

@ -1442,3 +1442,4 @@
( cvs diff -u -r 1.115.2.80 -r 1.115.2.81 src/main.c; ) > 2.1.1cvs18.patchset
( cvs diff -u -r 1.115.2.81 -r 1.115.2.82 src/main.c; ) > 2.1.1cvs19.patchset
( cvs diff -u -r 1.179.2.106 -r 1.179.2.107 src/imap.c; cvs diff -u -r 1.34.2.4 -r 1.34.2.5 src/imap.h; cvs diff -u -r 1.105.2.53 -r 1.105.2.54 src/prefs_account.c; ) > 2.1.1cvs20.patchset
( cvs diff -u -r 1.207.2.95 -r 1.207.2.96 src/folderview.c; cvs diff -u -r 1.274.2.107 -r 1.274.2.108 src/mainwindow.c; cvs diff -u -r 1.36.2.60 -r 1.36.2.61 src/common/utils.c; ) > 2.1.1cvs21.patchset

View file

@ -11,7 +11,7 @@ MINOR_VERSION=1
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=20
EXTRA_VERSION=21
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

View file

@ -4377,6 +4377,8 @@ gboolean get_email_part(const gchar *start, const gchar *scanpos,
g_return_val_if_fail(ep != NULL, FALSE);
if (hdr) {
const gchar *start_quote = NULL;
const gchar *end_quote = NULL;
search_again:
/* go to the real start */
if (start[0] == ',')
@ -4387,6 +4389,22 @@ search_again:
start++;
*bp = start;
/* check if there are quotes (to skip , in them) */
if (*start == '"') {
start_quote = start;
start++;
end_quote = strstr(start, "\"");
} else {
start_quote = NULL;
end_quote = NULL;
}
/* skip anything between quotes */
if (start_quote && end_quote) {
start = end_quote;
}
/* find end (either , or ; or end of line) */
if (strstr(start, ",") && strstr(start, ";"))
@ -4399,6 +4417,11 @@ search_again:
else
*ep = start+strlen(start);
/* go back to real start */
if (start_quote && end_quote) {
start = start_quote;
}
/* check there's still an @ in that, or search
* further if possible */
if (strstr(start, "@") && strstr(start, "@") < *ep)
@ -4406,6 +4429,9 @@ search_again:
else if (*ep < start+strlen(start)) {
start = *ep;
goto search_again;
} else if (start_quote && strstr(start, "\"") && strstr(start, "\"") < *ep) {
*bp = start_quote;
return TRUE;
} else
return FALSE;
}

View file

@ -1890,8 +1890,10 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
}
if (!can_select || summary_is_locked(folderview->summaryview)) {
gtkut_ctree_set_focus_row(ctree, folderview->opened);
gtk_ctree_select(ctree, folderview->opened);
if (folderview->opened) {
gtkut_ctree_set_focus_row(ctree, folderview->opened);
gtk_ctree_select(ctree, folderview->opened);
}
return;
}

View file

@ -3458,10 +3458,13 @@ gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
return FALSE;
case GDK_space:
if (mainwin->folderview && mainwin->summaryview
&& !mainwin->summaryview->displayed) {
summary_lock(mainwin->summaryview);
&& ((!mainwin->summaryview->displayed
&& !mainwin->summaryview->selected)
|| (mainwin->summaryview->folder_item
&& mainwin->summaryview->folder_item->total_msgs == 0))) {
g_signal_stop_emission_by_name(G_OBJECT(widget),
"key_press_event");
folderview_select_next_unread(mainwin->folderview);
summary_unlock(mainwin->summaryview);
}
break;
default: