---
libgeda/include/prototype.h | 2 +-
libgeda/src/s_basic.c | 6 +++---
libgeda/src/s_page.c | 2 +-
libgeda/src/s_tile.c | 7 +++----
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index f9717b5..b034ea5 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -479,7 +479,7 @@ void s_stretch_destroy_all(STRETCH *head);
void s_tile_init(TOPLEVEL *toplevel, PAGE *p_current);
TILE_LOC *s_tile_new_loc(int i, int j);
void s_tile_add_object(TOPLEVEL *toplevel, OBJECT *object, int world_x1, int
world_y1, int world_x2, int world_y2);
-void s_tile_remove_object_all(TOPLEVEL *toplevel, PAGE *p_current, OBJECT
*object);
+void s_tile_remove_object(TOPLEVEL *toplevel, PAGE *page, OBJECT *object);
void s_tile_update_object(TOPLEVEL *toplevel, OBJECT *object);
GList *s_tile_get_objectlists(TOPLEVEL *toplevel, int world_x1, int world_y1,
int world_x2, int world_y2);
void s_tile_print(TOPLEVEL *toplevel);
diff --git a/libgeda/src/s_basic.c b/libgeda/src/s_basic.c
index 468bca4..8bce75c 100644
--- a/libgeda/src/s_basic.c
+++ b/libgeda/src/s_basic.c
@@ -313,9 +313,9 @@ s_delete_object(TOPLEVEL *toplevel, OBJECT *o_current)
g_free(o_current->line);
/* yes this object might be in the tile system */
- s_tile_remove_object_all(toplevel,
- toplevel->page_current,
- o_current);
+ s_tile_remove_object(toplevel,
+ toplevel->page_current,
+ o_current);
}
o_current->line = NULL;
diff --git a/libgeda/src/s_page.c b/libgeda/src/s_page.c
index cca15c6..19c40fa 100644
--- a/libgeda/src/s_page.c
+++ b/libgeda/src/s_page.c
@@ -143,7 +143,7 @@ void s_page_delete (TOPLEVEL *toplevel, PAGE *page)
gchar *real_filename;
/* we need to play with page_current because s_delete_list_fromstart() */
- /* make use of it (see s_tile_remove_object_all) */
+ /* make use of it (see s_tile_remove_object) */
/* save page_current and switch to page */
if (page == toplevel->page_current) {
diff --git a/libgeda/src/s_tile.c b/libgeda/src/s_tile.c
index 09ad19d..a161fc5 100644
--- a/libgeda/src/s_tile.c
+++ b/libgeda/src/s_tile.c
@@ -316,8 +316,7 @@ void s_tile_add_object(TOPLEVEL * toplevel, OBJECT *
object, int world_x1,
* this is still wrong, p_current needs to be the page the object is on
* doesn't work if the current page isn't where the object lives
*/
-void s_tile_remove_object_all(TOPLEVEL * toplevel, PAGE *p_current,
- OBJECT * object)
+void s_tile_remove_object(TOPLEVEL *toplevel, PAGE *page, OBJECT *object)
{
TILE *t_current;
TILE_LOC *tl_current;
@@ -335,7 +334,7 @@ void s_tile_remove_object_all(TOPLEVEL * toplevel, PAGE
*p_current,
g_free(tl_current);
- t_current = &p_current->world_tiles[i][j];
+ t_current = &page->world_tiles[i][j];
t_current->objects = g_list_remove(t_current->objects, object);
#if 1
@@ -359,7 +358,7 @@ void s_tile_remove_object_all(TOPLEVEL * toplevel, PAGE
*p_current,
*/
void s_tile_update_object(TOPLEVEL * toplevel, OBJECT * object)
{
- s_tile_remove_object_all(toplevel, toplevel->page_current, object);
+ s_tile_remove_object(toplevel, toplevel->page_current, object);
s_tile_add_object(toplevel, object,
object->line->x[0], object->line->y[0],
object->line->x[1], object->line->y[1]);
--
1.5.6
_______________________________________________
geda-dev mailing list
[email protected]
http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev
