diff options
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/message-list.c | 10 | ||||
| -rw-r--r-- | mail/message-list.etspec | 8 |
3 files changed, 17 insertions, 9 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index fcdc80d10b..b2b502157f 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2006-05-24 Srinivasa Ragavan <sragavan@novell.com> + + ** Fixes bug #342676 + + * message-list.c: (ml_duplicate_value), (ml_free_value), + (ml_initialize_value), (ml_value_is_empty), (ml_value_to_string): + * message-list.etspec: Fixed the column sorter right. + 2006-05-04 Jeffrey Stedfast <fejj@novell.com> * mail-component.c (mail_component_remove_store): Ref the store diff --git a/mail/message-list.c b/mail/message-list.c index 7d9d4bbe3b..cef1a77e80 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -900,10 +900,10 @@ ml_duplicate_value (ETreeModel *etm, int col, const void *value, void *data) case COL_FROM: case COL_SUBJECT: case COL_TO: + case COL_SENDER: case COL_FOLLOWUP_FLAG: case COL_LOCATION: return g_strdup (value); - case COL_SENDER: default: g_assert_not_reached (); } @@ -932,9 +932,9 @@ ml_free_value (ETreeModel *etm, int col, void *value, void *data) case COL_TO: case COL_FOLLOWUP_FLAG: case COL_LOCATION: + case COL_SENDER: g_free (value); break; - case COL_SENDER: default: g_assert_not_reached (); } @@ -962,8 +962,8 @@ ml_initialize_value (ETreeModel *etm, int col, void *data) case COL_TO: case COL_FOLLOWUP_FLAG: case COL_LOCATION: - return g_strdup (""); case COL_SENDER: + return g_strdup (""); default: g_assert_not_reached (); } @@ -993,8 +993,8 @@ ml_value_is_empty (ETreeModel *etm, int col, const void *value, void *data) case COL_TO: case COL_FOLLOWUP_FLAG: case COL_LOCATION: + case COL_SENDER: return !(value && *(char *)value); - case COL_SENDER: default: g_assert_not_reached (); return FALSE; @@ -1058,8 +1058,8 @@ ml_value_to_string (ETreeModel *etm, int col, const void *value, void *data) case COL_TO: case COL_FOLLOWUP_FLAG: case COL_LOCATION: + case COL_SENDER: return g_strdup (value); - case COL_SENDER: default: g_assert_not_reached (); return NULL; diff --git a/mail/message-list.etspec b/mail/message-list.etspec index 5718d631c4..2bb1ecf0c4 100644 --- a/mail/message-list.etspec +++ b/mail/message-list.etspec @@ -7,15 +7,15 @@ <ETableColumn model_col="3" _title="Attachment" pixbuf="attachment" expansion="0.0" minimum_width="18" resizable="false" cell="render_attachment" compare="integer" sortable="false"/> - <ETableColumn model_col="4" compare_col="14" _title="From" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="address_compare" search="string" priority="10"/> + <ETableColumn model_col="4" compare_col="15" _title="From" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="address_compare" search="string" priority="10"/> - <ETableColumn model_col="5" compare_col="15" _title="Subject" expansion="1.6" minimum_width="32" resizable="true" cell="render_tree" compare="string" search="string"/> + <ETableColumn model_col="5" compare_col="16" _title="Subject" expansion="1.6" minimum_width="32" resizable="true" cell="render_tree" compare="string" search="string"/> <ETableColumn model_col="6" _title="Date" expansion="0.4" minimum_width="32" resizable="true" cell="render_date" compare="integer"/> <ETableColumn model_col="7" _title="Received" expansion="0.4" minimum_width="32" resizable="true" cell="render_date" compare="integer"/> - <ETableColumn model_col="8" compare_col="16" _title="To" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="address_compare" search="string" priority="5"/> + <ETableColumn model_col="8" compare_col="17" _title="To" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="address_compare" search="string" priority="5"/> <ETableColumn model_col="9" _title="Size" expansion="0.2" minimum_width="32" resizable="true" cell="render_size" compare="integer"/> @@ -27,7 +27,7 @@ <ETableColumn model_col="13" _title="Original Location" expansion="0.2" minimum_width="32" resizable="true" cell="render_text" compare="string"/> - <ETableColumn model_col="14" compare_col="17" _title="Sender" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="address_compare" search="string" priority="10"/> + <ETableColumn model_col="14" _title="Sender" expansion="1.0" minimum_width="32" resizable="true" cell="render_text" compare="address_compare" search="string" priority="10"/> <ETableState> <column source="0"/> <column source="3"/> <column source="1"/> |