aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-glib/menuitem.c
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-11-11 11:24:45 -0600
committerTed Gould <ted@gould.cx>2010-11-11 11:24:45 -0600
commitf0c24c976f319d0b087adc0c8bc694cf930aa30b (patch)
treecc1d6a425b2d5c8c5625d010cb027953d6289751 /libdbusmenu-glib/menuitem.c
parent9e1c8319da6ac98bd36b73c4d46d7b655778ed9d (diff)
parentb3768eaec11202758801a3dd0f94a2ab315f4a0d (diff)
downloadlibdbusmenu-f0c24c976f319d0b087adc0c8bc694cf930aa30b.tar.gz
libdbusmenu-f0c24c976f319d0b087adc0c8bc694cf930aa30b.tar.bz2
libdbusmenu-f0c24c976f319d0b087adc0c8bc694cf930aa30b.zip
Import upstream version 0.3.90
Diffstat (limited to 'libdbusmenu-glib/menuitem.c')
-rw-r--r--libdbusmenu-glib/menuitem.c6
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;