[gnome-control-center] [appearance] remove custom cell renderers

[Thomas Wood <thos src gnome org>]

commit 683102f25748abd8682d22ce407b100e3f8b2808
Author: Thomas Wood <thos gnome org>
Date:   Sat Jul 11 23:24:34 2009 +0100

    [appearance] remove custom cell renderers
    
    The custom cell renderers were required to draw the selection inidicator
    around the entire item, not just the text. This has now been fixed in GTK+ as the
    as the resolution of bug 382544.

 capplets/appearance/Makefile.am            |    6 +-
 capplets/appearance/appearance-desktop.c   |    3 +-
 capplets/appearance/appearance-themes.c    |    6 +-
 capplets/appearance/caption-cellrenderer.c |  114 ----------------------------
 capplets/appearance/caption-cellrenderer.h |   47 -----------
 capplets/appearance/wp-cellrenderer.c      |  109 --------------------------
 capplets/appearance/wp-cellrenderer.h      |   44 -----------
 7 files changed, 4 insertions(+), 325 deletions(-)
---
diff --git a/capplets/appearance/Makefile.am b/capplets/appearance/Makefile.am
index 0ebe389..4ab2e60 100644
--- a/capplets/appearance/Makefile.am
+++ b/capplets/appearance/Makefile.am
@@ -31,11 +31,7 @@ gnome_appearance_properties_SOURCES = \
 	theme-save.c \
 	theme-save.h \
 	theme-util.c \
-	theme-util.h \
-	wp-cellrenderer.c \
-	wp-cellrenderer.h \
-	caption-cellrenderer.c \
-	caption-cellrenderer.h
+	theme-util.h
 
 AM_CFLAGS = -DGNOME_DESKTOP_USE_UNSTABLE_API
 
diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c
index cb27a18..fd0dd64 100644
--- a/capplets/appearance/appearance-desktop.c
+++ b/capplets/appearance/appearance-desktop.c
@@ -24,7 +24,6 @@
 #include "gnome-wp-info.h"
 #include "gnome-wp-item.h"
 #include "gnome-wp-xml.h"
-#include "wp-cellrenderer.h"
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <string.h>
@@ -1050,7 +1049,7 @@ desktop_init (AppearanceData *data,
 
   gtk_cell_layout_clear (GTK_CELL_LAYOUT (data->wp_view));
 
-  cr = cell_renderer_wallpaper_new ();
+  cr = gtk_cell_renderer_pixbuf_new ();
   g_object_set (cr, "xpad", 5, "ypad", 5, NULL);
 
   gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (data->wp_view), cr, TRUE);
diff --git a/capplets/appearance/appearance-themes.c b/capplets/appearance/appearance-themes.c
index 0a84eef..5318005 100644
--- a/capplets/appearance/appearance-themes.c
+++ b/capplets/appearance/appearance-themes.c
@@ -27,8 +27,6 @@
 #include "theme-util.h"
 #include "gtkrc-utils.h"
 #include "gedit-message-area.h"
-#include "wp-cellrenderer.h"
-#include "caption-cellrenderer.h"
 
 #include <glib/gi18n.h>
 #include <libwindow-settings/gnome-wm-manager.h>
@@ -1078,14 +1076,14 @@ themes_init (AppearanceData *data)
 
   icon_view = GTK_ICON_VIEW (appearance_capplet_get_widget (data, "theme_list"));
 
-  renderer = cell_renderer_wallpaper_new ();
+  renderer = gtk_cell_renderer_pixbuf_new ();
   g_object_set (renderer, "xpad", 5, "ypad", 5,
                           "xalign", 0.5, "yalign", 1.0, NULL);
   gtk_cell_layout_pack_end (GTK_CELL_LAYOUT (icon_view), renderer, FALSE);
   gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (icon_view), renderer,
                                   "pixbuf", COL_THUMBNAIL, NULL);
 
-  renderer = cell_renderer_caption_new ();
+  renderer = gtk_cell_renderer_text_new ();
   g_object_set (renderer, "alignment", PANGO_ALIGN_CENTER,
 			  "wrap-mode", PANGO_WRAP_WORD_CHAR,
 			  "wrap-width", gtk_icon_view_get_item_width (icon_view),