gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-263-gcee5dea)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  cee5dea44626c4e442fc02841c26c8f3951817b7 (commit)
      from  986bb906bbac1198c5f8b3ae507aab84d49fb3c9 (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/x_dialog.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


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

commit cee5dea44626c4e442fc02841c26c8f3951817b7
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date:   Sun Oct 26 23:42:48 2008 +0000

    gschem: Initialise color combobox from current selection.
    
    This (rather necessary) feature was unfortunately missed out in
    219f5d708fbe5e26f77808bb08810b96dfa984eb.  Ideally, of course, the
    combobox constructor should be passed the color index to initialise
    itself with rather than poking global state, but for now let's just
    get it working again.

:100644 100644 2af8cf7... 91cf52d... M	gschem/src/x_dialog.c

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

commit cee5dea44626c4e442fc02841c26c8f3951817b7
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Date:   Sun Oct 26 23:42:48 2008 +0000

    gschem: Initialise color combobox from current selection.
    
    This (rather necessary) feature was unfortunately missed out in
    219f5d708fbe5e26f77808bb08810b96dfa984eb.  Ideally, of course, the
    combobox constructor should be passed the color index to initialise
    itself with rather than poking global state, but for now let's just
    get it working again.

diff --git a/gschem/src/x_dialog.c b/gschem/src/x_dialog.c
index 2af8cf7..91cf52d 100644
--- a/gschem/src/x_dialog.c
+++ b/gschem/src/x_dialog.c
@@ -2281,8 +2281,13 @@ create_color_menu (GSCHEM_TOPLEVEL *w_current)
 
   gint i;
   gchar *str;
+  OBJECT *obj;
   GtkTreeIter iter;
 
+  obj = o_select_return_first_object (w_current);
+  if (obj != NULL)
+    w_current->edit_color = obj->saved_color;
+
   /* The columns are: name of color, index of color. */
   store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
   cbox = GTK_COMBO_BOX (gtk_combo_box_new_with_model (GTK_TREE_MODEL (store)));




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