]> Pileus Git - ~andy/gtk/commitdiff
a11y: Implement get_name() instead of setting variables
authorBenjamin Otte <otte@redhat.com>
Sun, 13 Jan 2013 17:50:16 +0000 (18:50 +0100)
committerBenjamin Otte <otte@redhat.com>
Sun, 13 Jan 2013 23:01:44 +0000 (00:01 +0100)
This avoids a later free of this const value.

gtk/a11y/gtktoplevelaccessible.c

index 14a2a19694f5f82e41be5cf747040b192b93777f..56d51836f28a7c958ad65e619e4d521e5653e17f 100644 (file)
@@ -44,7 +44,6 @@ gtk_toplevel_accessible_initialize (AtkObject *accessible,
   ATK_OBJECT_CLASS (gtk_toplevel_accessible_parent_class)->initialize (accessible, data);
 
   accessible->role = ATK_ROLE_APPLICATION;
-  accessible->name = g_get_prgname ();
   accessible->accessible_parent = NULL;
 }
 
@@ -87,6 +86,12 @@ gtk_toplevel_accessible_ref_child (AtkObject *obj,
   return atk_obj;
 }
 
+static const char *
+gtk_toplevel_accessible_get_name (AtkObject *obj)
+{
+  return g_get_prgname ();
+}
+
 static gboolean
 is_combo_window (GtkWidget *widget)
 {
@@ -143,6 +148,7 @@ gtk_toplevel_accessible_class_init (GtkToplevelAccessibleClass *klass)
   class->get_n_children = gtk_toplevel_accessible_get_n_children;
   class->ref_child = gtk_toplevel_accessible_ref_child;
   class->get_parent = NULL;
+  class->get_name = gtk_toplevel_accessible_get_name;
 
   g_object_class->finalize = gtk_toplevel_accessible_object_finalize;