Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
all: revert some changes prior new Mx
  • Loading branch information
djdeath committed Apr 25, 2012
1 parent beab5b2 commit 0cfc27a
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 28 deletions.
17 changes: 6 additions & 11 deletions shell/alttab/mnb-alttab-overlay.c
Expand Up @@ -184,29 +184,24 @@ mnb_alttab_overlay_populate (MnbAlttabOverlay *self)
priv->active = app;
}

clutter_container_add_actor (CLUTTER_CONTAINER (priv->grid),
(ClutterActor *) app);
clutter_actor_add_child (priv->grid, (ClutterActor *) app);
}

g_list_free (filtered);

return TRUE;
}

static void
_remove_child (ClutterActor *child, ClutterActor *grid)
{
clutter_actor_destroy (child);
}

static void
mnb_alttab_overlay_depopulate (MnbAlttabOverlay *self)
{
MnbAlttabOverlayPrivate *priv = self->priv;
ClutterActorIter iter;
ClutterActor *child;

clutter_container_foreach (CLUTTER_CONTAINER (priv->grid),
CLUTTER_CALLBACK (_remove_child),
priv->grid);
clutter_actor_iter_init (&iter, priv->grid);
while (clutter_actor_iter_next (&iter, &child))
clutter_actor_iter_destroy (&iter);
}

static void
Expand Down
14 changes: 6 additions & 8 deletions shell/notifications/ntf-notification.c
Expand Up @@ -699,8 +699,8 @@ ntf_notification_add_button (NtfNotification *ntf,
if (button != priv->dismiss_button)
mx_stylable_set_style_class (MX_STYLABLE (priv->dismiss_button), "");

clutter_container_add_actor (CLUTTER_CONTAINER (priv->button_box),
CLUTTER_ACTOR (button));
mx_box_layout_insert_actor (MX_BOX_LAYOUT (priv->button_box),
CLUTTER_ACTOR (button), -1);

if (keysym)
{
Expand Down Expand Up @@ -741,8 +741,7 @@ ntf_notification_remove_button (NtfNotification *ntf, ClutterActor *button)
priv->focused_keyname = NULL;
}

clutter_container_remove_actor (CLUTTER_CONTAINER (priv->button_box),
CLUTTER_ACTOR (button));
clutter_actor_remove_child (priv->button_box, CLUTTER_ACTOR (button));
}

void
Expand Down Expand Up @@ -773,14 +772,13 @@ ntf_notification_remove_all_buttons (NtfNotification *ntf)
l;
l = g_list_delete_link (l, l))
{
clutter_container_remove_actor (CLUTTER_CONTAINER (priv->button_box),
CLUTTER_ACTOR (l->data));
clutter_actor_remove_child (priv->button_box, CLUTTER_ACTOR (l->data));
}

if (priv->dismiss_button)
{
clutter_container_add_actor (CLUTTER_CONTAINER (priv->button_box),
priv->dismiss_button);
mx_box_layout_insert_actor (MX_BOX_LAYOUT (priv->button_box),
priv->dismiss_button, -1);

g_object_unref (priv->dismiss_button);
}
Expand Down
15 changes: 6 additions & 9 deletions shell/notifications/ntf-tray.c
Expand Up @@ -345,19 +345,16 @@ static void
ntf_tray_dismiss_all_cb (ClutterActor *button, NtfTray *tray)
{
NtfTrayPrivate *priv = tray->priv;
GList *child, *children;
ClutterActorIter iter;
ClutterActor *child;

clutter_actor_hide (CLUTTER_ACTOR (tray));

child = children =
clutter_container_get_children (CLUTTER_CONTAINER (priv->notifiers));
while (child != NULL)
clutter_actor_iter_init (&iter, priv->notifiers);
while (clutter_actor_iter_next (&iter, &child))
{
g_signal_emit_by_name (child->data, "closed", 0);
child = child->next;
g_signal_emit_by_name (child, "closed", 0);
}

g_list_free (children);
}

static void
Expand Down Expand Up @@ -612,7 +609,7 @@ ntf_tray_add_notification (NtfTray *tray, NtfNotification *ntf)
G_CALLBACK (ntf_tray_notification_closed_cb),
tray);

clutter_container_add_actor (CLUTTER_CONTAINER (priv->notifiers), ntfa);
clutter_actor_add_child (priv->notifiers, ntfa);

priv->n_notifiers++;

Expand Down

0 comments on commit 0cfc27a

Please sign in to comment.