gEDA-cvs: gaf.git: branch: master updated (1.7.1-20110619-261-gfea6766)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  fea67660e14d7e927e5ec2c6df5d18c2ea23f82c (commit)
      from  9c9744fa1a4dec33ecd3022412d80267a93a8370 (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_pagesel.c |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)


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

commit fea67660e14d7e927e5ec2c6df5d18c2ea23f82c
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gschem: Update state properly on changing pages using page manager.
    
    Closes-bug: lp-705524

:100644 100644 d447efe... 24f59fb... M	gschem/src/x_pagesel.c

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

commit fea67660e14d7e927e5ec2c6df5d18c2ea23f82c
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gschem: Update state properly on changing pages using page manager.
    
    Closes-bug: lp-705524

diff --git a/gschem/src/x_pagesel.c b/gschem/src/x_pagesel.c
index d447efe..24f59fb 100644
--- a/gschem/src/x_pagesel.c
+++ b/gschem/src/x_pagesel.c
@@ -166,17 +166,11 @@ static void pagesel_callback_selection_changed (GtkTreeSelection *selection,
                       COLUMN_PAGE, &page,
                       -1);
 
-  /* temp */
-  s_page_goto (w_current->toplevel, page);
-  i_set_filename (w_current, w_current->toplevel->page_current->page_filename);
-  x_scrollbars_update (w_current);
-  o_invalidate_all (w_current);
-
-  /* We would like to use the following call, but since it calls 
-   * x_pagesel_update() it would cause an infinite loop.
-   */
-  /*  x_window_set_current_page (toplevel, page); */
-
+  /* Since setting the current page may call x_pagesel_update(), which
+   * might change the current page selection, make sure we do nothing
+   * if the newly-selected page is already the current page. */
+  if (page == w_current->toplevel->page_current) return;
+  x_window_set_current_page (w_current, page);
 }
 
 /*! \todo Finish function documentation!!!




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