diff options
| author | Christopher James Lahey <clahey@ximian.com> | 2002-03-12 22:30:53 +0800 |
|---|---|---|
| committer | Chris Lahey <clahey@src.gnome.org> | 2002-03-12 22:30:53 +0800 |
| commit | fd4ffbd38ccef4d2a35675a50f89e0b5f2d6d86e (patch) | |
| tree | efb6b0e9d933ad2989b62abb2b9f9c1e5e76ff34 /widgets/table/e-table-memory-store.c | |
| parent | 8358586161bd2f1b17ea30f1a483e6b85dff8e47 (diff) | |
| download | gsoc2013-evolution-fd4ffbd38ccef4d2a35675a50f89e0b5f2d6d86e.tar gsoc2013-evolution-fd4ffbd38ccef4d2a35675a50f89e0b5f2d6d86e.tar.gz gsoc2013-evolution-fd4ffbd38ccef4d2a35675a50f89e0b5f2d6d86e.tar.bz2 gsoc2013-evolution-fd4ffbd38ccef4d2a35675a50f89e0b5f2d6d86e.tar.lz gsoc2013-evolution-fd4ffbd38ccef4d2a35675a50f89e0b5f2d6d86e.tar.xz gsoc2013-evolution-fd4ffbd38ccef4d2a35675a50f89e0b5f2d6d86e.tar.zst gsoc2013-evolution-fd4ffbd38ccef4d2a35675a50f89e0b5f2d6d86e.zip | |
Added e-table-search.lo.
2002-03-12 Christopher James Lahey <clahey@ximian.com>
* gal/Makefile.am (libgal_la_LIBADD): Added e-table-search.lo.
* gal/util/e-util.c, gal/util/e-util.h (e_marshal_BOOL__STRING):
Added this marshal function.
From gal/e-table/ChangeLog:
2002-03-12 Christopher James Lahey <clahey@ximian.com>
* Makefile.am (libetable_la_SOURCES): Added e-table-search.c.
(libetableinclude_HEADERS): Added e-table-search.h.
* e-cell.h: Added ETableSearchFun here.
* e-table-col.h: Added search here.
* e-table-column-specification.c, e-table-column-specification.h:
Added search here.
* e-table-extras.c, e-table-extras.h (e_table_extras_add_search):
Added ETableSearchFuncs here.
* e-table-memory-store.c (e_table_memory_store_insert,
e_table_memory_store_insert_adopt): Handle row == -1 here.
* e-table-search.c, e-table-search.h: New class to reusably handle
the semantics of searching for a string.
* e-table-simple.c, e-table-simple.h: Added a bunch of simple
functions here for if your table is all strings. Should be
reusable.
* e-table-utils.c (et_col_spec_to_col): Added support for searches
here.
* e-table.c, e-table.h: Added an ETableSearch here.
svn path=/trunk/; revision=16119
Diffstat (limited to 'widgets/table/e-table-memory-store.c')
| -rw-r--r-- | widgets/table/e-table-memory-store.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c index c54bfb6190..d3485e1153 100644 --- a/widgets/table/e-table-memory-store.c +++ b/widgets/table/e-table-memory-store.c @@ -320,7 +320,10 @@ e_table_memory_store_insert (ETableMemoryStore *etms, int row, void **store, gpo int i; e_table_memory_insert (E_TABLE_MEMORY (etms), row, data); + row_count = e_table_model_row_count (E_TABLE_MODEL (etms)); + if (row == -1) + row = row_count - 1; etms->priv->store = g_realloc (etms->priv->store, etms->priv->col_count * row_count * sizeof (void *)); memmove (etms->priv->store + etms->priv->col_count * (row + 1), etms->priv->store + etms->priv->col_count * row, @@ -357,14 +360,15 @@ e_table_memory_store_insert_adopt (ETableMemoryStore *etms, int row, void **stor int row_count; int i; - row_count = e_table_model_row_count (E_TABLE_MODEL (etms)); - e_table_memory_insert (E_TABLE_MEMORY (etms), row, data); - etms->priv->store = g_realloc (etms->priv->store, etms->priv->col_count * (row_count + 1) * sizeof (void *)); + row_count = e_table_model_row_count (E_TABLE_MODEL (etms)); + if (row == -1) + row = row_count - 1; + etms->priv->store = g_realloc (etms->priv->store, etms->priv->col_count * row_count * sizeof (void *)); memmove (etms->priv->store + etms->priv->col_count * (row + 1), etms->priv->store + etms->priv->col_count * row, - etms->priv->col_count * (row_count - row) * sizeof (void *)); + etms->priv->col_count * (row_count - row - 1) * sizeof (void *)); for (i = 0; i < etms->priv->col_count; i++) { STORE_LOCATOR(etms, i, row) = store[i]; |