Index: libegg/toolbareditor/egg-toolbar-editor.c
===================================================================
--- libegg/toolbareditor/egg-toolbar-editor.c	(revision 809)
+++ libegg/toolbareditor/egg-toolbar-editor.c	(working copy)
@@ -435,6 +435,7 @@
   GtkWidget *item;
   const char *item_name;
   const char *stock_id;
+  const char *icon_name;
   const char *short_label;
   const char *collate_key;
   
@@ -461,9 +462,9 @@
 
       g_value_init (&value, G_TYPE_STRING);
       g_object_get_property (G_OBJECT (action), "icon-name", &value);
-      stock_id = g_value_get_string (&value);
+      icon_name = g_value_get_string (&value);
 
-      if (!stock_id) {
+      if (!icon_name) {
         /* Gtk{Radio,Toggle}Actions only set either of the properties */
       	g_value_reset (&value);
       	g_object_get_property (G_OBJECT (action), "stock-id", &value);
@@ -475,7 +476,7 @@
 
       /* This is a workaround to catch named icons. */
       if (is_named)
-        icon = gtk_image_new_from_icon_name (stock_id,
+        icon = gtk_image_new_from_icon_name (icon_name,
 	                                     GTK_ICON_SIZE_LARGE_TOOLBAR);
       else
         icon = gtk_image_new_from_stock (stock_id ? stock_id : GTK_STOCK_DND,
