From e84ef2f86d5005d6b7c298be37fd25c527d1a6fe Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 19 May 2009 05:04:04 +0200 Subject: Switching over to some autogenerated menu files instead of our test ones. --- libdbusmenu-gtk/menu.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 libdbusmenu-gtk/menu.h (limited to 'libdbusmenu-gtk/menu.h') diff --git a/libdbusmenu-gtk/menu.h b/libdbusmenu-gtk/menu.h new file mode 100644 index 0000000..783737a --- /dev/null +++ b/libdbusmenu-gtk/menu.h @@ -0,0 +1,33 @@ +#ifndef __MENU_H__ +#define __MENU_H__ + +#include +#include + +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)) + +typedef struct _Menu Menu; +typedef struct _MenuClass MenuClass; + +struct _MenuClass +{ +GtkMenuClass parent_class; +}; + +struct _Menu +{ +GtkMenu parent; +}; + +GType menu_get_type (void); + +G_END_DECLS + +#endif -- cgit v1.2.3 From 3cd0f472e1e79d185681b87dced59559de9df4ff Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 20 May 2009 11:31:54 +0200 Subject: Cleaning up the name space and making it clear where we are. Now we have an object --- libdbusmenu-gtk/menu.h | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) (limited to 'libdbusmenu-gtk/menu.h') 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 #include 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 -- cgit v1.2.3 From 1df52c61f44b049b9e023a139a558b9e835ad5f7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 20 May 2009 12:11:32 +0200 Subject: A new function. Literally. --- libdbusmenu-gtk/menu.h | 1 + 1 file changed, 1 insertion(+) (limited to 'libdbusmenu-gtk/menu.h') diff --git a/libdbusmenu-gtk/menu.h b/libdbusmenu-gtk/menu.h index 6d9c6ff..96dcca2 100644 --- a/libdbusmenu-gtk/menu.h +++ b/libdbusmenu-gtk/menu.h @@ -24,6 +24,7 @@ struct _DbusmenuGtkMenu { }; GType dbusmenu_gtkmenu_get_type (void); +DbusmenuGtkMenu * dbusmenu_gtkmenu_new (gchar * dbus_name, gchar * dbus_object); G_END_DECLS -- cgit v1.2.3 From 039c05e5e8961e1eac265a7a073526a2257d6665 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 20 May 2009 12:17:25 +0200 Subject: Comments on the structures along with some reserved entries. --- libdbusmenu-gtk/menu.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'libdbusmenu-gtk/menu.h') diff --git a/libdbusmenu-gtk/menu.h b/libdbusmenu-gtk/menu.h index 96dcca2..34def17 100644 --- a/libdbusmenu-gtk/menu.h +++ b/libdbusmenu-gtk/menu.h @@ -13,11 +13,29 @@ G_BEGIN_DECLS #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)) +/** + DbusmenuGtkMenuClass: + @parent_class: #GtkMenuClass + @reserved1: Reserved for future use. + @reserved2: Reserved for future use. + @reserved3: Reserved for future use. + @reserved4: Reserved for future use. +*/ typedef struct _DbusmenuGtkMenuClass DbusmenuGtkMenuClass; struct _DbusmenuGtkMenuClass { GtkMenuClass parent_class; + + /* Reserved */ + void (*reserved1) (void); + void (*reserved2) (void); + void (*reserved3) (void); + void (*reserved4) (void); }; +/** + DbusmenuGtkMenu: + @parent: #GtkMenu +*/ typedef struct _DbusmenuGtkMenu DbusmenuGtkMenu; struct _DbusmenuGtkMenu { GtkMenu parent; -- cgit v1.2.3 From c5a17e6a710ffadb20cdd65a9f42a2a1299424a4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 20 May 2009 12:41:18 +0200 Subject: Adding in some section documentation describing the menu item --- libdbusmenu-gtk/menu.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'libdbusmenu-gtk/menu.h') diff --git a/libdbusmenu-gtk/menu.h b/libdbusmenu-gtk/menu.h index 34def17..dd5bdd1 100644 --- a/libdbusmenu-gtk/menu.h +++ b/libdbusmenu-gtk/menu.h @@ -44,6 +44,31 @@ struct _DbusmenuGtkMenu { GType dbusmenu_gtkmenu_get_type (void); DbusmenuGtkMenu * dbusmenu_gtkmenu_new (gchar * dbus_name, gchar * dbus_object); +/** + SECTION:gtkmenu + @short_description: A GTK Menu Object that syncronizes over DBus + @stability: Unstable + @include: libdbusmenu-gtk/menu.h + + In general, this is just a #GtkMenu, why else would you care? Oh, + because this menu is created by someone else on a server that exists + on the other side of DBus. You need a #DbusmenuServer to be able + push the data into this menu. + + The first thing you need to know is how to find that #DbusmenuServer + on DBus. This involves both the DBus name and the DBus object that + the menu interface can be found on. Those two value should be set + when creating the object using dbusmenu_gtkmenu_new(). They are then + stored on two properties #DbusmenuGtkMenu:dbus-name and #DbusmenuGtkMenu:dbus-object. + + After creation the #DbusmenuGtkMenu it will continue to keep in + synchronization with the #DbusmenuServer object across Dbus. If the + number of entries change, the menus change, if they change thier + properties change, they update in the items. All of this should + be handled transparently to the user of this object. + + TODO: Document properties. +*/ G_END_DECLS #endif -- cgit v1.2.3