Re: RELEASE: GNOME 1.4.1 Release candidate 1

[=?iso-8859-15?q?R=E9mi?= Cohen-Scali <Remi Cohen-Scali com>]

 Kjartan Maraas wrote:

> Hi.
>
> After a long wait the GNOME community is happy to announce the
> availability of the final release candidate before the final GNOME 1.4.1
> release. One of the main points of this release is handling parallell
> installs with the newly released GNOME 2.0 Alpha. Other than that
> there's been a quite few changes since the last beta:
I have a problem with gnome-games 1.4.0.2 build.
Aisleriot define a non static scm_add_slot function which conflict with 
libguile scm_add_slot (in libguile/goops.h).
Here a proposed patch to fix this.

--
                                                         -o)
                  Remi Cohen-Scali                       /\\
<Remi Cohen-Scali com>          <rcoscali rcsnet net>    _\_v
                                                        ----


diff -u gnome-games-1.4.0.2/ChangeLog gnome-games-hacked/ChangeLog 
--- gnome-games-1.4.0.2/ChangeLog	Thu Jul  5 08:39:39 2001
+++ gnome-games-hacked/ChangeLog	Tue Feb  5 03:54:12 2002
@@ -1,3 +1,8 @@
+2002-02-05  Remi Cohen-Scali  <remi cohen-scali com>
+
+	* cscmi.c (scm_add_slot): changed scm_add_slot name in scm_add_a_slot
+	because of a conflict with guile scm_add_slot.
+
 2001-06-29  Marius Andreiana  <mandreiana yahoo com>
 
 	* configure.in: Added zh_TW.Big5 to ALL_LINGUAS
diff -u gnome-games-1.4.0.2/aisleriot/cscmi.c gnome-games-hacked/aisleriot/cscmi.c
--- gnome-games-1.4.0.2/aisleriot/cscmi.c	Mon Jun 14 20:07:48 1999
+++ gnome-games-hacked/aisleriot/cscmi.c	Tue Feb  5 03:51:11 2002
@@ -155,7 +155,7 @@
   return SCM_EOL;
 }
 
-SCM scm_add_slot(SCM slot) 
+SCM scm_add_a_slot(SCM slot) 
 {
   add_slot(slot);
   return SCM_EOL;
@@ -266,7 +266,7 @@
   gh_new_procedure1_0("set-statusbar-message", scm_set_statusbar_message);
   gh_new_procedure1_0("set-surface-layout", scm_set_surface_layout);
   gh_new_procedure0_0("reset-surface", scm_reset_surface);
-  gh_new_procedure1_0("add-slot", scm_add_slot);
+  gh_new_procedure1_0("add-slot", scm_add_a_slot);
   gh_new_procedure1_0("get-slot", scm_get_slot);  
   gh_new_procedure2_0("set-cards-c!", scm_set_cards);
   gh_new_procedure("set-lambda", scm_set_lambda, 8, 0, 1);