[gnome-control-center] shell: Try to always use delayed removal
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] shell: Try to always use delayed removal
- Date: Tue, 15 May 2012 13:20:00 +0000 (UTC)
commit bec2efb36abf5b232a1b54a00f15fa91ee5dc7d4
Author: Bastien Nocera <hadess hadess net>
Date: Thu May 10 19:20:58 2012 +0100
shell: Try to always use delayed removal
shell/cc-notebook.c | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/shell/cc-notebook.c b/shell/cc-notebook.c
index 75b4600..c6e92c9 100644
--- a/shell/cc-notebook.c
+++ b/shell/cc-notebook.c
@@ -468,29 +468,22 @@ cc_notebook_remove_page (CcNotebook *self,
GtkWidget *widget)
{
ClutterActorIter iter;
- ClutterActor *child, *frame, *selected_frame;
+ ClutterActor *child, *frame;
int index;
- gboolean found_current;
g_return_if_fail (CC_IS_NOTEBOOK (self));
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (widget != self->priv->selected_page);
- found_current = FALSE;
frame = g_object_get_data (G_OBJECT (widget), "cc-notebook-frame");
- selected_frame = g_object_get_data (G_OBJECT (self->priv->selected_page), "cc-notebook-frame");
index = 0;
clutter_actor_iter_init (&iter, self->priv->bin);
while (clutter_actor_iter_next (&iter, &child)) {
if (frame == child) {
- if (found_current ||
- setup_delayed_remove (self, frame) == FALSE) {
+ if (setup_delayed_remove (self, frame) == FALSE)
clutter_actor_iter_remove (&iter);
- }
break;
- } else if (selected_frame == child) {
- found_current = TRUE;
}
index++;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]