merge and update patch from

http://bugzilla.gnome.org/show_bug.cgi?id=134895
2004-03-31 21:30:23 +00:00 · 2004-03-31 21:30:23 +00:00 · 9a9008178d
commit 9a9008178d
parent 46ba8cb67d
29 changed files with 121 additions and 110 deletions
--- a/capplets/file-types/Makefile.am
+++ b/capplets/file-types/Makefile.am
@ -25,4 +25,4 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)

 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(VFS_CAPPLET_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
-EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files)
+EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) $(Desktop_in_files)
--- a/capplets/file-types/mime-edit-dialog.c
+++ b/capplets/file-types/mime-edit-dialog.c
@ -37,7 +37,7 @@

 #include "libuuid/uuid.h"

-#undef WID(x)
+#undef WID
 #define WID(x) (glade_xml_get_widget (dialog->p->dialog_xml, x))

 enum {