diff options
| author | Dodji Seketeli <dodji@gnome.org> | 2004-02-19 19:16:48 +0000 |
|---|---|---|
| committer | Dodji Seketeli <dodji@src.gnome.org> | 2004-02-19 19:16:48 +0000 |
| commit | 06909a3577a9e2ef7b17b44bd894490b78cd3b68 (patch) | |
| tree | bd2a66404239dba87090a8eb88be5210b45dce0f | |
| parent | 5c693b892418b7b0603037cc508dc8e313ce0046 (diff) | |
| download | libcroco-06909a3577a9e2ef7b17b44bd894490b78cd3b68.tar.gz | |
Fixed a bug that was "forgetting" all the properties gathered during the
2004-02-19 Dodji Seketeli <dodji@gnome.org>
* src/cr-sel-eng.c:
(cr_sel_eng_get_matched_properties_from_cascade): Fixed a bug
that was "forgetting" all the properties gathered during the
cascading algorithm but the last ones.
* tests/Makefile.am: a bit of cleanup here.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | src/cr-sel-eng.c | 9 | ||||
| -rw-r--r-- | tests/Makefile.am | 8 |
4 files changed, 17 insertions, 14 deletions
@@ -1,3 +1,11 @@ +2004-02-19 Dodji Seketeli <dodji@gnome.org> + + * src/cr-sel-eng.c: + (cr_sel_eng_get_matched_properties_from_cascade): Fixed a bug + that was "forgetting" all the properties gathered during the + cascading algorithm but the last ones. + * tests/Makefile.am: a bit of cleanup here. + 2004-02-14 Dodji Seketeli <dodji@gnome.org> * src/cr-declaration.[ch]: applied a patch from diff --git a/configure.in b/configure.in index 5cfe81c..b43698d 100644 --- a/configure.in +++ b/configure.in @@ -115,9 +115,9 @@ if test "x$GCC" = "xyes" ; then fi -dnl************************ -dnl*Dodji's environment. -dnl************************ +dnl ************************ +dnl *Dodji's environment. +dnl ************************ if test "x$LOGNAME" = "xdodji" -a "x$GCC" = "xyes" ; then CFLAGS="-g -Wunused -Wimplicit -Wreturn-type -Wswitch \ diff --git a/src/cr-sel-eng.c b/src/cr-sel-eng.c index 4e47c96..f2a730d 100644 --- a/src/cr-sel-eng.c +++ b/src/cr-sel-eng.c @@ -1388,7 +1388,8 @@ cr_sel_eng_get_matched_properties_from_cascade (CRSelEng *a_this, { CRStatement ** stmts_tab = NULL ; enum CRStatus status = CR_OK ; - gulong tab_size = 0, tab_len = 0, index = 0, i = 0 ; + gulong tab_size = 0, tab_len = 0, i = 0, total_tab_len = 0, + index = 0; enum CRStyleOrigin origin = 0 ; gushort stmts_chunck_size = 8 ; CRStyleSheet *sheet = NULL ; @@ -1441,8 +1442,8 @@ cr_sel_eng_get_matched_properties_from_cascade (CRSelEng *a_this, cr_utils_trace_info ("Error while running " "selector engine") ; goto error ; - } - + } + total_tab_len += tab_len ; } /* @@ -1451,7 +1452,7 @@ cr_sel_eng_get_matched_properties_from_cascade (CRSelEng *a_this, *Make sure one can walk from the declaration to *the stylesheet. */ - for (i = 0 ; i < tab_len ; i ++) + for (i = 0 ; i < total_tab_len ; i ++) { CRStatement *stmt = stmts_tab[i] ; diff --git a/tests/Makefile.am b/tests/Makefile.am index 0987a4e..d2bd1fd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,13 +16,7 @@ test6_SOURCES=test6-main.c cr-test-utils.c cr-test-utils.h croco_lib=$(top_builddir)/src/@CROCO_LIB@ LDADD=$(croco_lib) -INCLUDES=-I$(top_srcdir)/intl \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/parser \ - -I$(top_srcdir)/src/seleng \ - -I$(top_srcdir)/src/layeng \ - `pkg-config --cflags glib-2.0` \ - $(croco_layeng_needed_includes) +INCLUDES=-I$(top_srcdir)/intl -I$(top_srcdir)/src LDFLAGS=@GLIB2_LIBS@ @LIBXML2_LIBS@ AM_CFLAGS=-I. @LIBXML2_CFLAGS@ @GLIB2_CFLAGS@ |