[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.2-20090328-29-gc38b506)
The branch, master has been updated
via c38b5069f3fee207c48281da49ac1c90cf5d508a (commit)
via 79b00986fbc5d05328b57457ff16d83462bf6198 (commit)
via 2379c5ded2a56d119dc731a63910cddd080a1c9e (commit)
from 52bed9acb6ac46882d6d2ca431167cf1b00e53b4 (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
=========
libgeda/include/libgeda/prototype.h | 2 --
libgeda/src/o_complex_basic.c | 14 ++++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
=================
Commit Messages
=================
commit c38b5069f3fee207c48281da49ac1c90cf5d508a
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
Fix crash with (keep-invisible "disabled")
The deleted attribute objects were not being removed from the prim_objs
list they belonged to.
:100644 100644 231c0ec... 5f49033... M libgeda/src/o_complex_basic.c
commit 79b00986fbc5d05328b57457ff16d83462bf6198
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
libgeda: Make o_complex_remove_promotable_attribs() static
This function is only used in o_complex_basic.c.
:100644 100644 f0defe9... db709b3... M libgeda/include/libgeda/prototype.h
:100644 100644 edee8d0... 231c0ec... M libgeda/src/o_complex_basic.c
commit 2379c5ded2a56d119dc731a63910cddd080a1c9e
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
libgeda: Make o_complex_get_promotable() static
This function is only used in o_complex_basic.c
:100644 100644 f76f35b... f0defe9... M libgeda/include/libgeda/prototype.h
:100644 100644 fff1bee... edee8d0... M libgeda/src/o_complex_basic.c
=========
Changes
=========
commit c38b5069f3fee207c48281da49ac1c90cf5d508a
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
Fix crash with (keep-invisible "disabled")
The deleted attribute objects were not being removed from the prim_objs
list they belonged to.
diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index 231c0ec..5f49033 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -392,10 +392,12 @@ static void o_complex_remove_promotable_attribs (TOPLEVEL *toplevel, OBJECT *obj
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 */
- } else {
- s_delete_object (toplevel, a_object); /* Delete promotable attributes */
+ if (toplevel->keep_invisible == TRUE) { /* Hide promotable attributes */
+ a_object->visibility = INVISIBLE;
+ } else { /* Delete promotable attributes */
+ object->complex->prim_objs =
+ g_list_remove (object->complex->prim_objs, a_object);
+ s_delete_object (toplevel, a_object);
}
}
commit 79b00986fbc5d05328b57457ff16d83462bf6198
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
libgeda: Make o_complex_remove_promotable_attribs() static
This function is only used in o_complex_basic.c.
diff --git a/libgeda/include/libgeda/prototype.h b/libgeda/include/libgeda/prototype.h
index f0defe9..db709b3 100644
--- a/libgeda/include/libgeda/prototype.h
+++ b/libgeda/include/libgeda/prototype.h
@@ -173,7 +173,6 @@ int world_get_object_glist_bounds(TOPLEVEL *toplevel, const GList *o_list,
int o_complex_is_embedded(OBJECT *o_current);
GList *o_complex_get_toplevel_attribs (TOPLEVEL *toplevel, const GList *obj_list);
GList *o_complex_promote_attribs (TOPLEVEL *toplevel, OBJECT *object);
-void o_complex_remove_promotable_attribs (TOPLEVEL *toplevel, OBJECT *object);
OBJECT *o_complex_new(TOPLEVEL *toplevel, char type, int color, int x, int y, int angle, int mirror, const CLibSymbol *clib_sym, const gchar *basename, int selectable);
OBJECT *o_complex_new_embedded(TOPLEVEL *toplevel, char type, int color, int x, int y, int angle, int mirror, const gchar *basename, int selectable);
void o_complex_set_filename(TOPLEVEL *toplevel, const char *basename);
diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index edee8d0..231c0ec 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -381,7 +381,7 @@ GList *o_complex_promote_attribs (TOPLEVEL *toplevel, OBJECT *object)
* \param [in] toplevel The toplevel environment.
* \param [in] object The complex object being altered.
*/
-void o_complex_remove_promotable_attribs (TOPLEVEL *toplevel, OBJECT *object)
+static void o_complex_remove_promotable_attribs (TOPLEVEL *toplevel, OBJECT *object)
{
GList *promotable, *iter;
commit 2379c5ded2a56d119dc731a63910cddd080a1c9e
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
libgeda: Make o_complex_get_promotable() static
This function is only used in o_complex_basic.c
diff --git a/libgeda/include/libgeda/prototype.h b/libgeda/include/libgeda/prototype.h
index f76f35b..f0defe9 100644
--- a/libgeda/include/libgeda/prototype.h
+++ b/libgeda/include/libgeda/prototype.h
@@ -172,7 +172,6 @@ int world_get_object_glist_bounds(TOPLEVEL *toplevel, const GList *o_list,
int *right, int *bottom);
int o_complex_is_embedded(OBJECT *o_current);
GList *o_complex_get_toplevel_attribs (TOPLEVEL *toplevel, const GList *obj_list);
-GList *o_complex_get_promotable (TOPLEVEL *toplevel, OBJECT *object, int detach);
GList *o_complex_promote_attribs (TOPLEVEL *toplevel, OBJECT *object);
void o_complex_remove_promotable_attribs (TOPLEVEL *toplevel, OBJECT *object);
OBJECT *o_complex_new(TOPLEVEL *toplevel, char type, int color, int x, int y, int angle, int mirror, const CLibSymbol *clib_sym, const gchar *basename, int selectable);
diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index fff1bee..edee8d0 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -307,7 +307,7 @@ GList *o_complex_get_toplevel_attribs (TOPLEVEL *toplevel,
* \param [in] detach Should the attributes be detached?
* \returns A linked list of OBJECTs to promote.
*/
-GList *o_complex_get_promotable (TOPLEVEL *toplevel, OBJECT *object, int detach)
+static GList *o_complex_get_promotable (TOPLEVEL *toplevel, OBJECT *object, int detach)
{
GList *promoted = NULL;
GList *attribs;
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs