[gnome-photos] view-container: Make it accessible by setting AtkObject:name

[Debarshi Ray <debarshir src gnome org>]

commit 80cfa647147f52457c01c1199897fe6155f8d9ea
Author: Debarshi Ray <debarshir gnome org>
Date:   Tue Mar 18 13:04:09 2014 +0100

    view-container: Make it accessible by setting AtkObject:name
    
    Based on code written by Pranav Kant.
    
    Fixes: https://bugzilla.gnome.org/725156

 src/photos-embed.c          |   18 ++++++++-----
 src/photos-view-container.c |   54 ++++++++++++++++++++++++++++++++++++++++--
 src/photos-view-container.h |    4 ++-
 3 files changed, 65 insertions(+), 11 deletions(-)
---
diff --git a/src/photos-embed.c b/src/photos-embed.c
index a4b141d..bf595d3 100644
--- a/src/photos-embed.c
+++ b/src/photos-embed.c
@@ -684,6 +684,7 @@ photos_embed_init (PhotosEmbed *self)
   PhotosSearchbar *searchbar;
   PhotosSearchContextState *state;
   gboolean querying;
+  const gchar *name;
 
   self->priv = photos_embed_get_instance_private (self);
   priv = self->priv;
@@ -718,25 +719,28 @@ photos_embed_init (PhotosEmbed *self)
   priv->ntfctn_mngr = g_object_ref_sink (photos_notification_manager_dup_singleton ());
   gtk_overlay_add_overlay (GTK_OVERLAY (priv->stack_overlay), priv->ntfctn_mngr);
 
-  priv->overview = photos_view_container_new (PHOTOS_WINDOW_MODE_OVERVIEW);
-  gtk_stack_add_titled (GTK_STACK (priv->stack), priv->overview, "overview", _("Recent"));
+  priv->overview = photos_view_container_new (PHOTOS_WINDOW_MODE_OVERVIEW, _("Recent"));
+  name = photos_view_container_get_name (PHOTOS_VIEW_CONTAINER (priv->overview));
+  gtk_stack_add_titled (GTK_STACK (priv->stack), priv->overview, "overview", name);
   model = photos_view_container_get_model (PHOTOS_VIEW_CONTAINER (priv->overview));
   g_signal_connect_swapped (model, "row-inserted", G_CALLBACK (photos_embed_row_changed), self);
   g_signal_connect_swapped (model, "row-deleted", G_CALLBACK (photos_embed_row_changed), self);
 
-  priv->collections = photos_view_container_new (PHOTOS_WINDOW_MODE_COLLECTIONS);
-  gtk_stack_add_titled (GTK_STACK (priv->stack), priv->collections, "collections", _("Albums"));
+  priv->collections = photos_view_container_new (PHOTOS_WINDOW_MODE_COLLECTIONS, _("Albums"));
+  name = photos_view_container_get_name (PHOTOS_VIEW_CONTAINER (priv->collections));
+  gtk_stack_add_titled (GTK_STACK (priv->stack), priv->collections, "collections", name);
   model = photos_view_container_get_model (PHOTOS_VIEW_CONTAINER (priv->collections));
   g_signal_connect_swapped (model, "row-inserted", G_CALLBACK (photos_embed_row_changed), self);
   g_signal_connect_swapped (model, "row-deleted", G_CALLBACK (photos_embed_row_changed), self);
 
-  priv->favorites = photos_view_container_new (PHOTOS_WINDOW_MODE_FAVORITES);
-  gtk_stack_add_titled (GTK_STACK (priv->stack), priv->favorites, "favorites", _("Favorites"));
+  priv->favorites = photos_view_container_new (PHOTOS_WINDOW_MODE_FAVORITES, _("Favorites"));
+  name = photos_view_container_get_name (PHOTOS_VIEW_CONTAINER (priv->favorites));
+  gtk_stack_add_titled (GTK_STACK (priv->stack), priv->favorites, "favorites", name);
   model = photos_view_container_get_model (PHOTOS_VIEW_CONTAINER (priv->favorites));
   g_signal_connect_swapped (model, "row-inserted", G_CALLBACK (photos_embed_row_changed), self);
   g_signal_connect_swapped (model, "row-deleted", G_CALLBACK (photos_embed_row_changed), self);
 
-  priv->search = photos_view_container_new (PHOTOS_WINDOW_MODE_SEARCH);
+  priv->search = photos_view_container_new (PHOTOS_WINDOW_MODE_SEARCH, _("Search"));
   gtk_stack_add_named (GTK_STACK (priv->stack), priv->search, "search");
   model = photos_view_container_get_model (PHOTOS_VIEW_CONTAINER (priv->search));
   g_signal_connect_swapped (model, "row-inserted", G_CALLBACK (photos_embed_row_changed), self);
diff --git a/src/photos-view-container.c b/src/photos-view-container.c
index 058fef8..b0277ff 100644
--- a/src/photos-view-container.c
+++ b/src/photos-view-container.c
@@ -62,12 +62,14 @@ struct _PhotosViewContainerPrivate
   PhotosTrackerController *trk_cntrlr;
   PhotosWindowMode mode;
   gboolean disposed;
+  gchar *name;
 };
 
 enum
 {
   PROP_0,
-  PROP_MODE
+  PROP_MODE,
+  PROP_NAME
 };
 
 
@@ -281,6 +283,7 @@ photos_view_container_constructed (GObject *object)
 {
   PhotosViewContainer *self = PHOTOS_VIEW_CONTAINER (object);
   PhotosViewContainerPrivate *priv = self->priv;
+  AtkObject *accessible;
   GAction *action;
   GApplication *app;
   GtkWidget *generic_view;
@@ -290,6 +293,10 @@ photos_view_container_constructed (GObject *object)
 
   G_OBJECT_CLASS (photos_view_container_parent_class)->constructed (object);
 
+  accessible = gtk_widget_get_accessible (GTK_WIDGET (self));
+  if (accessible != NULL)
+    atk_object_set_name (accessible, priv->name);
+
   priv->model = photos_view_model_new (priv->mode);
 
   grid = gtk_grid_new ();
@@ -432,20 +439,44 @@ photos_view_container_finalize (GObject *object)
   PhotosViewContainerPrivate *priv = self->priv;
 
   g_clear_pointer (&priv->current_path, (GDestroyNotify) gtk_tree_path_free);
+  g_free (priv->name);
 
   G_OBJECT_CLASS (photos_view_container_parent_class)->finalize (object);
 }
 
 
 static void
+photos_view_container_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+  PhotosViewContainer *self = PHOTOS_VIEW_CONTAINER (object);
+
+  switch (prop_id)
+    {
+    case PROP_NAME:
+      g_value_set_string (value, self->priv->name);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+
+static void
 photos_view_container_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
   PhotosViewContainer *self = PHOTOS_VIEW_CONTAINER (object);
+  PhotosViewContainerPrivate *priv = self->priv;
 
   switch (prop_id)
     {
     case PROP_MODE:
-      self->priv->mode = (PhotosWindowMode) g_value_get_enum (value);
+      priv->mode = (PhotosWindowMode) g_value_get_enum (value);
+      break;
+
+    case PROP_NAME:
+      priv->name = g_value_dup_string (value);
       break;
 
     default:
@@ -470,6 +501,7 @@ photos_view_container_class_init (PhotosViewContainerClass *class)
   object_class->constructed = photos_view_container_constructed;
   object_class->dispose = photos_view_container_dispose;
   object_class->finalize = photos_view_container_finalize;
+  object_class->get_property = photos_view_container_get_property;
   object_class->set_property = photos_view_container_set_property;
 
   g_object_class_install_property (object_class,
@@ -480,15 +512,24 @@ photos_view_container_class_init (PhotosViewContainerClass *class)
                                                       PHOTOS_TYPE_WINDOW_MODE,
                                                       PHOTOS_WINDOW_MODE_NONE,
                                                       G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_NAME,
+                                   g_param_spec_string ("name",
+                                                        "Title",
+                                                        "The string used to identify this view",
+                                                        NULL,
+                                                        G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
 }
 
 
 GtkWidget *
-photos_view_container_new (PhotosWindowMode mode)
+photos_view_container_new (PhotosWindowMode mode, const gchar *name)
 {
   return g_object_new (PHOTOS_TYPE_VIEW_CONTAINER,
                        "homogeneous", TRUE,
                        "mode", mode,
+                       "name", name,
                        "transition-type", GTK_STACK_TRANSITION_TYPE_CROSSFADE,
                        NULL);
 }
@@ -506,3 +547,10 @@ photos_view_container_get_model (PhotosViewContainer *self)
 {
   return self->priv->model;
 }
+
+
+const gchar *
+photos_view_container_get_name (PhotosViewContainer *self)
+{
+  return self->priv->name;
+}
diff --git a/src/photos-view-container.h b/src/photos-view-container.h
index b481e65..35bd183 100644
--- a/src/photos-view-container.h
+++ b/src/photos-view-container.h
@@ -70,12 +70,14 @@ struct _PhotosViewContainerClass
 
 GType                  photos_view_container_get_type               (void) G_GNUC_CONST;
 
-GtkWidget             *photos_view_container_new                    (PhotosWindowMode mode);
+GtkWidget             *photos_view_container_new                    (PhotosWindowMode mode, const gchar 
*name);
 
 GtkTreePath           *photos_view_container_get_current_path       (PhotosViewContainer *self);
 
 GtkListStore          *photos_view_container_get_model              (PhotosViewContainer *self);
 
+const gchar           *photos_view_container_get_name               (PhotosViewContainer *self);
+
 G_END_DECLS
 
 #endif /* PHOTOS_VIEW_CONTAINER_H */