Cleaning up the name space and making it clear where we are. Now we have an object

1 files changed, 15 insertions, 18 deletions

diff --git a/libdbusmenu-gtk/menu.h b/libdbusmenu-gtk/menu.h
index 783737a..6d9c6ff 100644
--- a/libdbusmenu-gtk/menu.h
+++ b/libdbusmenu-gtk/menu.h
@@ -1,32 +1,29 @@
-#ifndef __MENU_H__
-#define __MENU_H__
+#ifndef __DBUSMENU_GTKMENU_H__
+#define __DBUSMENU_GTKMENU_H__
 
 #include <glib.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS
 
-#define MENU_TYPE            (menu_get_type ())
-#define MENU(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MENU_TYPE, Menu))
-#define MENU_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), MENU_TYPE, MenuClass))
-#define IS_MENU(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MENU_TYPE))
-#define IS_MENU_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MENU_TYPE))
-#define MENU_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), MENU_TYPE, MenuClass))
+#define DBUSMENU_GTKMENU_TYPE            (dbusmenu_gtkmenu_get_type ())
+#define DBUSMENU_GTKMENU(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), DBUSMENU_GTKMENU_TYPE, DbusmenuGtkMenu))
+#define DBUSMENU_GTKMENU_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), DBUSMENU_GTKMENU_TYPE, DbusmenuGtkMenuClass))
+#define DBUSMENU_IS_GTKMENU(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DBUSMENU_GTKMENU_TYPE))
+#define DBUSMENU_IS_GTKMENU_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUSMENU_GTKMENU_TYPE))
+#define DBUSMENU_GTKMENU_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_GTKMENU_TYPE, DbusmenuGtkMenuClass))
 
-typedef struct _Menu      Menu;
-typedef struct _MenuClass MenuClass;
-
-struct _MenuClass
-{
-GtkMenuClass parent_class;
+typedef struct _DbusmenuGtkMenuClass DbusmenuGtkMenuClass;
+struct _DbusmenuGtkMenuClass {
+	GtkMenuClass parent_class;
 };
 
-struct _Menu
-{
-GtkMenu parent;
+typedef struct _DbusmenuGtkMenu      DbusmenuGtkMenu;
+struct _DbusmenuGtkMenu {
+	GtkMenu parent;
 };
 
-GType menu_get_type (void);
+GType dbusmenu_gtkmenu_get_type (void);
 
 G_END_DECLS