gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-301-g4cb7cfe)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  4cb7cfe82698bb20f0afc92bb354415143ec4a8c (commit)
      from  8801ff019dc2ccc64a3dd7367b65e7ea6ce5229e (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_text_basic.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


=================
 Commit Messages
=================

commit 4cb7cfe82698bb20f0afc92bb354415143ec4a8c
Author: Werner Hoch <werner.ho@xxxxxx>
Date:   Sun Nov 9 17:11:03 2008 +0100

    libgeda: fixed text read function for fileformat version 2
    
    Reading multiline text with file format 2 failed.
    This happend because the file format was checked for version 1.
    
    Let's check for a file format verion greater than 1 for the
    multiline text feature.
    
    The bug appears since the file format version bump in
    c2c94821ec6c9a83d0144adad7f6fa190f403af3

:100644 100644 33dab39... 8821d03... M	libgeda/src/o_text_basic.c

=========
 Changes
=========

commit 4cb7cfe82698bb20f0afc92bb354415143ec4a8c
Author: Werner Hoch <werner.ho@xxxxxx>
Date:   Sun Nov 9 17:11:03 2008 +0100

    libgeda: fixed text read function for fileformat version 2
    
    Reading multiline text with file format 2 failed.
    This happend because the file format was checked for version 1.
    
    Let's check for a file format verion greater than 1 for the
    multiline text feature.
    
    The bug appears since the file format version bump in
    c2c94821ec6c9a83d0144adad7f6fa190f403af3

diff --git a/libgeda/src/o_text_basic.c b/libgeda/src/o_text_basic.c
index 33dab39..8821d03 100644
--- a/libgeda/src/o_text_basic.c
+++ b/libgeda/src/o_text_basic.c
@@ -1093,7 +1093,7 @@ OBJECT *o_text_read(TOPLEVEL *toplevel, OBJECT *object_list,
   char* string = NULL;
   GString *textstr;
 
-  if (fileformat_ver == 1) {
+  if (fileformat_ver >= 1) {
     sscanf(first_line, "%c %d %d %d %d %d %d %d %d %d\n", &type, &x, &y, 
            &color, &size,
            &visibility, &show_name_value, 




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs