[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.7.1-20110619-159-gf68f9a3)
The branch, master has been updated
via f68f9a31c57e2aa343db14d6d7c98997a4c533ad (commit)
via d01e46055593990e918d94e4b30609df989561b4 (commit)
from dad94bf12c2ef120fae7a45a0020107815b84ef0 (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/Makefile.am | 2 +-
gschem/src/x_event.c | 6 ++++--
libgeda/shell/Makefile.am | 2 +-
libgeda/src/Makefile.am | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
=================
Commit Messages
=================
commit f68f9a31c57e2aa343db14d6d7c98997a4c533ad
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Make sure window fluid is set for double-click events.
This patch prevents a Scheme crash when double-clicking on objects to
bring up the edit window.
Reported-by: Eivind Kvedalen
:100644 100644 0eaf6c5... 6f130e6... M gschem/src/x_event.c
commit d01e46055593990e918d94e4b30609df989561b4
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: guile-snarf should use host CPP.
Fix cross-compilation by making sure that guile-snarf uses the same C
preprocessor that will be later used for compilation.
Reported-by: DJ Delorie <dj@xxxxxxxxxxx>
:100644 100644 5a1f118... 8437633... M gschem/src/Makefile.am
:100644 100644 badcc4f... d339bb5... M libgeda/shell/Makefile.am
:100644 100644 7f73d0a... 07a80d3... M libgeda/src/Makefile.am
=========
Changes
=========
commit f68f9a31c57e2aa343db14d6d7c98997a4c533ad
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Make sure window fluid is set for double-click events.
This patch prevents a Scheme crash when double-clicking on objects to
bring up the edit window.
Reported-by: Eivind Kvedalen
diff --git a/gschem/src/x_event.c b/gschem/src/x_event.c
index 0eaf6c5..6f130e6 100644
--- a/gschem/src/x_event.c
+++ b/gschem/src/x_event.c
@@ -97,6 +97,9 @@ gint x_event_button_pressed(GtkWidget *widget, GdkEventButton *event,
int w_x, w_y;
int unsnapped_wx, unsnapped_wy;
+ scm_dynwind_begin (0);
+ g_dynwind_window (w_current);
+
exit_if_null(w_current);
#if DEBUG
@@ -120,6 +123,7 @@ gint x_event_button_pressed(GtkWidget *widget, GdkEventButton *event,
if (o_select_selected (w_current)) {
o_edit(w_current, geda_list_get_glist( toplevel->page_current->selection_list ));
i_set_state(w_current, SELECT);
+ scm_dynwind_end ();
return(0);
}
}
@@ -131,8 +135,6 @@ gint x_event_button_pressed(GtkWidget *widget, GdkEventButton *event,
/* Huge switch statement to evaluate state transitions. Jump to
* end_button_pressed label to escape the state evaluation rather than
* returning from the function directly. */
- scm_dynwind_begin (0);
- g_dynwind_window (w_current);
if (event->button == 1) {
switch(w_current->event_state) {
commit d01e46055593990e918d94e4b30609df989561b4
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: guile-snarf should use host CPP.
Fix cross-compilation by making sure that guile-snarf uses the same C
preprocessor that will be later used for compilation.
Reported-by: DJ Delorie <dj@xxxxxxxxxxx>
diff --git a/gschem/src/Makefile.am b/gschem/src/Makefile.am
index 5a1f118..8437633 100644
--- a/gschem/src/Makefile.am
+++ b/gschem/src/Makefile.am
@@ -94,7 +94,7 @@ SUFFIXES = .x
snarf_cpp_opts = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(gschem_CPPFLAGS) $(AM_CFLAGS) $(gschem_CFLAGS)
.c.x:
- $(GUILE_SNARF) -o $@ $< $(snarf_cpp_opts)
+ CPP="$(CPP)" $(GUILE_SNARF) -o $@ $< $(snarf_cpp_opts)
localedir = @datadir@/locale
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
diff --git a/libgeda/shell/Makefile.am b/libgeda/shell/Makefile.am
index badcc4f..d339bb5 100644
--- a/libgeda/shell/Makefile.am
+++ b/libgeda/shell/Makefile.am
@@ -23,6 +23,6 @@ SUFFIXES = .x
snarf_cpp_opts = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(geda_shell_CPPFLAGS) $(AM_CFLAGS) $(geda_shell_CFLAGS)
.c.x:
- $(GUILE_SNARF) -o $@ $< $(snarf_cpp_opts)
+ CPP="$(CPP)" $(GUILE_SNARF) -o $@ $< $(snarf_cpp_opts)
CLEANFILES = $(BUILT_SOURCES)
diff --git a/libgeda/src/Makefile.am b/libgeda/src/Makefile.am
index 7f73d0a..07a80d3 100644
--- a/libgeda/src/Makefile.am
+++ b/libgeda/src/Makefile.am
@@ -96,7 +96,7 @@ SUFFIXES = .x
snarf_cpp_opts = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(libgeda_la_CPPFLAGS) $(AM_CFLAGS) $(libgeda_la_CFLAGS)
.c.x:
- $(GUILE_SNARF) -o $@ $< $(snarf_cpp_opts)
+ CPP="$(CPP)" $(GUILE_SNARF) -o $@ $< $(snarf_cpp_opts)
MOSTLYCLEANFILES = *.log core FILE *~
CLEANFILES = *.log core FILE *~ $(BUILT_SOURCES)
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs