[gnome-control-center/wip/animated-notebook] shell: Clean up notebook layout code

[Bastien Nocera <hadess src gnome org>]

commit f66c431a8b377c263071b14d77b1c2716ecee2bb
Author: Bastien Nocera <hadess hadess net>
Date:   Fri May 4 15:32:53 2012 +0100

    shell: Clean up notebook layout code

 shell/cc-notebook.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/shell/cc-notebook.c b/shell/cc-notebook.c
index 9735b2b..6bdafec 100644
--- a/shell/cc-notebook.c
+++ b/shell/cc-notebook.c
@@ -98,7 +98,7 @@ cc_notebook_get_request_mode (GtkWidget *widget)
 
 	notebook = CC_NOTEBOOK (widget);
 
-	target = cc_notebook_get_selected_page (notebook) ? cc_notebook_get_selected_page (notebook) : GTK_WIDGET (notebook);
+	target = notebook->priv->selected_page ? notebook->priv->selected_page : widget;
 
 	return gtk_widget_get_request_mode (target);
 }
@@ -113,7 +113,7 @@ cc_notebook_get_preferred_height (GtkWidget       *widget,
 
 	notebook = CC_NOTEBOOK (widget);
 
-	target = cc_notebook_get_selected_page (notebook) ? cc_notebook_get_selected_page (notebook) : GTK_WIDGET (notebook);
+	target = notebook->priv->selected_page ? notebook->priv->selected_page : widget;
 
 	gtk_widget_get_preferred_height (target, minimum_height, natural_height);
 }
@@ -129,7 +129,7 @@ cc_notebook_get_preferred_width_for_height (GtkWidget       *widget,
 
 	notebook = CC_NOTEBOOK (widget);
 
-	target = cc_notebook_get_selected_page (notebook) ? cc_notebook_get_selected_page (notebook) : GTK_WIDGET (notebook);
+	target = notebook->priv->selected_page ? notebook->priv->selected_page : widget;
 
 	gtk_widget_get_preferred_width_for_height (target, height, minimum_width, natural_width);
 }
@@ -144,7 +144,7 @@ cc_notebook_get_preferred_width (GtkWidget       *widget,
 
 	notebook = CC_NOTEBOOK (widget);
 
-	target = cc_notebook_get_selected_page (notebook) ? cc_notebook_get_selected_page (notebook) : GTK_WIDGET (notebook);
+	target = notebook->priv->selected_page ? notebook->priv->selected_page : widget;
 
 	gtk_widget_get_preferred_width (target, minimum_width, natural_width);
 }
@@ -160,7 +160,7 @@ cc_notebook_get_preferred_height_for_width (GtkWidget       *widget,
 
 	notebook = CC_NOTEBOOK (widget);
 
-	target = cc_notebook_get_selected_page (notebook) ? cc_notebook_get_selected_page (notebook) : GTK_WIDGET (notebook);
+	target = notebook->priv->selected_page ? notebook->priv->selected_page : widget;
 
 	gtk_widget_get_preferred_height_for_width (target, width, minimum_height, natural_height);
 }