From cea054cd54d84479352a43bbabc19c9ce9af5efb Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Fri, 8 Aug 2008 04:26:12 +0000
Subject: Merge revisions 35747:35930 from trunk.

svn path=/branches/kill-bonobo/; revision=35931
---
 shell/e-component-registry.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'shell/e-component-registry.h')

diff --git a/shell/e-component-registry.h b/shell/e-component-registry.h
index 0c7ff03b0e..1d5943537c 100644
--- a/shell/e-component-registry.h
+++ b/shell/e-component-registry.h
@@ -73,10 +73,9 @@ struct _EComponentInfo {
 
 	char *button_label;
 	char *button_tooltips;
-	GdkPixbuf *button_icon;
 	char *menu_label;
 	char *menu_accelerator;
-	GdkPixbuf *menu_icon;
+	char *icon_name;
 
 	int sort_order;
 
-- 
cgit v1.2.3