only take one mask parameter, and implement EPopupItem->enable to do what

2004-10-06  Not Zed  <NotZed@Ximian.com>

        * e-popup.c (e_popup_create_menu): only take one mask parameter,
        and implement EPopupItem->enable to do what the other mask did.
        (ep_activate): if this is a toggle or radiobutton, set the active
        state on the item->type.
        (e_popup_create_menu): if a menu image starts with gtk-, then
        assume it is a gtk stock image instead.

svn path=/trunk/; revision=27485

1 files changed, 4 insertions, 4 deletions

diff --git a/e-util/e-popup.h b/e-util/e-popup.h
index 70729f211e..dca73d79b7 100644
--- a/e-util/e-popup.h
+++ b/e-util/e-popup.h
@@ -115,8 +115,8 @@ struct _EPopupItem {
 	EPopupActivateFunc activate;
 	void *user_data;	/* user data, not passed directly to @activate */
 	void *image;		/* char* for item type, GtkWidget * for image type */
-	guint32 visible;		/* visibility mask */
-	guint32 enable;		/* sensitivity mask, unimplemented */
+	guint32 visible;	/* visibility mask */
+	guint32 enable;		/* sensitivity mask */
 };
 
 /**
@@ -202,8 +202,8 @@ void e_popup_add_items(EPopup *, GSList *items, EPopupItemsFunc freefunc, void *
 
 void e_popup_add_static_items(EPopup *emp, EPopupTarget *target);
 /* do not call e_popup_create_menu, it can leak structures if not used right */
-struct _GtkMenu *e_popup_create_menu(EPopup *, EPopupTarget *, guint32 hide_mask, guint32 disable_mask);
-struct _GtkMenu *e_popup_create_menu_once(EPopup *emp, EPopupTarget *, guint32 hide_mask, guint32 disable_mask);
+struct _GtkMenu *e_popup_create_menu(EPopup *, EPopupTarget *, guint32 mask);
+struct _GtkMenu *e_popup_create_menu_once(EPopup *emp, EPopupTarget *, guint32 mask);
 
 void *e_popup_target_new(EPopup *, int type, size_t size);
 void e_popup_target_free(EPopup *, void *);