[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.7.1-20110619-213-g0f3a44e)
The branch, master has been updated
via 0f3a44ec39dfb562ccfd9d3d458ba5e9062d2259 (commit)
via e4dcffe27047d7a72698c331cfcc835d564b7ef4 (commit)
via bad14b02ef17c9118b17cb3345165e0cbddb9405 (commit)
via 762a91e24ea91eeba8a67fab75071f9173bfaa6a (commit)
via abc0f07300a726eef628c74e8250f4f115dae987 (commit)
via 387394696a6d8191edd68f9aa2f208c736900d2f (commit)
via 76e13d2452d7d45dbc10993fae7e0d5d17929ff1 (commit)
via 5244f978119e23709ea794f69d095dd07d798a56 (commit)
from 1ceef2c85bdbc454205d7330c86498381f167cc0 (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
=========
gschem/src/o_picture.c | 7 +++----
libgeda/include/libgeda/libgedaguile.h | 3 +++
libgeda/include/libgeda/prototype.h | 4 ++--
libgeda/include/libgedaguile_priv.h | 6 ++----
libgeda/include/prototype_priv.h | 2 +-
.../scheme/unit-tests/t0107-object-stroke-fill.scm | 9 +++++++++
libgeda/scheme/unit-tests/t0201-page-dirty.scm | 6 ++++++
libgeda/src/scheme_attrib.c | 4 ++--
libgeda/src/scheme_deprecated.c | 4 ++--
libgeda/src/scheme_init.c | 2 +-
libgeda/src/scheme_object.c | 4 +++-
11 files changed, 34 insertions(+), 17 deletions(-)
=================
Commit Messages
=================
commit 0f3a44ec39dfb562ccfd9d3d458ba5e9062d2259
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Use g_assert() instead of exit().
:100644 100644 d64b949... d602537... M gschem/src/o_picture.c
commit e4dcffe27047d7a72698c331cfcc835d564b7ef4
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: Add "deprecated" attribute to deprecated functions.
:100644 100644 e531835... 85cab06... M libgeda/include/libgeda/prototype.h
:100644 100644 bc8b403... 2d51f40... M libgeda/include/prototype_priv.h
commit bad14b02ef17c9118b17cb3345165e0cbddb9405
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
scheme-api: Warn if edascm_to_object_glist() result is unused.
:100644 100644 2629a75... 49916ab... M libgeda/include/libgedaguile_priv.h
commit 762a91e24ea91eeba8a67fab75071f9173bfaa6a
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
scheme-api: Clear all new path section fields.
Fixes some unitialised variable warnings.
:100644 100644 40efe93... 0145a22... M libgeda/src/scheme_object.c
commit abc0f07300a726eef628c74e8250f4f115dae987
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
scheme-api: Add test for feeding back fill/stroke functions.
:100644 100644 ecf74c3... 2b8de27... M libgeda/scheme/unit-tests/t0107-object-stroke-fill.scm
commit 387394696a6d8191edd68f9aa2f208c736900d2f
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
scheme-api: Modifying object fill/stroke should dirty page.
:100644 100644 b450ed8... d80ef73... M libgeda/scheme/unit-tests/t0201-page-dirty.scm
:100644 100644 ea5b171... 40efe93... M libgeda/src/scheme_object.c
commit 76e13d2452d7d45dbc10993fae7e0d5d17929ff1
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
scheme-api: Update some doxygen comments.
:100644 100644 752b2a4... 1d568aa... M libgeda/src/scheme_attrib.c
:100644 100644 3a49607... b41aa44... M libgeda/src/scheme_deprecated.c
:100644 100644 927b3d5... 7dd2321... M libgeda/src/scheme_init.c
commit 5244f978119e23709ea794f69d095dd07d798a56
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
scheme-api: edascm_c_set_gc() should be part of public API.
The documentation for edascm_from_object() recommends using
edascm_c_set_gc() -- since its essential for safe garbage collector
behaviour -- so put edascm_c_set_gc() in the public Scheme API header
file.
:100644 100644 f440297... b2f0712... M libgeda/include/libgeda/libgedaguile.h
:100644 100644 ad8244d... 2629a75... M libgeda/include/libgedaguile_priv.h
=========
Changes
=========
commit 0f3a44ec39dfb562ccfd9d3d458ba5e9062d2259
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Use g_assert() instead of exit().
diff --git a/gschem/src/o_picture.c b/gschem/src/o_picture.c
index d64b949..d602537 100644
--- a/gschem/src/o_picture.c
+++ b/gschem/src/o_picture.c
@@ -444,10 +444,9 @@ void o_picture_exchange (GSCHEM_TOPLEVEL *w_current, GdkPixbuf *pixbuf,
OBJECT *object;
object = (OBJECT *) list->data;
- if (object == NULL) {
- fprintf(stderr, _("ERROR: NULL object!\n"));
- exit(-1);
- }
+
+ g_assert (object != NULL);
+
if (!object->attached_to) {
/* It's selected. Then change picture if it's a picture */
if (object->type == OBJ_PICTURE) {
commit e4dcffe27047d7a72698c331cfcc835d564b7ef4
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: Add "deprecated" attribute to deprecated functions.
diff --git a/libgeda/include/libgeda/prototype.h b/libgeda/include/libgeda/prototype.h
index e531835..85cab06 100644
--- a/libgeda/include/libgeda/prototype.h
+++ b/libgeda/include/libgeda/prototype.h
@@ -228,8 +228,8 @@ SELECTION *o_selection_new( void );
void o_selection_add(TOPLEVEL *toplevel, SELECTION *selection, OBJECT *o_selected);
void o_selection_print_all(const SELECTION *selection);
void o_selection_remove(TOPLEVEL *toplevel, SELECTION *selection, OBJECT *o_selected);
-void o_selection_select(TOPLEVEL *toplevel, OBJECT *object); /* DEPRECATED */
-void o_selection_unselect(TOPLEVEL *toplevel, OBJECT *object); /* DEPRECATED */
+void o_selection_select(TOPLEVEL *toplevel, OBJECT *object) G_GNUC_DEPRECATED;
+void o_selection_unselect(TOPLEVEL *toplevel, OBJECT *object) G_GNUC_DEPRECATED;
/* o_text_basic.c */
int o_text_num_lines(const char *string);
diff --git a/libgeda/include/prototype_priv.h b/libgeda/include/prototype_priv.h
index bc8b403..2d51f40 100644
--- a/libgeda/include/prototype_priv.h
+++ b/libgeda/include/prototype_priv.h
@@ -97,7 +97,7 @@ OBJECT *o_attrib_find_attrib_by_name(const GList *list, char *name, int count);
/* o_basic.c */
void o_bounds_invalidate(TOPLEVEL *toplevel, OBJECT *object);
double o_shortest_distance_full(OBJECT *object, int x, int y, int force_solid);
-PAGE *o_get_page_compat (TOPLEVEL *toplevel, OBJECT *object);
+PAGE *o_get_page_compat (TOPLEVEL *toplevel, OBJECT *object) G_GNUC_DEPRECATED;
void o_emit_pre_change_notify(TOPLEVEL *toplevel, OBJECT *object);
void o_emit_change_notify(TOPLEVEL *toplevel, OBJECT *object);
commit bad14b02ef17c9118b17cb3345165e0cbddb9405
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
scheme-api: Warn if edascm_to_object_glist() result is unused.
diff --git a/libgeda/include/libgedaguile_priv.h b/libgeda/include/libgedaguile_priv.h
index 2629a75..49916ab 100644
--- a/libgeda/include/libgedaguile_priv.h
+++ b/libgeda/include/libgedaguile_priv.h
@@ -123,7 +123,8 @@ SCM edascm_from_toplevel (TOPLEVEL *toplevel);
/* ---------------------------------------- */
-GList *edascm_to_object_glist (SCM objs, const char *subr);
+GList *edascm_to_object_glist (SCM objs, const char *subr)
+ G_GNUC_WARN_UNUSED_RESULT;
SCM edascm_from_object_glist (const GList *objs);
int edascm_is_object_type (SCM smob, int type);
commit 762a91e24ea91eeba8a67fab75071f9173bfaa6a
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
scheme-api: Clear all new path section fields.
Fixes some unitialised variable warnings.
diff --git a/libgeda/src/scheme_object.c b/libgeda/src/scheme_object.c
index 40efe93..0145a22 100644
--- a/libgeda/src/scheme_object.c
+++ b/libgeda/src/scheme_object.c
@@ -1777,7 +1777,7 @@ SCM_DEFINE (path_insert_x, "%path-insert", 3, 6, 0,
TOPLEVEL *toplevel = edascm_c_current_toplevel ();
OBJECT *obj = edascm_to_object (obj_s);
PATH *path = obj->path;
- PATH_SECTION section;
+ PATH_SECTION section = {0, 0, 0, 0, 0, 0, 0};
/* Check & extract path element type. */
if (type_s == closepath_sym) { section.code = PATH_END; }
commit abc0f07300a726eef628c74e8250f4f115dae987
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
scheme-api: Add test for feeding back fill/stroke functions.
diff --git a/libgeda/scheme/unit-tests/t0107-object-stroke-fill.scm b/libgeda/scheme/unit-tests/t0107-object-stroke-fill.scm
index ecf74c3..2b8de27 100644
--- a/libgeda/scheme/unit-tests/t0107-object-stroke-fill.scm
+++ b/libgeda/scheme/unit-tests/t0107-object-stroke-fill.scm
@@ -10,20 +10,25 @@
(assert-equal 1 (object-stroke-width a))
(assert-equal 'none (object-stroke-cap a))
(assert-equal '(solid) (object-stroke-dash a))
+ (assert-equal a (apply set-object-stroke! a (object-stroke a)))
(set-object-stroke! a 1 'square 'dotted 2 'bar)
(assert-equal 'square (object-stroke-cap a))
(assert-equal '(dotted 2) (object-stroke-dash a))
+ (assert-equal a (apply set-object-stroke! a (object-stroke a)))
(set-object-stroke! a 1 'round 'dashed 3 4)
(assert-equal 'round (object-stroke-cap a))
(assert-equal '(dashed 3 4) (object-stroke-dash a))
+ (assert-equal a (apply set-object-stroke! a (object-stroke a)))
(set-object-stroke! a 1 'round 'center 5 6)
(assert-equal '(center 5 6) (object-stroke-dash a))
+ (assert-equal a (apply set-object-stroke! a (object-stroke a)))
(set-object-stroke! a 1 'round 'phantom 7 8)
(assert-equal '(phantom 7 8) (object-stroke-dash a))
+ (assert-equal a (apply set-object-stroke! a (object-stroke a)))
))
(begin-test 'fill
@@ -31,13 +36,17 @@
(assert-equal a (set-object-fill! a 'hollow))
(assert-equal '(hollow) (object-fill a))
+ (assert-equal a (apply set-object-fill! a (object-fill a)))
(assert-equal a (set-object-fill! a 'solid))
(assert-equal '(solid) (object-fill a))
+ (assert-equal a (apply set-object-fill! a (object-fill a)))
(assert-equal a (set-object-fill! a 'hatch 1 2 3))
(assert-equal '(hatch 1 2 3) (object-fill a))
+ (assert-equal a (apply set-object-fill! a (object-fill a)))
(assert-equal a (set-object-fill! a 'mesh 4 5 6 7 8))
(assert-equal '(mesh 4 5 6 7 8) (object-fill a))
+ (assert-equal a (apply set-object-fill! a (object-fill a)))
))
commit 387394696a6d8191edd68f9aa2f208c736900d2f
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
scheme-api: Modifying object fill/stroke should dirty page.
diff --git a/libgeda/scheme/unit-tests/t0201-page-dirty.scm b/libgeda/scheme/unit-tests/t0201-page-dirty.scm
index b450ed8..d80ef73 100644
--- a/libgeda/scheme/unit-tests/t0201-page-dirty.scm
+++ b/libgeda/scheme/unit-tests/t0201-page-dirty.scm
@@ -61,6 +61,9 @@
(assert-dirties P (apply set-component! C
(list-tail (component-info C) 1)))
+ (assert-dirties P (apply set-object-stroke! l (object-stroke l)))
+ (assert-dirties P (apply set-object-fill! b (object-fill b)))
+
; Remove primitives from page
(assert-dirties P (for-each (lambda (x) (page-remove! P x))
(list l b c a t)))
@@ -76,6 +79,9 @@
(assert-dirties P (apply set-arc! a (arc-info a)))
(assert-dirties P (apply set-text! t (text-info t)))
+ (assert-dirties P (apply set-object-stroke! l (object-stroke l)))
+ (assert-dirties P (apply set-object-fill! b (object-fill b)))
+
; Remove primitives from component
(for-each (lambda (x) (assert-dirties P (component-remove! C x)))
(list l b c a t)))
diff --git a/libgeda/src/scheme_object.c b/libgeda/src/scheme_object.c
index ea5b171..40efe93 100644
--- a/libgeda/src/scheme_object.c
+++ b/libgeda/src/scheme_object.c
@@ -466,6 +466,7 @@ SCM_DEFINE (set_object_stroke_x, "%set-object-stroke!", 4, 2, 0,
}
o_set_line_options (toplevel, obj, cap, type, width, length, space);
+ o_page_changed (toplevel, obj);
return obj_s;
}
@@ -622,6 +623,7 @@ SCM_DEFINE (set_object_fill_x, "%set-object-fill!", 2, 5, 0,
o_set_fill_options (toplevel, obj, type, width,
space1, angle1, space2, angle2);
+ o_page_changed (toplevel, obj);
return obj_s;
}
commit 76e13d2452d7d45dbc10993fae7e0d5d17929ff1
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
scheme-api: Update some doxygen comments.
diff --git a/libgeda/src/scheme_attrib.c b/libgeda/src/scheme_attrib.c
index 752b2a4..1d568aa 100644
--- a/libgeda/src/scheme_attrib.c
+++ b/libgeda/src/scheme_attrib.c
@@ -18,8 +18,8 @@
*/
/*!
- * \file scheme_page.c
- * \brief Scheme API page manipulation procedures.
+ * \file scheme_attrib.c
+ * \brief Scheme API attribute manipulation procedures.
*/
#include <config.h>
diff --git a/libgeda/src/scheme_deprecated.c b/libgeda/src/scheme_deprecated.c
index 3a49607..b41aa44 100644
--- a/libgeda/src/scheme_deprecated.c
+++ b/libgeda/src/scheme_deprecated.c
@@ -18,8 +18,8 @@
*/
/*!
- * \file scheme_init.c
- * Deprecated Scheme API functions
+ * \file scheme_deprecated.c
+ * \brief Deprecated Scheme API functions
*/
#include <config.h>
diff --git a/libgeda/src/scheme_init.c b/libgeda/src/scheme_init.c
index 927b3d5..7dd2321 100644
--- a/libgeda/src/scheme_init.c
+++ b/libgeda/src/scheme_init.c
@@ -19,7 +19,7 @@
/*!
* \file scheme_init.c
- * Scheme API initialisation
+ * \brief Scheme API initialisation
*/
#include <config.h>
commit 5244f978119e23709ea794f69d095dd07d798a56
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
scheme-api: edascm_c_set_gc() should be part of public API.
The documentation for edascm_from_object() recommends using
edascm_c_set_gc() -- since its essential for safe garbage collector
behaviour -- so put edascm_c_set_gc() in the public Scheme API header
file.
diff --git a/libgeda/include/libgeda/libgedaguile.h b/libgeda/include/libgeda/libgedaguile.h
index f440297..b2f0712 100644
--- a/libgeda/include/libgeda/libgedaguile.h
+++ b/libgeda/include/libgeda/libgedaguile.h
@@ -54,3 +54,6 @@ int edascm_is_page (SCM smob);
/* Test if smob is a gEDA object. */
int edascm_is_object (SCM smob);
+
+/* Set whether a gEDA object may be garbage collected. */
+void edascm_c_set_gc (SCM smob, int gc);
diff --git a/libgeda/include/libgedaguile_priv.h b/libgeda/include/libgedaguile_priv.h
index ad8244d..2629a75 100644
--- a/libgeda/include/libgedaguile_priv.h
+++ b/libgeda/include/libgedaguile_priv.h
@@ -121,9 +121,6 @@ SCM edascm_from_toplevel (TOPLEVEL *toplevel);
SCM_SET_SMOB_FLAGS (x, gc ? (SCM_SMOB_FLAGS (x) | GEDA_SMOB_GC_FLAG) \
: (SCM_SMOB_FLAGS (x) & ~GEDA_SMOB_GC_FLAG))
-/* Set whether a gEDA object may be garbage collected. */
-void edascm_c_set_gc (SCM smob, int gc);
-
/* ---------------------------------------- */
GList *edascm_to_object_glist (SCM objs, const char *subr);
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs