patch for MENU_ITEM_OVERRIDDEN vs MENU_ITEM_REINSTATED

[John Sullivan <sullivan eazel com>]

I ran into a problem where bonobo_ui_handler's signal for
MENU_ITEM_REINSTATED wasn't defined. Further investigation revealed that
MENU_ITEM_OVERRIDDEN and MENU_ITEM_REINSTATED were mixed together in
such a way that neither was defined correctly. Here's a simple patch for
that. Should I go ahead and check it in?

John

ChangeLog entry:

    *bonobo/bonobo-ui-handler.h:
     Corrected spelling of signal function pointer from
     "menu_item_overriden" to "menu_item_overridden"

    *bonobo/bonobo-ui-handler.c:
     Fixed problem where "menu_item_reinstated" function pointer
     was wired to MENU_ITEM_OVERRIDDEN signal, and
     MENU_ITEM_REINSTATED signal wasn't wired to anything.


Index: bonobo/bonobo-ui-handler.c
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-ui-handler.c,v
retrieving revision 1.54
diff -u -r1.54 bonobo-ui-handler.c
--- bonobo/bonobo-ui-handler.c 2000/02/16 10:27:55 1.54
+++ bonobo/bonobo-ui-handler.c 2000/03/02 00:03:23
@@ -133,6 +133,17 @@
     GTK_TYPE_POINTER);

  bonobo_ui_handler_signals [MENU_ITEM_OVERRIDDEN] =
+  gtk_signal_new ("menu_item_overridden",
+    GTK_RUN_LAST,
+    object_class->type,
+    GTK_SIGNAL_OFFSET (BonoboUIHandlerClass, menu_item_overridden),
+    gtk_marshal_NONE__POINTER_POINTER_POINTER,
+    GTK_TYPE_NONE, 3,
+    GTK_TYPE_POINTER,
+    GTK_TYPE_POINTER,
+    GTK_TYPE_POINTER);
+
+ bonobo_ui_handler_signals [MENU_ITEM_REINSTATED] =
   gtk_signal_new ("menu_item_reinstated",
     GTK_RUN_LAST,
     object_class->type,
@@ -166,6 +177,17 @@
     GTK_TYPE_POINTER);

  bonobo_ui_handler_signals [TOOLBAR_ITEM_OVERRIDDEN] =
+  gtk_signal_new ("toolbar_item_overridden",
+    GTK_RUN_LAST,
+    object_class->type,
+    GTK_SIGNAL_OFFSET (BonoboUIHandlerClass, toolbar_item_overridden),
+    gtk_marshal_NONE__POINTER_POINTER_POINTER,
+    GTK_TYPE_NONE, 3,
+    GTK_TYPE_POINTER,
+    GTK_TYPE_POINTER,
+    GTK_TYPE_POINTER);
+
+ bonobo_ui_handler_signals [TOOLBAR_ITEM_REINSTATED] =
   gtk_signal_new ("toolbar_item_reinstated",
     GTK_RUN_LAST,
     object_class->type,
Index: bonobo/bonobo-ui-handler.h
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-ui-handler.h,v
retrieving revision 1.35
diff -u -r1.35 bonobo-ui-handler.h
--- bonobo/bonobo-ui-handler.h 2000/02/16 10:27:55 1.35
+++ bonobo/bonobo-ui-handler.h 2000/03/02 00:03:23
@@ -82,12 +82,12 @@
   */
  void (*menu_item_activated) (BonoboUIHandler *uih, char *path, void
*item_data);
  void (*menu_item_removed) (BonoboUIHandler *uih, char *path, void
*item_data);
- void (*menu_item_overriden) (BonoboUIHandler *uih, char *path, void
*item_data);
+ void (*menu_item_overridden) (BonoboUIHandler *uih, char *path, void
*item_data);
  void (*menu_item_reinstated) (BonoboUIHandler *uih, char *path, void
*item_data);

  void (*toolbar_item_activated) (BonoboUIHandler *uih, char *path, void
*item_data);
  void (*toolbar_item_removed) (BonoboUIHandler *uih, char *path, void
*item_data);
- void (*toolbar_item_overriden) (BonoboUIHandler *uih, char *path, void
*item_data);
+ void (*toolbar_item_overridden) (BonoboUIHandler *uih, char *path,
void *item_data);
  void (*toolbar_item_reinstated) (BonoboUIHandler *uih, char *path,
void *item_data);
 } BonoboUIHandlerClass;