[gtk+/native-layout: 332/335] Fixed some merge problems (matching updates from the incubator branch)

[Tristan Van Berkom <tvb src gnome org>]

commit a4086282c1b785828619fa88cd6db8632f843985
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Thu Aug 5 16:59:17 2010 -0400

    Fixed some merge problems (matching updates from the incubator branch)

 gtk/gtkcellrenderer.c     |    2 +-
 gtk/gtkcellrenderertext.c |    7 ++++---
 gtk/gtkcellsizerequest.c  |    1 -
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index f57715e..8c940f2 100644
--- a/gtk/gtkcellrenderer.c
+++ b/gtk/gtkcellrenderer.c
@@ -1198,7 +1198,7 @@ _gtk_cell_renderer_calc_offset    (GtkCellRenderer      *cell,
 				   gint                  height,
 				   gint                 *x_offset,
 				   gint                 *y_offset)
-{
+{ 
   GtkCellRendererPriv *priv;
 
   g_return_if_fail (GTK_IS_CELL_RENDERER (cell));
diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
index 11dbb6c..8199bb0 100644
--- a/gtk/gtkcellrenderertext.c
+++ b/gtk/gtkcellrenderertext.c
@@ -1403,6 +1403,8 @@ get_layout (GtkCellRendererText *celltext,
 
   layout = gtk_widget_create_pango_layout (widget, priv->text);
 
+  gtk_cell_renderer_get_padding (GTK_CELL_RENDERER (celltext), &xpad, NULL);
+
   if (priv->extra_attrs)
     attr_list = pango_attr_list_copy (priv->extra_attrs);
   else
@@ -1410,8 +1412,6 @@ get_layout (GtkCellRendererText *celltext,
 
   pango_layout_set_single_paragraph_mode (layout, priv->single_paragraph);
 
-  gtk_cell_renderer_get_padding (GTK_CELL_RENDERER (celltext), &xpad, NULL);
-
   if (cell_area)
     {
       /* Add options that affect appearance but not size */
@@ -2003,10 +2003,11 @@ gtk_cell_renderer_text_get_width (GtkCellSizeRequest *cell,
    */
 
   celltext = GTK_CELL_RENDERER_TEXT (cell);
-  priv     = celltext->priv;
+  priv = celltext->priv;
 
   gtk_cell_renderer_get_padding (GTK_CELL_RENDERER (cell), &xpad, NULL);
 
+
   layout = get_layout (celltext, widget, NULL, 0);
 
   /* Get the layout with the text possibly wrapping at wrap_width */
diff --git a/gtk/gtkcellsizerequest.c b/gtk/gtkcellsizerequest.c
index 42c0613..a09c45e 100644
--- a/gtk/gtkcellsizerequest.c
+++ b/gtk/gtkcellsizerequest.c
@@ -333,4 +333,3 @@ gtk_cell_size_request_get_size (GtkCellSizeRequest *cell,
 	}
     }
 }
-