filechooser: Rename _gtk_file_is_path_not_local() to _gtk_file_has_native_path()

[~andy/gtk] / gtk / a11y / gtkarrowaccessible.c

diff --git a/gtk/a11y/gtkarrowaccessible.c b/gtk/a11y/gtkarrowaccessible.c
index cd97adf0917d4d6a3128a2c73aac22ba44463cd2..00f401ece115707d9fffab94f07f2dc20b09875c 100644 (file)
--- a/gtk/a11y/gtkarrowaccessible.c
+++ b/gtk/a11y/gtkarrowaccessible.c
@@ -1,4 +1,4 @@
-/* GAIL - The GNOME Accessibility Implementation Library
+/* GTK+ - accessibility implementations
  * Copyright 2001 Sun Microsystems Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -12,9 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -22,17 +20,21 @@
 #include <gtk/gtk.h>
 #include "gtkarrowaccessible.h"
 
+struct _GtkArrowAccessiblePrivate
+{
+  gchar *image_description;
+};
 
 static void atk_image_interface_init (AtkImageIface  *iface);
 
-G_DEFINE_TYPE_WITH_CODE (GtkArrowAccessible, _gtk_arrow_accessible, GTK_TYPE_WIDGET_ACCESSIBLE,
+G_DEFINE_TYPE_WITH_CODE (GtkArrowAccessible, gtk_arrow_accessible, GTK_TYPE_WIDGET_ACCESSIBLE,
                          G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init))
 
 static void
 gtk_arrow_accessible_initialize (AtkObject *accessible,
                                  gpointer   data)
 {
-  ATK_OBJECT_CLASS (_gtk_arrow_accessible_parent_class)->initialize (accessible, data);
+  ATK_OBJECT_CLASS (gtk_arrow_accessible_parent_class)->initialize (accessible, data);
 
   accessible->role = ATK_ROLE_ICON;
 }
@@ -42,13 +44,13 @@ 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);
+  G_OBJECT_CLASS (gtk_arrow_accessible_parent_class)->finalize (object);
 }
 
 static void
-_gtk_arrow_accessible_class_init (GtkArrowAccessibleClass *klass)
+gtk_arrow_accessible_class_init (GtkArrowAccessibleClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
@@ -56,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)
+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 *
@@ -69,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
@@ -78,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;