gEDA-cvs: pcb.git: branch: master updated (067143f2d8f7e2f7f90bed5d24801332d8cc08f3)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  067143f2d8f7e2f7f90bed5d24801332d8cc08f3 (commit)
       via  99dcd9a583defebded353ac908c355f95b8ffa53 (commit)
      from  efe692e8e7539b5bc52a3734da6764bd41826ff8 (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
=========

 src/hid/gtk/ghid-layer-selector.c |    2 +-
 src/hid/gtk/gui-top-window.c      |   16 +---------------
 2 files changed, 2 insertions(+), 16 deletions(-)


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

commit 067143f2d8f7e2f7f90bed5d24801332d8cc08f3
Author: Andrew Poelstra <asp11@xxxxxx>
Commit: Andrew Poelstra <asp11@xxxxxx>

    gtk: fix typo preventing layer selector menu items from working

:100644 100644 c7d7030... a3a313e... M	src/hid/gtk/ghid-layer-selector.c

commit 99dcd9a583defebded353ac908c355f95b8ffa53
Author: Andrew Poelstra <asp11@xxxxxx>
Commit: Andrew Poelstra <asp11@xxxxxx>

    gtk: remove in_toggle_view recursion-prevention flag
    
    We don't call ToggleView programmatically anywhere, so it is
    impossible for there to be recursion.

:100644 100644 7b3e228... d08a960... M	src/hid/gtk/gui-top-window.c

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

commit 067143f2d8f7e2f7f90bed5d24801332d8cc08f3
Author: Andrew Poelstra <asp11@xxxxxx>
Commit: Andrew Poelstra <asp11@xxxxxx>

    gtk: fix typo preventing layer selector menu items from working

diff --git a/src/hid/gtk/ghid-layer-selector.c b/src/hid/gtk/ghid-layer-selector.c
index c7d7030..a3a313e 100644
--- a/src/hid/gtk/ghid-layer-selector.c
+++ b/src/hid/gtk/ghid-layer-selector.c
@@ -129,7 +129,7 @@ set_visibility (GHidLayerSelector *ls, GtkTreeIter *iter,
     {
       g_signal_handler_block (ldata->view_action, ldata->view_sig_id);
       gtk_toggle_action_set_active (ldata->view_action, state);
-      g_signal_handler_block (ldata->view_action, ldata->view_sig_id);
+      g_signal_handler_unblock (ldata->view_action, ldata->view_sig_id);
     }
 }
 

commit 99dcd9a583defebded353ac908c355f95b8ffa53
Author: Andrew Poelstra <asp11@xxxxxx>
Commit: Andrew Poelstra <asp11@xxxxxx>

    gtk: remove in_toggle_view recursion-prevention flag
    
    We don't call ToggleView programmatically anywhere, so it is
    impossible for there to be recursion.

diff --git a/src/hid/gtk/gui-top-window.c b/src/hid/gtk/gui-top-window.c
index 7b3e228..d08a960 100644
--- a/src/hid/gtk/gui-top-window.c
+++ b/src/hid/gtk/gui-top-window.c
@@ -1877,23 +1877,13 @@ static int
 ToggleView (int argc, char **argv, Coord x, Coord y)
 {
   int i, l;
-  static gboolean in_toggle_view = 0;
 
 #ifdef DEBUG_MENUS
-  printf ("Starting ToggleView().  in_toggle_view = %d\n", in_toggle_view);
+  puts ("Starting ToggleView().");
 #endif
-  if (in_toggle_view)
-    {
-      fprintf (stderr, "ToggleView() called on top of another ToggleView()\n"
-	       "Please report this and how it happened\n");
-      return 0;
-    }
-
-  in_toggle_view = 1;
 
   if (argc == 0)
     {
-      in_toggle_view = 0;
       AFAIL (toggleview);
     }
   if (isdigit ((int) argv[0][0]))
@@ -1923,20 +1913,16 @@ ToggleView (int argc, char **argv, Coord x, Coord y)
 	  }
       if (l == -1)
 	{
-	  in_toggle_view = 0;
 	  AFAIL (toggleview);
 	}
 
     }
 
-  printf ("ToggleView():  l = %d\n", l);
-
   /* Now that we've figured out which toggle button ought to control
    * this layer, simply hit the button and let the pre-existing code deal
    */
   ghid_layer_selector_toggle_layer
     (GHID_LAYER_SELECTOR (ghidgui->layer_selector), l);
-  in_toggle_view = 0;
   return 0;
 }
 




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