diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2010-11-17 15:35:34 -0500 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2010-11-17 15:35:34 -0500 |
| commit | ca1881e6cf5180215a3222f95b387c48f265184c (patch) | |
| tree | 2075e0d9976ea51c39964137ef5dfca5c2e6e3d0 /libdbusmenu-glib/menuitem.c | |
| parent | b353628b2659d06ad6e356cfbf017aa96cb4697e (diff) | |
| parent | 395db9878504b28778b246ea658be5287e758e1f (diff) | |
| download | libdbusmenu-ca1881e6cf5180215a3222f95b387c48f265184c.tar.gz libdbusmenu-ca1881e6cf5180215a3222f95b387c48f265184c.tar.bz2 libdbusmenu-ca1881e6cf5180215a3222f95b387c48f265184c.zip | |
* New upstream release.
* Breaking ABI and getting reserved back
* Adding build support for GTK2/3 builds
* Only force a flush of top level items, allow others to be
based on the count.
* debian/control, debian/libdbusmenu-glib2.install,
debian/libdbusmenu-gtk2.install: Switching package names to
match .so bump.
Diffstat (limited to 'libdbusmenu-glib/menuitem.c')
| -rw-r--r-- | libdbusmenu-glib/menuitem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index ef037d1..73b765b 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -52,7 +52,6 @@ License version 3 and version 2.1 along with this program. If not, see out of data that we have. They can still be gotten using accessor functions, but are protected appropriately. */ -typedef struct _DbusmenuMenuitemPrivate DbusmenuMenuitemPrivate; struct _DbusmenuMenuitemPrivate { gint id; @@ -84,8 +83,7 @@ enum { #define PROP_ID_S "id" -#define DBUSMENU_MENUITEM_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_TYPE_MENUITEM, DbusmenuMenuitemPrivate)) +#define DBUSMENU_MENUITEM_GET_PRIVATE(o) (DBUSMENU_MENUITEM(o)->priv) /* Prototypes */ static void dbusmenu_menuitem_class_init (DbusmenuMenuitemClass *klass); @@ -290,6 +288,8 @@ _g_value_free (gpointer data) static void dbusmenu_menuitem_init (DbusmenuMenuitem *self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), DBUSMENU_TYPE_MENUITEM, DbusmenuMenuitemPrivate); + DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(self); priv->id = -1; |