diff options
| author | Ted Gould <ted@gould.cx> | 2010-10-12 16:29:26 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-10-12 16:29:26 -0500 |
| commit | f8d472db4415096f7a5e99e14aa3b1af290d2098 (patch) | |
| tree | a09dae9ff2abd717c6900534120dfbe8b9ae9630 | |
| parent | 149033eb701b43a0b830f86ec96dcd5dfe77d5e8 (diff) | |
| download | libdbusmenu-f8d472db4415096f7a5e99e14aa3b1af290d2098.tar.gz libdbusmenu-f8d472db4415096f7a5e99e14aa3b1af290d2098.tar.bz2 libdbusmenu-f8d472db4415096f7a5e99e14aa3b1af290d2098.zip | |
Switching to using the pointer in the instance
| -rw-r--r-- | libdbusmenu-gtk/client.c | 5 | ||||
| -rw-r--r-- | libdbusmenu-gtk/menu.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 7de93e1..487971f 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -41,8 +41,7 @@ struct _DbusmenuGtkClientPrivate { GtkAccelGroup * agroup; }; -#define DBUSMENU_GTKCLIENT_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_GTKCLIENT_TYPE, DbusmenuGtkClientPrivate)) +#define DBUSMENU_GTKCLIENT_GET_PRIVATE(o) (DBUSMENU_GTKCLIENT(o)->priv) /* Prototypes */ static void dbusmenu_gtkclient_class_init (DbusmenuGtkClientClass *klass); @@ -84,6 +83,8 @@ dbusmenu_gtkclient_class_init (DbusmenuGtkClientClass *klass) static void dbusmenu_gtkclient_init (DbusmenuGtkClient *self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), DBUSMENU_GTKCLIENT_TYPE, DbusmenuGtkClientPrivate); + DbusmenuGtkClientPrivate * priv = DBUSMENU_GTKCLIENT_GET_PRIVATE(self); priv->agroup = NULL; diff --git a/libdbusmenu-gtk/menu.c b/libdbusmenu-gtk/menu.c index 14dcb89..ace8e8a 100644 --- a/libdbusmenu-gtk/menu.c +++ b/libdbusmenu-gtk/menu.c @@ -51,8 +51,7 @@ struct _DbusmenuGtkMenuPrivate { gchar * dbus_name; }; -#define DBUSMENU_GTKMENU_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_GTKMENU_TYPE, DbusmenuGtkMenuPrivate)) +#define DBUSMENU_GTKMENU_GET_PRIVATE(o) (DBUSMENU_GTKMENU(o)->priv) /* Prototypes */ static void dbusmenu_gtkmenu_class_init (DbusmenuGtkMenuClass *klass); @@ -109,6 +108,8 @@ menu_focus_cb(DbusmenuGtkMenu * menu, gpointer userdata) static void dbusmenu_gtkmenu_init (DbusmenuGtkMenu *self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), DBUSMENU_GTKMENU_TYPE, DbusmenuGtkMenuPrivate); + DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(self); priv->client = NULL; |