[gnome-shell] Remove override of map/unmap

[Emmanuele Bassi <ebassi src gnome org>]

commit 5bc042ba6f83752b899039234220bbaec403f1b1
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Thu Feb 2 12:17:13 2012 +0000

    Remove override of map/unmap
    
    Clutter, since version 1.8, does The Right Thingâ inside the default
    implementation of ClutterActor::map and ClutterActor::unmap, even for
    non-container actors: it will iterate over the list of children and
    map, or unmap, each one of them, respectively.
    
    This means that the requirement to override map and unmap for composite
    actors to map and unmap the internal children has been dropped.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=669239

 src/st/st-entry.c      |   34 ----------------------------------
 src/st/st-label.c      |   22 ----------------------
 src/st/st-scroll-bar.c |   23 -----------------------
 3 files changed, 0 insertions(+), 79 deletions(-)
---
diff --git a/src/st/st-entry.c b/src/st/st-entry.c
index 28f1b1c..e267c70 100644
--- a/src/st/st-entry.c
+++ b/src/st/st-entry.c
@@ -548,38 +548,6 @@ st_entry_pick (ClutterActor       *actor,
 }
 
 static void
-st_entry_map (ClutterActor *actor)
-{
-  StEntryPrivate *priv = ST_ENTRY (actor)->priv;
-
-  CLUTTER_ACTOR_CLASS (st_entry_parent_class)->map (actor);
-
-  clutter_actor_map (priv->entry);
-
-  if (priv->primary_icon)
-    clutter_actor_map (priv->primary_icon);
-
-  if (priv->secondary_icon)
-    clutter_actor_map (priv->secondary_icon);
-}
-
-static void
-st_entry_unmap (ClutterActor *actor)
-{
-  StEntryPrivate *priv = ST_ENTRY (actor)->priv;
-
-  CLUTTER_ACTOR_CLASS (st_entry_parent_class)->unmap (actor);
-
-  clutter_actor_unmap (priv->entry);
-
-  if (priv->primary_icon)
-    clutter_actor_unmap (priv->primary_icon);
-
-  if (priv->secondary_icon)
-    clutter_actor_unmap (priv->secondary_icon);
-}
-
-static void
 st_entry_clipboard_callback (StClipboard *clipboard,
                              const gchar *text,
                              gpointer     data)
@@ -694,8 +662,6 @@ st_entry_class_init (StEntryClass *klass)
   actor_class->allocate = st_entry_allocate;
   actor_class->paint = st_entry_paint;
   actor_class->pick = st_entry_pick;
-  actor_class->map = st_entry_map;
-  actor_class->unmap = st_entry_unmap;
 
   actor_class->key_press_event = st_entry_key_press_event;
   actor_class->key_focus_in = st_entry_key_focus_in;
diff --git a/src/st/st-label.c b/src/st/st-label.c
index 485c5b3..7cbb45d 100644
--- a/src/st/st-label.c
+++ b/src/st/st-label.c
@@ -254,26 +254,6 @@ st_label_paint (ClutterActor *actor)
 }
 
 static void
-st_label_map (ClutterActor *actor)
-{
-  StLabelPrivate *priv = ST_LABEL (actor)->priv;
-
-  CLUTTER_ACTOR_CLASS (st_label_parent_class)->map (actor);
-
-  clutter_actor_map (priv->label);
-}
-
-static void
-st_label_unmap (ClutterActor *actor)
-{
-  StLabelPrivate *priv = ST_LABEL (actor)->priv;
-
-  CLUTTER_ACTOR_CLASS (st_label_parent_class)->unmap (actor);
-
-  clutter_actor_unmap (priv->label);
-}
-
-static void
 st_label_class_init (StLabelClass *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
@@ -291,8 +271,6 @@ st_label_class_init (StLabelClass *klass)
   actor_class->allocate = st_label_allocate;
   actor_class->get_preferred_width = st_label_get_preferred_width;
   actor_class->get_preferred_height = st_label_get_preferred_height;
-  actor_class->map = st_label_map;
-  actor_class->unmap = st_label_unmap;
 
   widget_class->style_changed = st_label_style_changed;
   widget_class->get_accessible_type = st_label_accessible_get_type;
diff --git a/src/st/st-scroll-bar.c b/src/st/st-scroll-bar.c
index ce0c3c5..354be2a 100644
--- a/src/st/st-scroll-bar.c
+++ b/src/st/st-scroll-bar.c
@@ -243,21 +243,6 @@ st_scroll_bar_pick (ClutterActor       *actor,
 }
 
 static void
-st_scroll_bar_map (ClutterActor *actor)
-{
-  StScrollBarPrivate *priv = ST_SCROLL_BAR (actor)->priv;
-
-  CLUTTER_ACTOR_CLASS (st_scroll_bar_parent_class)->map (actor);
-
-  clutter_actor_map (priv->bw_stepper);
-  clutter_actor_map (priv->fw_stepper);
-  clutter_actor_map (priv->trough);
-
-  if (priv->handle)
-    clutter_actor_map (priv->handle);
-}
-
-static void
 st_scroll_bar_unmap (ClutterActor *actor)
 {
   StScrollBarPrivate *priv = ST_SCROLL_BAR (actor)->priv;
@@ -265,13 +250,6 @@ st_scroll_bar_unmap (ClutterActor *actor)
   CLUTTER_ACTOR_CLASS (st_scroll_bar_parent_class)->unmap (actor);
 
   stop_scrolling (ST_SCROLL_BAR (actor));
-
-  clutter_actor_unmap (priv->bw_stepper);
-  clutter_actor_unmap (priv->fw_stepper);
-  clutter_actor_unmap (priv->trough);
-
-  if (priv->handle)
-    clutter_actor_unmap (priv->handle);
 }
 
 static void
@@ -687,7 +665,6 @@ st_scroll_bar_class_init (StScrollBarClass *klass)
   actor_class->paint          = st_scroll_bar_paint;
   actor_class->pick           = st_scroll_bar_pick;
   actor_class->scroll_event   = st_scroll_bar_scroll_event;
-  actor_class->map            = st_scroll_bar_map;
   actor_class->unmap          = st_scroll_bar_unmap;
 
   widget_class->style_changed = st_scroll_bar_style_changed;