1 files changed, 27 insertions, 60 deletions
diff --git a/libnautilus-extension/nautilus-menu.h b/libnautilus-extension/nautilus-menu.h
index fd132be4e..efac9a0d1 100644
--- a/libnautilus-extension/nautilus-menu.h
+++ b/libnautilus-extension/nautilus-menu.h
@@ -26,80 +26,47 @@
 #define NAUTILUS_MENU_H
 
 #include <glib-object.h>
-#include "nautilus-extension-types.h"
 
+#if !defined (NAUTILUS_EXTENSION_H) && !defined (NAUTILUS_COMPILATION)
+#warning "Only <nautilus-extension.h> should be included directly."
+#endif
 
 G_BEGIN_DECLS
 
-/* NautilusMenu defines */
-#define NAUTILUS_TYPE_MENU         (nautilus_menu_get_type ())
-#define NAUTILUS_MENU(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_MENU, NautilusMenu))
-#define NAUTILUS_MENU_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), NAUTILUS_TYPE_MENU, NautilusMenuClass))
-#define NAUTILUS_IS_MENU(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), NAUTILUS_TYPE_MENU))
-#define NAUTILUS_IS_MENU_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), NAUTILUS_TYPE_MENU))
-#define NAUTILUS_MENU_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NAUTILUS_TYPE_MENU, NautilusMenuClass))
-/* NautilusMenuItem defines */
-#define NAUTILUS_TYPE_MENU_ITEM            (nautilus_menu_item_get_type())
-#define NAUTILUS_MENU_ITEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_MENU_ITEM, NautilusMenuItem))
-#define NAUTILUS_MENU_ITEM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_MENU_ITEM, NautilusMenuItemClass))
-#define NAUTILUS_MENU_IS_ITEM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_MENU_ITEM))
-#define NAUTILUS_MENU_IS_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_MENU_ITEM))
-#define NAUTILUS_MENU_ITEM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), NAUTILUS_TYPE_MENU_ITEM, NautilusMenuItemClass))
-
-
-/* NautilusMenu types */
-typedef struct _NautilusMenu		NautilusMenu;
-typedef struct _NautilusMenuPrivate	NautilusMenuPrivate;
-typedef struct _NautilusMenuClass	NautilusMenuClass;
-/* NautilusMenuItem types */
-typedef struct _NautilusMenuItem        NautilusMenuItem;
-typedef struct _NautilusMenuItemDetails NautilusMenuItemDetails;
-typedef struct _NautilusMenuItemClass   NautilusMenuItemClass;
-
-
-/* NautilusMenu structs */
-struct _NautilusMenu {
-	GObject parent;
-	NautilusMenuPrivate *priv;
-};
+#define NAUTILUS_TYPE_MENU (nautilus_menu_get_type ())
+#define NAUTILUS_TYPE_MENU_ITEM (nautilus_menu_item_get_type ())
 
-struct _NautilusMenuClass {
-	GObjectClass parent_class;
-};
+G_DECLARE_FINAL_TYPE     (NautilusMenu, nautilus_menu,
+                          NAUTILUS, MENU,
+                          GObject)
+G_DECLARE_DERIVABLE_TYPE (NautilusMenuItem, nautilus_menu_item,
+                          NAUTILUS, MENU_ITEM,
+                          GObject)
 
-/* NautilusMenuItem structs */
-struct _NautilusMenuItem {
-	GObject parent;
+struct _NautilusMenuItemClass
+{
+    GObjectClass parent;
 
-	NautilusMenuItemDetails *details;
+    void (*activate) (NautilusMenuItem *item);
 };
 
-struct _NautilusMenuItemClass {
-	GObjectClass parent;
-
-	void (*activate) (NautilusMenuItem *item);
-};
+NautilusMenu     *nautilus_menu_new              (void);
 
+void              nautilus_menu_append_item      (NautilusMenu     *menu,
+                                                  NautilusMenuItem *item);
+GList            *nautilus_menu_get_items        (NautilusMenu     *menu);
+void              nautilus_menu_item_list_free   (GList            *item_list);
 
-/* NautilusMenu methods */
-GType		nautilus_menu_get_type	(void);
-NautilusMenu *	nautilus_menu_new	(void);
 
-void	nautilus_menu_append_item	(NautilusMenu      *menu,
-					 NautilusMenuItem  *item);
-GList*	nautilus_menu_get_items		(NautilusMenu *menu);
-void	nautilus_menu_item_list_free	(GList *item_list);
+NautilusMenuItem *nautilus_menu_item_new         (const char       *name,
+                                                  const char       *label,
+                                                  const char       *tip,
+                                                  const char       *icon);
 
-/* NautilusMenuItem methods */
-GType             nautilus_menu_item_get_type      (void);
-NautilusMenuItem *nautilus_menu_item_new           (const char       *name,
-						    const char       *label,
-						    const char       *tip,
-						    const char       *icon);
+void              nautilus_menu_item_activate    (NautilusMenuItem *item);
+void              nautilus_menu_item_set_submenu (NautilusMenuItem *item,
+                                                  NautilusMenu     *menu);
 
-void              nautilus_menu_item_activate      (NautilusMenuItem *item);
-void              nautilus_menu_item_set_submenu   (NautilusMenuItem *item,
-						    NautilusMenu     *menu);
 /* NautilusMenuItem has the following properties:
  *   name (string)        - the identifier for the menu item
  *   label (string)       - the user-visible label of the menu item