aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-gtk/menu.h
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-10-13 12:42:25 -0500
committerTed Gould <ted@gould.cx>2010-10-13 12:42:25 -0500
commitd01dcd794d4195c6e3eb20f6bb055fc647661dc2 (patch)
tree81fc685280c823a7f4e2ad6e55523b35a034b0b9 /libdbusmenu-gtk/menu.h
parent46a59a2613d8fc1cab048c3b8af579f7867f9b8a (diff)
parentde67e00eb07dbd06b6c53798653a690bb9b5fe85 (diff)
downloadlibdbusmenu-d01dcd794d4195c6e3eb20f6bb055fc647661dc2.tar.gz
libdbusmenu-d01dcd794d4195c6e3eb20f6bb055fc647661dc2.tar.bz2
libdbusmenu-d01dcd794d4195c6e3eb20f6bb055fc647661dc2.zip
* Upstream Merge
* Breaking ABI and getting reserved back
Diffstat (limited to 'libdbusmenu-gtk/menu.h')
-rw-r--r--libdbusmenu-gtk/menu.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/libdbusmenu-gtk/menu.h b/libdbusmenu-gtk/menu.h
index 5147d30..896e466 100644
--- a/libdbusmenu-gtk/menu.h
+++ b/libdbusmenu-gtk/menu.h
@@ -42,6 +42,8 @@ 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))
+typedef struct _DbusmenuGtkMenuPrivate DbusmenuGtkMenuPrivate;
+
/**
DbusmenuGtkMenuClass:
@parent_class: #GtkMenuClass
@@ -49,16 +51,20 @@ G_BEGIN_DECLS
@reserved2: Reserved for future use.
@reserved3: Reserved for future use.
@reserved4: Reserved for future use.
+ @reserved5: Reserved for future use.
+ @reserved6: Reserved for future use.
*/
typedef struct _DbusmenuGtkMenuClass DbusmenuGtkMenuClass;
struct _DbusmenuGtkMenuClass {
GtkMenuClass parent_class;
- /* Reserved */
+ /*< Private >*/
void (*reserved1) (void);
void (*reserved2) (void);
void (*reserved3) (void);
void (*reserved4) (void);
+ void (*reserved5) (void);
+ void (*reserved6) (void);
};
/**
@@ -68,6 +74,9 @@ struct _DbusmenuGtkMenuClass {
typedef struct _DbusmenuGtkMenu DbusmenuGtkMenu;
struct _DbusmenuGtkMenu {
GtkMenu parent;
+
+ /*< Private >*/
+ DbusmenuGtkMenuPrivate * priv;
};
GType dbusmenu_gtkmenu_get_type (void);