gEDA-cvs: pcb.git: branch: master updated (89ca3994480c74b23f05c4deac0eee24dee0d9b0)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  89ca3994480c74b23f05c4deac0eee24dee0d9b0 (commit)
      from  9a96cf2fcf79eb7164c4f1e918b71e8fa558d6ca (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/gui-top-window.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


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

commit 89ca3994480c74b23f05c4deac0eee24dee0d9b0
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    hid/gtk: Avoid double-destroying the file-changed info_bar on "Reload"
    
    This was caused by an addition I made in the earlier patch to destroy
    the info_bar when the user manually reverts or loads a new file).
    
    The callback on revert button was trying to delete it (again) after
    the revert _action_ we call triggered a destroy of the widget. Avoid
    this by destroying the info_bar before we call the revert action.

:100644 100644 f713446... f3e95e7... M	src/hid/gtk/gui-top-window.c

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

commit 89ca3994480c74b23f05c4deac0eee24dee0d9b0
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    hid/gtk: Avoid double-destroying the file-changed info_bar on "Reload"
    
    This was caused by an addition I made in the earlier patch to destroy
    the info_bar when the user manually reverts or loads a new file).
    
    The callback on revert button was trying to delete it (again) after
    the revert _action_ we call triggered a destroy of the widget. Avoid
    this by destroying the info_bar before we call the revert action.

diff --git a/src/hid/gtk/gui-top-window.c b/src/hid/gtk/gui-top-window.c
index f713446..f3e95e7 100644
--- a/src/hid/gtk/gui-top-window.c
+++ b/src/hid/gtk/gui-top-window.c
@@ -471,11 +471,11 @@ info_bar_response_cb (GtkInfoBar *info_bar,
 {
   GhidGui *_gui = (GhidGui *)user_data;
 
-  if (response_id == GTK_RESPONSE_ACCEPT)
-    hid_actionl ("LoadFrom", "revert", "none", NULL);
-
   gtk_widget_destroy (_gui->info_bar);
   _gui->info_bar = NULL;
+
+  if (response_id == GTK_RESPONSE_ACCEPT)
+    hid_actionl ("LoadFrom", "revert", "none", NULL);
 }
 
 static void




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