[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-63-g5d15edd)
The branch, master has been updated
via 5d15eddd3e197b2cbc0bc00f9a4c02bc719aa014 (commit)
via c2b96c33851322c236d4582d6bc5d31a3485a7c1 (commit)
from 0c8b23528692e0d9406503a400c71dd458cea878 (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/src/o_complex_basic.c | 9 +++++----
libgeda/src/o_text_basic.c | 13 -------------
2 files changed, 5 insertions(+), 17 deletions(-)
=================
Commit Messages
=================
commit 5d15eddd3e197b2cbc0bc00f9a4c02bc719aa014
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Tue Jul 29 03:42:48 2008 +0100
Clarify temporary assigment of TOPLEVEL->complex_parent in o_complex_add()
Move the save/restore of the TOPLEVEL->complex_parent variable in
o_complex_add to be closely placed around the call to o_read_buffer,
the function affected by this assignemnt. In the previous locations,
the scope of influence of adjusting this variable was not clear.
:100644 100644 bdc96b0... 39703fb... M libgeda/src/o_complex_basic.c
commit c2b96c33851322c236d4582d6bc5d31a3485a7c1
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Tue Jul 29 03:29:24 2008 +0100
Remove some redundant instances where TOPLEVEL->object_parent was used.
:100644 100644 b4ac53d... 468b442... M libgeda/src/o_text_basic.c
=========
Changes
=========
commit 5d15eddd3e197b2cbc0bc00f9a4c02bc719aa014
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Tue Jul 29 03:42:48 2008 +0100
Clarify temporary assigment of TOPLEVEL->complex_parent in o_complex_add()
Move the save/restore of the TOPLEVEL->complex_parent variable in
o_complex_add to be closely placed around the call to o_read_buffer,
the function affected by this assignemnt. In the previous locations,
the scope of influence of adjusting this variable was not clear.
diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index bdc96b0..39703fb 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -376,8 +376,6 @@ OBJECT *o_complex_add(TOPLEVEL *toplevel, OBJECT *object_list,
/* you need to override them if there are attached ones */
/* on the main list */
temp_tail = toplevel->page_current->object_tail;
- temp_parent = toplevel->page_current->object_parent;
- toplevel->page_current->object_parent = prim_objs;
/* reason this works is because it has a head, see add_head above */
/* get the symbol data */
@@ -469,10 +467,14 @@ OBJECT *o_complex_add(TOPLEVEL *toplevel, OBJECT *object_list,
/* filename was found */
loaded_normally = TRUE;
-
+
+ temp_parent = toplevel->page_current->object_parent;
+ toplevel->page_current->object_parent = prim_objs;
+
/* add connections till translated */
o_read_buffer(toplevel, prim_objs, buffer, -1, new_node->complex_basename);
+ toplevel->page_current->object_parent = temp_parent;
g_free (buffer);
}
@@ -550,7 +552,6 @@ OBJECT *o_complex_add(TOPLEVEL *toplevel, OBJECT *object_list,
}
toplevel->page_current->object_tail = temp_tail;
- toplevel->page_current->object_parent = temp_parent;
if (use_object_list) {
object_list = (OBJECT *) s_basic_link_object(new_node, object_list);
commit c2b96c33851322c236d4582d6bc5d31a3485a7c1
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Tue Jul 29 03:29:24 2008 +0100
Remove some redundant instances where TOPLEVEL->object_parent was used.
diff --git a/libgeda/src/o_text_basic.c b/libgeda/src/o_text_basic.c
index b4ac53d..468b442 100644
--- a/libgeda/src/o_text_basic.c
+++ b/libgeda/src/o_text_basic.c
@@ -890,7 +890,6 @@ OBJECT *o_text_add(TOPLEVEL *toplevel, OBJECT *object_list,
{
OBJECT *new_node=NULL;
OBJECT *temp_list=NULL;
- OBJECT *temp_parent=NULL;
TEXT *text;
char *name = NULL;
char *value = NULL;
@@ -971,10 +970,6 @@ OBJECT *o_text_add(TOPLEVEL *toplevel, OBJECT *object_list,
/* now start working on the complex */
temp_list = o_text_add_head();
- temp_parent = toplevel->page_current->object_parent;
- /* set the addition of attributes to the head node */
- toplevel->page_current->object_parent = temp_list;
-
if (visibility == VISIBLE ||
(visibility == INVISIBLE && toplevel->show_hidden_text)) {
object_list->text->prim_objs =
@@ -991,8 +986,6 @@ OBJECT *o_text_add(TOPLEVEL *toplevel, OBJECT *object_list,
s_delete(toplevel, temp_list);
}
- toplevel->page_current->object_parent = temp_parent;
-
/* Update bounding box */
o_text_recalc( toplevel, object_list );
@@ -1278,7 +1271,6 @@ char *o_text_save(OBJECT *object)
*/
void o_text_recreate(TOPLEVEL *toplevel, OBJECT *o_current)
{
- OBJECT *temp_parent;
char *name = NULL;
char *value = NULL;
char *output_string = NULL;
@@ -1321,10 +1313,6 @@ void o_text_recreate(TOPLEVEL *toplevel, OBJECT *o_current)
o_list_delete_rest(toplevel, o_current->text->prim_objs);
- temp_parent = toplevel->page_current->object_parent;
- /* set the addition of attributes to the head node */
- toplevel->page_current->object_parent = o_current->text->prim_objs;
-
if (o_current->visibility == VISIBLE ||
(o_current->visibility == INVISIBLE && toplevel->show_hidden_text)) {
@@ -1361,7 +1349,6 @@ void o_text_recreate(TOPLEVEL *toplevel, OBJECT *o_current)
o_text_recalc( toplevel, o_current );
- toplevel->page_current->object_parent = temp_parent;
g_free(name);
g_free(value);
g_free(output_string);
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs