From 1142c8bf18a0dd35e1be53f853ed931bc5e84221 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sat, 11 Sep 2010 03:50:47 +0200
Subject: [PATCH] API: gtk_cell_renderer_render_cairo() =>
 gtk_cell_renderer_render()

---
 gtk/gtkcellrenderer.c   | 14 +++++++-------
 gtk/gtkcellrenderer.h   |  2 +-
 gtk/gtkcellview.c       | 10 +++++-----
 gtk/gtkiconview.c       |  8 ++++----
 gtk/gtktreeviewcolumn.c | 24 ++++++++++++------------
 5 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
index dcad47e544..486ff14552 100644
--- a/gtk/gtkcellrenderer.c
+++ b/gtk/gtkcellrenderer.c
@@ -612,7 +612,7 @@ gtk_cell_renderer_get_size (GtkCellRenderer    *cell,
 }
 
 /**
- * gtk_cell_renderer_render_cairo:
+ * gtk_cell_renderer_render:
  * @cell: a #GtkCellRenderer
  * @cr: a cairo context to draw to
  * @widget: the widget owning @window
@@ -630,12 +630,12 @@ gtk_cell_renderer_get_size (GtkCellRenderer    *cell,
  * @window.
  **/
 void
-gtk_cell_renderer_render_cairo (GtkCellRenderer      *cell,
-                                cairo_t              *cr,
-                                GtkWidget            *widget,
-                                const GdkRectangle   *background_area,
-                                const GdkRectangle   *cell_area,
-                                GtkCellRendererState  flags)
+gtk_cell_renderer_render (GtkCellRenderer      *cell,
+                          cairo_t              *cr,
+                          GtkWidget            *widget,
+                          const GdkRectangle   *background_area,
+                          const GdkRectangle   *cell_area,
+                          GtkCellRendererState  flags)
 {
   gboolean selected = FALSE;
   GtkCellRendererPrivate *priv = cell->priv;
diff --git a/gtk/gtkcellrenderer.h b/gtk/gtkcellrenderer.h
index fa356c105f..29fda86044 100644
--- a/gtk/gtkcellrenderer.h
+++ b/gtk/gtkcellrenderer.h
@@ -119,7 +119,7 @@ void             gtk_cell_renderer_get_size       (GtkCellRenderer      *cell,
 						   gint                 *width,
 						   gint                 *height);
 #endif
-void             gtk_cell_renderer_render_cairo   (GtkCellRenderer      *cell,
+void             gtk_cell_renderer_render         (GtkCellRenderer      *cell,
                                                    cairo_t              *cr,
 						   GtkWidget            *widget,
 						   const GdkRectangle   *background_area,
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 7a3a9e45a7..4c0292a730 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -489,11 +489,11 @@ gtk_cell_view_draw (GtkWidget *widget,
 	      (packing == GTK_PACK_END && !rtl))
 	    area.x -= area.width;
 
-	  gtk_cell_renderer_render_cairo (info->cell,
-                                          cr,
-                                          widget,
-                                          /* FIXME! */
-                                          &area, &area, state);
+	  gtk_cell_renderer_render (info->cell,
+                                    cr,
+                                    widget,
+                                    /* FIXME! */
+                                    &area, &area, state);
 
 	  if ((packing == GTK_PACK_START && !rtl) ||
 	      (packing == GTK_PACK_END && rtl))
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 92821571f5..240dcd7ef3 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -3239,10 +3239,10 @@ gtk_icon_view_paint_item (GtkIconView     *icon_view,
       cell_area.x = x - item->x + cell_area.x;
       cell_area.y = y - item->y + cell_area.y;
 
-      gtk_cell_renderer_render_cairo (info->cell,
-                                      cr,
-                                      widget,
-                                      &cell_area, &cell_area, flags);
+      gtk_cell_renderer_render (info->cell,
+                                cr,
+                                widget,
+                                &cell_area, &cell_area, flags);
     }
 
   if (draw_focus &&
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index a28c2a6ce3..9a14311e10 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -2825,12 +2825,12 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn  *tree_column,
       /* RENDER */
       if (action == CELL_ACTION_RENDER)
 	{
-	  gtk_cell_renderer_render_cairo (info->cell,
-                                          cr,
-                                          tree_column->tree_view,
-                                          &rtl_background_area,
-                                          &rtl_cell_area,
-                                          flags);
+	  gtk_cell_renderer_render (info->cell,
+                                    cr,
+                                    tree_column->tree_view,
+                                    &rtl_background_area,
+                                    &rtl_cell_area,
+                                    flags);
 	}
       /* FOCUS */
       else if (action == CELL_ACTION_FOCUS)
@@ -2993,12 +2993,12 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn  *tree_column,
       /* RENDER */
       if (action == CELL_ACTION_RENDER)
 	{
-	  gtk_cell_renderer_render_cairo (info->cell,
-                                          cr,
-                                          tree_column->tree_view,
-                                          &rtl_background_area,
-                                          &rtl_cell_area,
-                                          flags);
+	  gtk_cell_renderer_render (info->cell,
+                                    cr,
+                                    tree_column->tree_view,
+                                    &rtl_background_area,
+                                    &rtl_cell_area,
+                                    flags);
 	}
       /* FOCUS */
       else if (action == CELL_ACTION_FOCUS)