gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-119-g0865651)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  0865651615cf79b1392c34381cbee3095faa5a01 (commit)
      from  efedc62995467645feb5800485783c677730cc40 (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/globals.c |   11 -----------
 gschem/src/gschem.c  |   15 ++++++++++++++-
 2 files changed, 14 insertions(+), 12 deletions(-)


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

commit 0865651615cf79b1392c34381cbee3095faa5a01
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date:   Sat Aug 16 16:47:10 2008 +0100

    gschem: Fixup installation of drawing callbacks.
    
    Now libgeda properly declares them, can just set the function pointers
    in gschem's initialisation function.

:100644 100644 a11e365... 7898f89... M	gschem/src/globals.c
:100644 100644 6d68bb4... 80c6934... M	gschem/src/gschem.c

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

commit 0865651615cf79b1392c34381cbee3095faa5a01
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date:   Sat Aug 16 16:47:10 2008 +0100

    gschem: Fixup installation of drawing callbacks.
    
    Now libgeda properly declares them, can just set the function pointers
    in gschem's initialisation function.

diff --git a/gschem/src/globals.c b/gschem/src/globals.c
index a11e365..7898f89 100644
--- a/gschem/src/globals.c
+++ b/gschem/src/globals.c
@@ -51,18 +51,7 @@ int do_logging = TRUE;
 int logging_dest = LOG_WINDOW;
 
 /* these are required by libgeda */
-void (*arc_draw_func)()      = o_arc_draw;
-void (*box_draw_func)()      = o_box_draw;
-void (*picture_draw_func)()  = o_picture_draw;
-void (*circle_draw_func)()   = o_circle_draw;
-void (*complex_draw_func)()  = o_complex_draw;
-void (*line_draw_func)()     = o_line_draw;
-void (*net_draw_func)()      = o_net_draw;
-void (*bus_draw_func)()      = o_bus_draw;
-void (*text_draw_func)()     = o_text_draw;
-void (*pin_draw_func)()      = o_pin_draw;
 void (*select_func)()        = o_select_object; /* NEW SELECTION code */
-int (*load_newer_backup_func)()  = x_fileselect_load_backup;
 
 /* command line options */
 int quiet_mode = FALSE;
diff --git a/gschem/src/gschem.c b/gschem/src/gschem.c
index 6d68bb4..80c6934 100644
--- a/gschem/src/gschem.c
+++ b/gschem/src/gschem.c
@@ -164,7 +164,20 @@ void main_prog(void *closure, int argc, char *argv[])
   cwd = g_get_current_dir();
   
   libgeda_init();
-  
+
+  /* Install various libgeda callbacks */
+  arc_draw_func = o_arc_draw;
+  box_draw_func = o_box_draw;
+  bus_draw_func = o_bus_draw;
+  circle_draw_func = o_circle_draw;
+  complex_draw_func = o_complex_draw;
+  line_draw_func = o_line_draw;
+  net_draw_func = o_net_draw;
+  picture_draw_func = o_picture_draw;
+  pin_draw_func = o_pin_draw;
+  text_draw_func = o_text_draw;
+  load_newer_backup_func = x_fileselect_load_backup;
+
   /*! \todo Probably the file name shuold be defined elsewhere */
   /* create log file right away even if logging is enabled */
   filename = g_build_filename (cwd, "gschem.log", NULL);




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