[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-365-g921a39e)
The branch, master has been updated
via 921a39edd130ed3bbfe83d9c39c3a9085c405d9a (commit)
from b211658fcddb84828c437a65bf6bd73fcc4b1918 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
gattrib/src/s_object.c | 2 +-
gschem/src/o_delete.c | 2 +-
libgeda/include/prototype.h | 1 -
libgeda/src/o_complex_basic.c | 4 ++--
libgeda/src/o_net_basic.c | 2 +-
libgeda/src/o_text_basic.c | 2 +-
libgeda/src/s_basic.c | 20 --------------------
7 files changed, 6 insertions(+), 27 deletions(-)
=================
Commit Messages
=================
commit 921a39edd130ed3bbfe83d9c39c3a9085c405d9a
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Thu Dec 11 21:21:03 2008 +0000
Remove function o_delete(), which just wraps o_delete_object()
:100644 100644 bb4e2b4... 4586d3e... M gattrib/src/s_object.c
:100644 100644 690c549... cdd545f... M gschem/src/o_delete.c
:100644 100644 5be1e04... e3c31f9... M libgeda/include/prototype.h
:100644 100644 a07f15c... 32f0a15... M libgeda/src/o_complex_basic.c
:100644 100644 79e9b86... f24dee7... M libgeda/src/o_net_basic.c
:100644 100644 60a0516... 2d771b4... M libgeda/src/o_text_basic.c
:100644 100644 aaee572... ed04621... M libgeda/src/s_basic.c
=========
Changes
=========
commit 921a39edd130ed3bbfe83d9c39c3a9085c405d9a
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Thu Dec 11 21:21:03 2008 +0000
Remove function o_delete(), which just wraps o_delete_object()
diff --git a/gattrib/src/s_object.c b/gattrib/src/s_object.c
index bb4e2b4..4586d3e 100644
--- a/gattrib/src/s_object.c
+++ b/gattrib/src/s_object.c
@@ -342,7 +342,7 @@ OBJECT *s_object_attrib_add_attrib_in_object(TOPLEVEL * pr_current, char *text_s
void s_object_delete_text_object_in_object(TOPLEVEL * pr_current, OBJECT * text_object)
{
s_page_remove (pr_current->page_current, text_object);
- s_delete(pr_current, text_object);
+ s_delete_object (pr_current, text_object);
pr_current->page_current->CHANGED = 1;
}
diff --git a/gschem/src/o_delete.c b/gschem/src/o_delete.c
index 690c549..cdd545f 100644
--- a/gschem/src/o_delete.c
+++ b/gschem/src/o_delete.c
@@ -55,7 +55,7 @@ void o_delete (GSCHEM_TOPLEVEL *w_current, OBJECT *object)
o_erase_grips (w_current, object);
s_page_remove (toplevel->page_current, object);
- s_delete (toplevel, object);
+ s_delete_object (toplevel, object);
if (do_conn) {
o_cue_undraw_list (w_current, other_objects);
diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index 5be1e04..e3c31f9 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -321,7 +321,6 @@ OBJECT *s_basic_new_object(char type, char const *prefix);
void print_struct_forw(GList *list);
void print_struct(OBJECT *ptr);
void s_delete_object(TOPLEVEL *toplevel, OBJECT *o_current);
-void s_delete(TOPLEVEL *toplevel, OBJECT *o_current);
void s_delete_object_glist(TOPLEVEL *toplevel, GList *list);
char *remove_nl(char *string);
char *remove_last_nl(char *string);
diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index a07f15c..32f0a15 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -379,9 +379,9 @@ void o_complex_remove_promotable_attribs (TOPLEVEL *toplevel, OBJECT *object)
for (iter = promotable; iter != NULL; iter = g_list_next (iter)) {
OBJECT *a_object = iter->data;
if (toplevel->keep_invisible == TRUE) {
- a_object->visibility = INVISIBLE; /* Hide promotable attributes */
+ a_object->visibility = INVISIBLE; /* Hide promotable attributes */
} else {
- s_delete (toplevel, a_object); /* Delete promotable attributes */
+ s_delete_object (toplevel, a_object); /* Delete promotable attributes */
}
}
diff --git a/libgeda/src/o_net_basic.c b/libgeda/src/o_net_basic.c
index 79e9b86..f24dee7 100644
--- a/libgeda/src/o_net_basic.c
+++ b/libgeda/src/o_net_basic.c
@@ -587,7 +587,7 @@ int o_net_consolidate_segments(TOPLEVEL *toplevel, OBJECT *object)
s_conn_remove (other_object);
s_page_remove (toplevel->page_current, other_object);
- s_delete(toplevel, other_object);
+ s_delete_object (toplevel, other_object);
o_net_recalc(toplevel, object);
s_tile_update_object(toplevel, object);
s_conn_update_object (object);
diff --git a/libgeda/src/o_text_basic.c b/libgeda/src/o_text_basic.c
index 60a0516..2d771b4 100644
--- a/libgeda/src/o_text_basic.c
+++ b/libgeda/src/o_text_basic.c
@@ -1415,7 +1415,7 @@ static gboolean delete_font_set (gpointer key, gpointer value,
s_delete_object_glist (toplevel, tmp->font_prim_objs);
tmp->font_prim_objs = NULL;
}
- /* do not use s_delete() as tmp is not fully initialized */
+ /* do not use s_delete_object () as tmp is not fully initialized */
g_free (tmp->name);
/* Do not free tmp here since it will be freed with the function */
diff --git a/libgeda/src/s_basic.c b/libgeda/src/s_basic.c
index aaee572..ed04621 100644
--- a/libgeda/src/s_basic.c
+++ b/libgeda/src/s_basic.c
@@ -331,26 +331,6 @@ s_delete_object(TOPLEVEL *toplevel, OBJECT *o_current)
* \par Function Description
*
*/
-void
-s_delete(TOPLEVEL *toplevel, OBJECT *o_current)
-{
- if (o_current != NULL) {
-
-
-#if DEBUG
- printf("sdel: %s\n", o_current->name);
- printf("sdel: %d\n", o_current->sid);
-#endif
-
- s_delete_object(toplevel, o_current);
- }
-}
-
-/*! \todo Finish function documentation!!!
- * \brief
- * \par Function Description
- *
- */
/* deletes everything include the GList */
void
s_delete_object_glist(TOPLEVEL *toplevel, GList *list)
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs