[genius] Thu Sep 09 21:29:33 2010 Jiri (George) Lebl <jirka 5z com>

[George Lebl <jirka src gnome org>]

commit ad02ea6e5c7422827d02f5a3b210401d544e5356
Author: Jiri (George) Lebl <jirka 5z com>
Date:   Thu Sep 9 21:29:53 2010 -0700

    Thu Sep 09 21:29:33 2010  Jiri (George) Lebl <jirka 5z com>
    
    	* src/genius.c, src/calc.h, src/gnome-genius.c:  In a fit of
    	  incredible evilness (or stupidity) somebody made <term.h>
    	  #define buttons ... thinking buttons is an uncommon word.
    	  Yaikes.  Wonder why it doesn't break on Fedora but it did break on
    	  SuSE.  Anyway, thanks go to Stephan Hegel for hunting this one
    	  down!

 ChangeLog          |    9 +++++++++
 src/calc.h         |    2 +-
 src/genius.c       |    4 ++--
 src/gnome-genius.c |    4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4cbd0a6..4b843cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Sep 09 21:29:33 2010  Jiri (George) Lebl <jirka 5z com>
+
+	* src/genius.c, src/calc.h, src/gnome-genius.c:  In a fit of
+	  incredible evilness (or stupidity) somebody made <term.h>
+	  #define buttons ... thinking buttons is an uncommon word.
+	  Yaikes.  Wonder why it doesn't break on Fedora but it did break on
+	  SuSE.  Anyway, thanks go to Stephan Hegel for hunting this one
+	  down!
+
 Wed Sep 08 00:48:15 2010  Jiri (George) Lebl <jirka 5z com>
 
 	* Release 1.0.10
diff --git a/src/calc.h b/src/calc.h
index e503cd0..93b86bf 100644
--- a/src/calc.h
+++ b/src/calc.h
@@ -116,7 +116,7 @@ void gel_call_help (const char *function);
 char *gel_ask_string (const char *query, const char *def);
 
 /* implemented in the frontend, buttons should be a nonempty list of strings */
-int gel_ask_buttons (const char *query, GSList *buttons);
+int gel_ask_buttons (const char *query, GSList *buttonlist);
 
 void gel_help_on (const char *text);
 
diff --git a/src/genius.c b/src/genius.c
index d92d28d..baac449 100644
--- a/src/genius.c
+++ b/src/genius.c
@@ -230,7 +230,7 @@ gel_ask_string (const char *query, const char *def)
 }
 
 int
-gel_ask_buttons (const char *query, GSList *buttons)
+gel_ask_buttons (const char *query, GSList *buttonlist)
 {
 	int ret;
 	GSList *li;
@@ -240,7 +240,7 @@ gel_ask_buttons (const char *query, GSList *buttons)
 reread_buttons:
 	g_print ("\n%s\n", ve_sure_string (query));
 	i = 1;
-	for (li = buttons; li != NULL; li = li->next) {
+	for (li = buttonlist; li != NULL; li = li->next) {
 		g_print ("%d) %s\n", i, ve_sure_string ((char *)li->data));
 		i++;
 	}
diff --git a/src/gnome-genius.c b/src/gnome-genius.c
index f8ea6b5..7acc8df 100644
--- a/src/gnome-genius.c
+++ b/src/gnome-genius.c
@@ -735,7 +735,7 @@ dialog_entry_activate (GtkWidget *e, gpointer data)
 }
 
 int
-gel_ask_buttons (const char *query, GSList *buttons)
+gel_ask_buttons (const char *query, GSList *buttonlist)
 {
 	GtkWidget *d;
 	GtkWidget *box;
@@ -750,7 +750,7 @@ gel_ask_buttons (const char *query, GSList *buttons)
 		 NULL);
 
 	i = 1;
-	for (li = buttons; li != NULL; li = li->next) {
+	for (li = buttonlist; li != NULL; li = li->next) {
 		gtk_dialog_add_button (GTK_DIALOG (d),
 				       ve_sure_string (li->data),
 				       i);