]> Pileus Git - ~andy/gtk/commitdiff
GtkArrowAccessible: add a private struct
authorMatthias Clasen <mclasen@redhat.com>
Sun, 14 Oct 2012 06:39:32 +0000 (02:39 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Sun, 14 Oct 2012 06:39:32 +0000 (02:39 -0400)
Move instance fields to a private struct, in preparation
for installing a11y headers.

gtk/a11y/gtkarrowaccessible.c
gtk/a11y/gtkarrowaccessible.h

index 7368be78aa8d24223f0b36b9077960f2d6d3d935..9950158a6ae024b9b2c21933f8030e4ef44f518a 100644 (file)
 #include <gtk/gtk.h>
 #include "gtkarrowaccessible.h"
 
+struct _GtkArrowAccessiblePrivate
+{
+  gchar *image_description;
+};
 
 static void atk_image_interface_init (AtkImageIface  *iface);
 
@@ -40,7 +44,7 @@ gtk_arrow_accessible_finalize (GObject *object)
 {
   GtkArrowAccessible *arrow = GTK_ARROW_ACCESSIBLE (object);
 
-  g_free (arrow->image_description);
+  g_free (arrow->priv->image_description);
 
   G_OBJECT_CLASS (_gtk_arrow_accessible_parent_class)->finalize (object);
 }
@@ -54,12 +58,16 @@ _gtk_arrow_accessible_class_init (GtkArrowAccessibleClass *klass)
   atk_object_class->initialize = gtk_arrow_accessible_initialize;
 
   gobject_class->finalize = gtk_arrow_accessible_finalize;
+
+  g_type_class_add_private (klass, sizeof (GtkArrowAccessiblePrivate));
 }
 
 static void
 _gtk_arrow_accessible_init (GtkArrowAccessible *arrow)
 {
-  arrow->image_description = NULL;
+  arrow->priv = G_TYPE_INSTANCE_GET_PRIVATE (arrow,
+                                             GTK_TYPE_ARROW_ACCESSIBLE,
+                                             GtkArrowAccessiblePrivate);
 }
 
 static const gchar *
@@ -67,7 +75,7 @@ gtk_arrow_accessible_get_image_description (AtkImage *obj)
 {
   GtkArrowAccessible *arrow = GTK_ARROW_ACCESSIBLE (obj);
 
-  return arrow->image_description;
+  return arrow->priv->image_description;
 }
 
 static gboolean
@@ -76,8 +84,8 @@ gtk_arrow_accessible_set_image_description (AtkImage    *obj,
 {
   GtkArrowAccessible *arrow = GTK_ARROW_ACCESSIBLE (obj);
 
-  g_free (arrow->image_description);
-  arrow->image_description = g_strdup (description);
+  g_free (arrow->priv->image_description);
+  arrow->priv->image_description = g_strdup (description);
 
   return TRUE;
 
index 84d7f10a88e32e4e5e830a1fbc7ea1c1b3320cc2..492a473a8a63f2a30b930aaf00702630524bf4fd 100644 (file)
@@ -29,13 +29,15 @@ G_BEGIN_DECLS
 #define GTK_IS_ARROW_ACCESSIBLE_CLASS(klass)           (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ARROW_ACCESSIBLE))
 #define GTK_ARROW_ACCESSIBLE_GET_CLASS(obj)            (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ARROW_ACCESSIBLE, GtkArrowAccessibleClass))
 
-typedef struct _GtkArrowAccessible      GtkArrowAccessible;
-typedef struct _GtkArrowAccessibleClass GtkArrowAccessibleClass;
+typedef struct _GtkArrowAccessible        GtkArrowAccessible;
+typedef struct _GtkArrowAccessibleClass   GtkArrowAccessibleClass;
+typedef struct _GtkArrowAccessiblePrivate GtkArrowAccessiblePrivate;
 
 struct _GtkArrowAccessible
 {
   GtkWidgetAccessible parent;
 
+  GtkArrowAccessiblePrivate *priv;
   gchar *image_description;
 };