2006-11-02 Hollis Blanchard <hollis@penguinppc.org>

	* kern/ieee1275/ieee1275.c (grub_ieee1275_set_color): Add
	`catch_result' to struct set_color_args.

diff --git a/ChangeLog b/ChangeLog
index e3a62d94240d65d60549a5b81ff6ac6550a8d90a..de5532c29594c1c9e02955ad7605f54808c05081 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-02  Hollis Blanchard  <hollis@penguinppc.org>
+
+       * kern/ieee1275/ieee1275.c (grub_ieee1275_set_color): Add
+       `catch_result' to struct set_color_args.
+
 2006-10-28  Yoshinori K. Okuji  <okuji@enbug.org>
 
        * normal/menu.c: Include grub/script.h.

diff --git a/kern/ieee1275/ieee1275.c b/kern/ieee1275/ieee1275.c
index 913212271a05f7ea9d034c5fef6acf19aaac21e3..168ecfe393cb86f57b165338e85816305e47ff7b 100644 (file)
--- a/kern/ieee1275/ieee1275.c
+++ b/kern/ieee1275/ieee1275.c
@@ -553,10 +553,11 @@ grub_ieee1275_set_color (grub_ieee1275_ihandle_t ihandle,
     grub_ieee1275_cell_t b;
     grub_ieee1275_cell_t g;
     grub_ieee1275_cell_t r;
+    grub_ieee1275_cell_t catch_result;
   }
   args;
 
-  INIT_IEEE1275_COMMON (&args.common, "call-method", 6, 0);
+  INIT_IEEE1275_COMMON (&args.common, "call-method", 6, 1);
   args.method = "color!";
   args.ihandle = ihandle;
   args.index = index;
@@ -566,7 +567,7 @@ grub_ieee1275_set_color (grub_ieee1275_ihandle_t ihandle,
 
   if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
     return -1;
-  return 0;
+  return args.catch_result;
 }
 
 int