patch from my lazy butt



hm,

Was not willing to wait for someone to fix my "hidden" bug so
made a patch: can I apply ?

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/bonobo/ChangeLog,v
retrieving revision 1.582
diff -u -r1.582 ChangeLog
--- ChangeLog	2000/10/08 20:42:44	1.582
+++ ChangeLog	2000/10/09 04:15:56
@@ -1,3 +1,11 @@
+2000-10-08  Mathieu Lacage  <mathieu eazel com>
+
+	* bonobo/bonobo-ui-util.c: (bonobo_ui_util_xml_get_icon_pixbuf):
+	fixety fix to avoid segfaults in certain cases...
+	* bonobo/bonobo-win.c: (update_menus):
+	add a call to do_show_hide at the end of the function to support
+	the "hidden" parameter on menus
+
 2000-10-08  Martin Baulig  <martin home-of-linux org>
 
 	* gshell/gshell.c (zoom_level_changed_cb): New callback function.
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/09 04:15:56
@@ -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 {
Index: bonobo/bonobo-win.c
===================================================================
RCS file: /cvs/gnome/bonobo/bonobo/bonobo-win.c,v
retrieving revision 1.45
diff -u -r1.45 bonobo-win.c
--- bonobo/bonobo-win.c	2000/10/07 16:13:23	1.45
+++ bonobo/bonobo-win.c	2000/10/09 04:15:57
@@ -1591,6 +1591,8 @@
 	if (wptr)
 		g_warning ("Excess widgets at the end of the container; wierd");
 
+	do_show_hide (GTK_WIDGET (info->widget), node);
+
 	g_list_free  (widgets);
 }
 


 
-- 
Mathieu Lacage <mathieu eazel com>





[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]