diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2009-01-12 12:12:01 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2009-01-12 12:12:01 +0800 |
| commit | c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8 (patch) | |
| tree | 246bdb714e24e1b0c9a8ce4a3e45a46b230316de /widgets/table | |
| parent | f8b33bc4ebe9dd8043674141b5fe4660efaa99e8 (diff) | |
| download | gsoc2013-evolution-c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8.tar.gz gsoc2013-evolution-c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8.tar.zst gsoc2013-evolution-c7d3c9f95609123035ebaa267f9d2e6ecfa8c2e8.zip | |
Merge revisions 36866:37046 from trunk.
svn path=/branches/kill-bonobo/; revision=37050
Diffstat (limited to 'widgets/table')
| -rw-r--r-- | widgets/table/ChangeLog | 7 | ||||
| -rw-r--r-- | widgets/table/e-table-state.c | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog index 4034fe0a5a..d2de4354a2 100644 --- a/widgets/table/ChangeLog +++ b/widgets/table/ChangeLog @@ -1,3 +1,10 @@ +2008-12-15 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #557176 + + * e-table-state.c: (e_table_state_load_from_node): + Ensure the 'sort_info' member is never NULL. + 2008-11-28 Felix Riemann <friemann@svn.gnome.org> ** Part of fix for bug #554464 diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c index 9f173eb573..69d33486a2 100644 --- a/widgets/table/e-table-state.c +++ b/widgets/table/e-table-state.c @@ -189,6 +189,9 @@ e_table_state_load_from_node (ETableState *state, state->columns = g_new(int, state->col_count); state->expansions = g_new(double, state->col_count); + if (!state->sort_info) + state->sort_info = e_table_sort_info_new (); + for (iterator = list, i = 0; iterator; i++) { int_and_double *column_info = iterator->data; |