small fix.

[Mathieu Lacage <mathieu eazel com>]

May I apply ?

Mathieu.


Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/bonobo/ChangeLog,v
retrieving revision 1.574
diff -u -r1.574 ChangeLog
--- ChangeLog	2000/10/07 22:59:34	1.574
+++ ChangeLog	2000/10/08 01:11:47
@@ -1,3 +1,8 @@
+2000-10-07  Mathieu Lacage  <mathieu eazel com>
+
+	* bonobo/bonobo-ui-util.c: (bonobo_ui_util_xml_get_icon_pixbuf):
+	fixety fix: add a check for "pixname" if "pixtype" is already set.
+
 2000-10-08  Michael Meeks  <michael helixcode com>
 
 	* bonobo/bonobo-control.c (impl_Bonobo_Control_reactivate_and_undo),
Index: bonobo/bonobo-ui-util.c
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-ui-util.c,v
retrieving revision 1.21
diff -u -r1.21 bonobo-ui-util.c
--- bonobo/bonobo-ui-util.c	2000/10/07 16:13:23	1.21
+++ bonobo/bonobo-ui-util.c	2000/10/08 01:11:47
@@ -358,7 +358,8 @@
 
 	g_return_val_if_fail (node != NULL, NULL);
 
-	if (!(type = bonobo_ui_node_get_attr (node, "pixtype")))
+	if (!(type = bonobo_ui_node_get_attr (node, "pixtype")) 
+	    || !(bonobo_ui_node_get_attr (node, "pixname")))
 		return NULL;
 
 	if (!strcmp (type, "stock")) {
@@ -371,6 +372,7 @@
 		char *name, *text;
 
 		text = bonobo_ui_node_get_attr (node, "pixname");
+
 		if (text[0] == '/' && g_file_exists (text)) {
 			name = g_strdup (text);
 		} else {


-- 
Mathieu Lacage <mathieu eazel com>