diff -uNr gnome-libs-0.25/ChangeLog gnome-libs-0.26/ChangeLog --- gnome-libs-0.25/ChangeLog Wed Aug 5 11:38:48 1998 +++ gnome-libs-0.26/ChangeLog Thu Aug 6 12:55:46 1998 @@ -1,3 +1,7 @@ +1998-08-06 Federico Mena Quintero + + * configure.in: Bumped version number to 0.26. + 1998-08-05 Nuno Ferreira * libgnome/gnome-help.h: Added #ifndef #define aroud the whole diff -uNr gnome-libs-0.25/configure gnome-libs-0.26/configure --- gnome-libs-0.25/configure Wed Aug 5 19:23:36 1998 +++ gnome-libs-0.26/configure Thu Aug 6 13:01:30 1998 @@ -810,7 +810,7 @@ PACKAGE=gnome-libs -VERSION=0.25 +VERSION=0.26 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } diff -uNr gnome-libs-0.25/configure.in gnome-libs-0.26/configure.in --- gnome-libs-0.25/configure.in Wed Aug 5 16:09:16 1998 +++ gnome-libs-0.26/configure.in Thu Aug 6 12:55:39 1998 @@ -7,7 +7,7 @@ AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(gnome-libs, 0.25) +AM_INIT_AUTOMAKE(gnome-libs, 0.26) AM_ACLOCAL_INCLUDE(macros) diff -uNr gnome-libs-0.25/gnome-hello/Makefile.in gnome-libs-0.26/gnome-hello/Makefile.in --- gnome-libs-0.25/gnome-hello/Makefile.in Wed Aug 5 19:59:08 1998 +++ gnome-libs-0.26/gnome-hello/Makefile.in Thu Aug 6 13:13:15 1998 @@ -389,18 +389,17 @@ ../libgnomeui/gnome-messagebox.h ../libgnomeui/gnome-net.h \ ../libgnomeui/gnome-number-entry.h \ ../libgnomeui/gnome-popupmenu.h ../libgnomeui/gnome-pixmap.h \ - ../libgnomeui/gnome-preferences.h \ + ../libgnomeui/gnome-preferences.h ../libgnomeui/gnome-mdi.h \ + ../libgnomeui/gnome-rootwin.h ../libgnomeui/gnome-mdi-child.h \ ../libgnomeui/gnome-propertybox.h \ ../libgnomeui/gnome-properties.h ../libgnomeui/gnome-scores.h \ - ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-rootwin.h \ - ../libgnomeui/gnome-stock.h ../libgnomeui/gnome-client.h \ - ../libgnomeui/gtkcalendar.h ../libgnomeui/gtkcauldron.h \ - ../libgnomeui/gtk-clock.h ../libgnomeui/gtkdial.h \ - ../libgnomeui/gtk-plug.h ../libgnomeui/gtk-ted.h \ - ../libgnomeui/gtk-socket.h ../libgnomeui/gtkspell.h \ - ../libgnomeui/gnome-dateedit.h ../libgnomeui/gnome-calculator.h \ - ../libgnomeui/gnome-lamp.h ../libgnomeui/gnome-mdi.h \ - ../libgnomeui/gnome-mdi-child.h \ + ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-stock.h \ + ../libgnomeui/gnome-client.h ../libgnomeui/gtkcalendar.h \ + ../libgnomeui/gtkcauldron.h ../libgnomeui/gtk-clock.h \ + ../libgnomeui/gtkdial.h ../libgnomeui/gtk-plug.h \ + ../libgnomeui/gtk-ted.h ../libgnomeui/gtk-socket.h \ + ../libgnomeui/gtkspell.h ../libgnomeui/gnome-dateedit.h \ + ../libgnomeui/gnome-calculator.h ../libgnomeui/gnome-lamp.h \ ../libgnomeui/gnometypebuiltins.h gnome-hello-1-menus.o: gnome-hello-1-menus.c ../config.h ../gnome.h \ ../support/gnomesupport.h ../libgnome/libgnome.h \ @@ -433,18 +432,17 @@ ../libgnomeui/gnome-messagebox.h ../libgnomeui/gnome-net.h \ ../libgnomeui/gnome-number-entry.h \ ../libgnomeui/gnome-popupmenu.h ../libgnomeui/gnome-pixmap.h \ - ../libgnomeui/gnome-preferences.h \ + ../libgnomeui/gnome-preferences.h ../libgnomeui/gnome-mdi.h \ + ../libgnomeui/gnome-rootwin.h ../libgnomeui/gnome-mdi-child.h \ ../libgnomeui/gnome-propertybox.h \ ../libgnomeui/gnome-properties.h ../libgnomeui/gnome-scores.h \ - ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-rootwin.h \ - ../libgnomeui/gnome-stock.h ../libgnomeui/gnome-client.h \ - ../libgnomeui/gtkcalendar.h ../libgnomeui/gtkcauldron.h \ - ../libgnomeui/gtk-clock.h ../libgnomeui/gtkdial.h \ - ../libgnomeui/gtk-plug.h ../libgnomeui/gtk-ted.h \ - ../libgnomeui/gtk-socket.h ../libgnomeui/gtkspell.h \ - ../libgnomeui/gnome-dateedit.h ../libgnomeui/gnome-calculator.h \ - ../libgnomeui/gnome-lamp.h ../libgnomeui/gnome-mdi.h \ - ../libgnomeui/gnome-mdi-child.h \ + ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-stock.h \ + ../libgnomeui/gnome-client.h ../libgnomeui/gtkcalendar.h \ + ../libgnomeui/gtkcauldron.h ../libgnomeui/gtk-clock.h \ + ../libgnomeui/gtkdial.h ../libgnomeui/gtk-plug.h \ + ../libgnomeui/gtk-ted.h ../libgnomeui/gtk-socket.h \ + ../libgnomeui/gtkspell.h ../libgnomeui/gnome-dateedit.h \ + ../libgnomeui/gnome-calculator.h ../libgnomeui/gnome-lamp.h \ ../libgnomeui/gnometypebuiltins.h gnome-hello-2-i18n.o: gnome-hello-2-i18n.c ../config.h ../gnome.h \ ../support/gnomesupport.h ../libgnome/libgnome.h \ @@ -477,18 +475,17 @@ ../libgnomeui/gnome-messagebox.h ../libgnomeui/gnome-net.h \ ../libgnomeui/gnome-number-entry.h \ ../libgnomeui/gnome-popupmenu.h ../libgnomeui/gnome-pixmap.h \ - ../libgnomeui/gnome-preferences.h \ + ../libgnomeui/gnome-preferences.h ../libgnomeui/gnome-mdi.h \ + ../libgnomeui/gnome-rootwin.h ../libgnomeui/gnome-mdi-child.h \ ../libgnomeui/gnome-propertybox.h \ ../libgnomeui/gnome-properties.h ../libgnomeui/gnome-scores.h \ - ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-rootwin.h \ - ../libgnomeui/gnome-stock.h ../libgnomeui/gnome-client.h \ - ../libgnomeui/gtkcalendar.h ../libgnomeui/gtkcauldron.h \ - ../libgnomeui/gtk-clock.h ../libgnomeui/gtkdial.h \ - ../libgnomeui/gtk-plug.h ../libgnomeui/gtk-ted.h \ - ../libgnomeui/gtk-socket.h ../libgnomeui/gtkspell.h \ - ../libgnomeui/gnome-dateedit.h ../libgnomeui/gnome-calculator.h \ - ../libgnomeui/gnome-lamp.h ../libgnomeui/gnome-mdi.h \ - ../libgnomeui/gnome-mdi-child.h \ + ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-stock.h \ + ../libgnomeui/gnome-client.h ../libgnomeui/gtkcalendar.h \ + ../libgnomeui/gtkcauldron.h ../libgnomeui/gtk-clock.h \ + ../libgnomeui/gtkdial.h ../libgnomeui/gtk-plug.h \ + ../libgnomeui/gtk-ted.h ../libgnomeui/gtk-socket.h \ + ../libgnomeui/gtkspell.h ../libgnomeui/gnome-dateedit.h \ + ../libgnomeui/gnome-calculator.h ../libgnomeui/gnome-lamp.h \ ../libgnomeui/gnometypebuiltins.h gnome-hello-3-parse-args.o: gnome-hello-3-parse-args.c ../config.h \ ../gnome.h ../support/gnomesupport.h ../libgnome/libgnome.h \ @@ -521,18 +518,17 @@ ../libgnomeui/gnome-messagebox.h ../libgnomeui/gnome-net.h \ ../libgnomeui/gnome-number-entry.h \ ../libgnomeui/gnome-popupmenu.h ../libgnomeui/gnome-pixmap.h \ - ../libgnomeui/gnome-preferences.h \ + ../libgnomeui/gnome-preferences.h ../libgnomeui/gnome-mdi.h \ + ../libgnomeui/gnome-rootwin.h ../libgnomeui/gnome-mdi-child.h \ ../libgnomeui/gnome-propertybox.h \ ../libgnomeui/gnome-properties.h ../libgnomeui/gnome-scores.h \ - ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-rootwin.h \ - ../libgnomeui/gnome-stock.h ../libgnomeui/gnome-client.h \ - ../libgnomeui/gtkcalendar.h ../libgnomeui/gtkcauldron.h \ - ../libgnomeui/gtk-clock.h ../libgnomeui/gtkdial.h \ - ../libgnomeui/gtk-plug.h ../libgnomeui/gtk-ted.h \ - ../libgnomeui/gtk-socket.h ../libgnomeui/gtkspell.h \ - ../libgnomeui/gnome-dateedit.h ../libgnomeui/gnome-calculator.h \ - ../libgnomeui/gnome-lamp.h ../libgnomeui/gnome-mdi.h \ - ../libgnomeui/gnome-mdi-child.h \ + ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-stock.h \ + ../libgnomeui/gnome-client.h ../libgnomeui/gtkcalendar.h \ + ../libgnomeui/gtkcauldron.h ../libgnomeui/gtk-clock.h \ + ../libgnomeui/gtkdial.h ../libgnomeui/gtk-plug.h \ + ../libgnomeui/gtk-ted.h ../libgnomeui/gtk-socket.h \ + ../libgnomeui/gtkspell.h ../libgnomeui/gnome-dateedit.h \ + ../libgnomeui/gnome-calculator.h ../libgnomeui/gnome-lamp.h \ ../libgnomeui/gnometypebuiltins.h gnome-hello-4-SM.o: gnome-hello-4-SM.c ../config.h ../gnome.h \ ../support/gnomesupport.h ../libgnome/libgnome.h \ @@ -565,18 +561,17 @@ ../libgnomeui/gnome-messagebox.h ../libgnomeui/gnome-net.h \ ../libgnomeui/gnome-number-entry.h \ ../libgnomeui/gnome-popupmenu.h ../libgnomeui/gnome-pixmap.h \ - ../libgnomeui/gnome-preferences.h \ + ../libgnomeui/gnome-preferences.h ../libgnomeui/gnome-mdi.h \ + ../libgnomeui/gnome-rootwin.h ../libgnomeui/gnome-mdi-child.h \ ../libgnomeui/gnome-propertybox.h \ ../libgnomeui/gnome-properties.h ../libgnomeui/gnome-scores.h \ - ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-rootwin.h \ - ../libgnomeui/gnome-stock.h ../libgnomeui/gnome-client.h \ - ../libgnomeui/gtkcalendar.h ../libgnomeui/gtkcauldron.h \ - ../libgnomeui/gtk-clock.h ../libgnomeui/gtkdial.h \ - ../libgnomeui/gtk-plug.h ../libgnomeui/gtk-ted.h \ - ../libgnomeui/gtk-socket.h ../libgnomeui/gtkspell.h \ - ../libgnomeui/gnome-dateedit.h ../libgnomeui/gnome-calculator.h \ - ../libgnomeui/gnome-lamp.h ../libgnomeui/gnome-mdi.h \ - ../libgnomeui/gnome-mdi-child.h \ + ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-stock.h \ + ../libgnomeui/gnome-client.h ../libgnomeui/gtkcalendar.h \ + ../libgnomeui/gtkcauldron.h ../libgnomeui/gtk-clock.h \ + ../libgnomeui/gtkdial.h ../libgnomeui/gtk-plug.h \ + ../libgnomeui/gtk-ted.h ../libgnomeui/gtk-socket.h \ + ../libgnomeui/gtkspell.h ../libgnomeui/gnome-dateedit.h \ + ../libgnomeui/gnome-calculator.h ../libgnomeui/gnome-lamp.h \ ../libgnomeui/gnometypebuiltins.h gnome-hello-5-dnd.o: gnome-hello-5-dnd.c ../config.h ../gnome.h \ ../support/gnomesupport.h ../libgnome/libgnome.h \ @@ -609,18 +604,17 @@ ../libgnomeui/gnome-messagebox.h ../libgnomeui/gnome-net.h \ ../libgnomeui/gnome-number-entry.h \ ../libgnomeui/gnome-popupmenu.h ../libgnomeui/gnome-pixmap.h \ - ../libgnomeui/gnome-preferences.h \ + ../libgnomeui/gnome-preferences.h ../libgnomeui/gnome-mdi.h \ + ../libgnomeui/gnome-rootwin.h ../libgnomeui/gnome-mdi-child.h \ ../libgnomeui/gnome-propertybox.h \ ../libgnomeui/gnome-properties.h ../libgnomeui/gnome-scores.h \ - ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-rootwin.h \ - ../libgnomeui/gnome-stock.h ../libgnomeui/gnome-client.h \ - ../libgnomeui/gtkcalendar.h ../libgnomeui/gtkcauldron.h \ - ../libgnomeui/gtk-clock.h ../libgnomeui/gtkdial.h \ - ../libgnomeui/gtk-plug.h ../libgnomeui/gtk-ted.h \ - ../libgnomeui/gtk-socket.h ../libgnomeui/gtkspell.h \ - ../libgnomeui/gnome-dateedit.h ../libgnomeui/gnome-calculator.h \ - ../libgnomeui/gnome-lamp.h ../libgnomeui/gnome-mdi.h \ - ../libgnomeui/gnome-mdi-child.h \ + ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-stock.h \ + ../libgnomeui/gnome-client.h ../libgnomeui/gtkcalendar.h \ + ../libgnomeui/gtkcauldron.h ../libgnomeui/gtk-clock.h \ + ../libgnomeui/gtkdial.h ../libgnomeui/gtk-plug.h \ + ../libgnomeui/gtk-ted.h ../libgnomeui/gtk-socket.h \ + ../libgnomeui/gtkspell.h ../libgnomeui/gnome-dateedit.h \ + ../libgnomeui/gnome-calculator.h ../libgnomeui/gnome-lamp.h \ ../libgnomeui/gnometypebuiltins.h gnome-hello-6-dynamic-menus.o: gnome-hello-6-dynamic-menus.c ../config.h \ ../gnome.h ../support/gnomesupport.h ../libgnome/libgnome.h \ @@ -653,18 +647,17 @@ ../libgnomeui/gnome-messagebox.h ../libgnomeui/gnome-net.h \ ../libgnomeui/gnome-number-entry.h \ ../libgnomeui/gnome-popupmenu.h ../libgnomeui/gnome-pixmap.h \ - ../libgnomeui/gnome-preferences.h \ + ../libgnomeui/gnome-preferences.h ../libgnomeui/gnome-mdi.h \ + ../libgnomeui/gnome-rootwin.h ../libgnomeui/gnome-mdi-child.h \ ../libgnomeui/gnome-propertybox.h \ ../libgnomeui/gnome-properties.h ../libgnomeui/gnome-scores.h \ - ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-rootwin.h \ - ../libgnomeui/gnome-stock.h ../libgnomeui/gnome-client.h \ - ../libgnomeui/gtkcalendar.h ../libgnomeui/gtkcauldron.h \ - ../libgnomeui/gtk-clock.h ../libgnomeui/gtkdial.h \ - ../libgnomeui/gtk-plug.h ../libgnomeui/gtk-ted.h \ - ../libgnomeui/gtk-socket.h ../libgnomeui/gtkspell.h \ - ../libgnomeui/gnome-dateedit.h ../libgnomeui/gnome-calculator.h \ - ../libgnomeui/gnome-lamp.h ../libgnomeui/gnome-mdi.h \ - ../libgnomeui/gnome-mdi-child.h \ + ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-stock.h \ + ../libgnomeui/gnome-client.h ../libgnomeui/gtkcalendar.h \ + ../libgnomeui/gtkcauldron.h ../libgnomeui/gtk-clock.h \ + ../libgnomeui/gtkdial.h ../libgnomeui/gtk-plug.h \ + ../libgnomeui/gtk-ted.h ../libgnomeui/gtk-socket.h \ + ../libgnomeui/gtkspell.h ../libgnomeui/gnome-dateedit.h \ + ../libgnomeui/gnome-calculator.h ../libgnomeui/gnome-lamp.h \ ../libgnomeui/gnometypebuiltins.h gnome-hello-7-mdi.o: gnome-hello-7-mdi.c ../config.h ../gnome.h \ ../support/gnomesupport.h ../libgnome/libgnome.h \ @@ -697,18 +690,17 @@ ../libgnomeui/gnome-messagebox.h ../libgnomeui/gnome-net.h \ ../libgnomeui/gnome-number-entry.h \ ../libgnomeui/gnome-popupmenu.h ../libgnomeui/gnome-pixmap.h \ - ../libgnomeui/gnome-preferences.h \ + ../libgnomeui/gnome-preferences.h ../libgnomeui/gnome-mdi.h \ + ../libgnomeui/gnome-rootwin.h ../libgnomeui/gnome-mdi-child.h \ ../libgnomeui/gnome-propertybox.h \ ../libgnomeui/gnome-properties.h ../libgnomeui/gnome-scores.h \ - ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-rootwin.h \ - ../libgnomeui/gnome-stock.h ../libgnomeui/gnome-client.h \ - ../libgnomeui/gtkcalendar.h ../libgnomeui/gtkcauldron.h \ - ../libgnomeui/gtk-clock.h ../libgnomeui/gtkdial.h \ - ../libgnomeui/gtk-plug.h ../libgnomeui/gtk-ted.h \ - ../libgnomeui/gtk-socket.h ../libgnomeui/gtkspell.h \ - ../libgnomeui/gnome-dateedit.h ../libgnomeui/gnome-calculator.h \ - ../libgnomeui/gnome-lamp.h ../libgnomeui/gnome-mdi.h \ - ../libgnomeui/gnome-mdi-child.h \ + ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-stock.h \ + ../libgnomeui/gnome-client.h ../libgnomeui/gtkcalendar.h \ + ../libgnomeui/gtkcauldron.h ../libgnomeui/gtk-clock.h \ + ../libgnomeui/gtkdial.h ../libgnomeui/gtk-plug.h \ + ../libgnomeui/gtk-ted.h ../libgnomeui/gtk-socket.h \ + ../libgnomeui/gtkspell.h ../libgnomeui/gnome-dateedit.h \ + ../libgnomeui/gnome-calculator.h ../libgnomeui/gnome-lamp.h \ ../libgnomeui/gnometypebuiltins.h info: diff -uNr gnome-libs-0.25/gnome-hello/gnome-hello-7-mdi.c gnome-libs-0.26/gnome-hello/gnome-hello-7-mdi.c --- gnome-libs-0.25/gnome-hello/gnome-hello-7-mdi.c Mon Aug 3 09:45:54 1998 +++ gnome-libs-0.26/gnome-hello/gnome-hello-7-mdi.c Thu Aug 6 12:57:54 1998 @@ -442,7 +442,7 @@ /* we could also connect handlers to other signals, but since we're lazy, we won't ;) */ /* set MDI mode */ - gnome_mdi_set_mode(mdi, GNOME_MDI_NOTEBOOK); + gnome_mdi_set_mode(mdi, GNOME_MDI_DEFAULT_MODE); /* and here we go... */ gtk_main(); diff -uNr gnome-libs-0.25/libgnomeui/ChangeLog gnome-libs-0.26/libgnomeui/ChangeLog --- gnome-libs-0.25/libgnomeui/ChangeLog Wed Aug 5 19:37:35 1998 +++ gnome-libs-0.26/libgnomeui/ChangeLog Thu Aug 6 12:57:54 1998 @@ -1,3 +1,10 @@ +1998-08-06 Jaka Mocnik + + * gnome-preferences.[ch]: added MDI preferences. + * gnome-mdi.h: changed the GnomeMDIMode enums a bit: this requires + recompiling any apps using MDI. + * gnome-mdi.c: take UI properties into account. + 1998-08-05 Federico Mena Quintero * gnome-canvas-line.c: diff -uNr gnome-libs-0.25/libgnomeui/Makefile.in gnome-libs-0.26/libgnomeui/Makefile.in --- gnome-libs-0.25/libgnomeui/Makefile.in Wed Aug 5 19:59:01 1998 +++ gnome-libs-0.26/libgnomeui/Makefile.in Thu Aug 6 13:13:08 1998 @@ -628,14 +628,18 @@ gnome-types.h ../libgnome/gnome-i18nP.h \ ../libgnome/gnome-util.h gnome-stock.h gnome-pixmap.h \ gnome-dialog-util.h gnome-dialog.h gnome-uidefs.h \ - gnome-preferences.h gnome-appbar.h + gnome-preferences.h gnome-mdi.h gnome-app-helper.h \ + gnome-rootwin.h gnome-mdi-child.h gnome-app-helper.h \ + gnome-appbar.h gnome-app.lo gnome-app.o: gnome-app.c ../config.h \ ../libgnome/gnome-defs.h ../libgnome/gnome-i18nP.h \ ../libgnome/gnome-util.h ../libgnome/gnome-config.h \ - gnome-preferences.h gnome-app.h + gnome-preferences.h gnome-mdi.h gnome-app.h gnome-app-helper.h \ + gnome-rootwin.h gnome-mdi-child.h gnome-app.h gnome-appbar.lo gnome-appbar.o: gnome-appbar.c gnome-appbar.h \ ../libgnome/gnome-defs.h gnome-types.h ../libgnome/gnome-util.h \ - gnome-preferences.h gnome-uidefs.h + gnome-preferences.h gnome-mdi.h gnome-app.h gnome-app-helper.h \ + gnome-rootwin.h gnome-mdi-child.h gnome-uidefs.h gnome-calculator.lo gnome-calculator.o: gnome-calculator.c ../config.h \ ../libgnome/libgnomeP.h ../libgnome/gnome-defs.h \ ../libgnome/gnome-config.h ../libgnome/gnome-dentry.h \ @@ -699,7 +703,9 @@ gnome-dialog.h ../libgnome/gnome-defs.h \ ../libgnome/gnome-util.h ../libgnome/gnome-i18nP.h \ gnome-stock.h gnome-pixmap.h gnome-uidefs.h gnome-preferences.h \ - gnome-dialog-util.h gnome-types.h + gnome-mdi.h gnome-app.h gnome-app-helper.h gnome-rootwin.h \ + gnome-mdi-child.h gnome-app-helper.h gnome-dialog-util.h \ + gnome-types.h gnome-dns.lo gnome-dns.o: gnome-dns.c ../libgnome/gnome-defs.h \ gnome-dns.h gnome-entry.lo gnome-entry.o: gnome-entry.c ../config.h \ @@ -740,7 +746,9 @@ ../libgnome/gnome-i18nP.h ../libgnome/gnome-parse.h \ ../libgnome/gnome-score.h ../libgnome/gnome-string.h \ ../libgnome/gnome-triggers.h ../libgnome/gnome-util.h \ - gnome-preferences.h gnome-client.h + gnome-preferences.h gnome-mdi.h gnome-app.h gnome-app-helper.h \ + gnome-rootwin.h gnome-mdi-child.h gnome-app-helper.h \ + gnome-client.h gnome-lamp.lo gnome-lamp.o: gnome-lamp.c gnome-lamp.h \ ../libgnome/gnome-defs.h gnome-pixmap.h gnome-less.lo gnome-less.o: gnome-less.c gnome-less.h \ @@ -752,8 +760,9 @@ gnome-mdi.lo gnome-mdi.o: gnome-mdi.c ../config.h \ ../libgnome/gnome-defs.h ../libgnome/gnome-config.h \ ../libgnome/gnome-i18nP.h ../libgnome/gnome-util.h gnome-app.h \ - gnome-app-helper.h gnome-stock.h gnome-pixmap.h gnome-mdi.h \ - gnome-rootwin.h gnome-mdi-child.h gnome-app-helper.h + gnome-app-helper.h gnome-stock.h gnome-pixmap.h \ + gnome-preferences.h gnome-mdi.h gnome-rootwin.h \ + gnome-mdi-child.h gnome-app-helper.h gnome-messagebox.lo gnome-messagebox.o: gnome-messagebox.c ../config.h \ gnome-messagebox.h gnome-dialog.h ../libgnome/gnome-defs.h \ ../libgnome/gnome-util.h ../libgnome/gnome-i18nP.h \ @@ -785,7 +794,8 @@ gnome-popupmenu.h gnome-preferences.lo gnome-preferences.o: gnome-preferences.c \ ../config.h gnome-preferences.h ../libgnome/gnome-defs.h \ - ../libgnome/gnome-config.h + gnome-mdi.h gnome-app.h gnome-app-helper.h gnome-rootwin.h \ + gnome-mdi-child.h gnome-app-helper.h ../libgnome/gnome-config.h gnome-properties.lo gnome-properties.o: gnome-properties.c ../config.h \ ../libgnome/gnome-defs.h gnome-properties.h gnome-propertybox.h \ gnome-dialog.h ../libgnome/gnome-config.h @@ -793,7 +803,9 @@ ../config.h gnome-propertybox.h gnome-dialog.h \ ../libgnome/gnome-defs.h ../libgnome/gnome-util.h \ ../libgnome/gnome-i18nP.h gnome-stock.h gnome-pixmap.h \ - ../libgnome/gnome-config.h gnome-preferences.h + ../libgnome/gnome-config.h gnome-preferences.h gnome-mdi.h \ + gnome-app.h gnome-app-helper.h gnome-rootwin.h \ + gnome-mdi-child.h gnome-app-helper.h gnome-rootwin.lo gnome-rootwin.o: gnome-rootwin.c \ ../libgnome/gnome-defs.h gnome-rootwin.h gnome-scores.lo gnome-scores.o: gnome-scores.c ../config.h \ @@ -835,12 +847,12 @@ gnome-font-selector.h gnome-geometry.h gnome-icon-list.h \ gnome-icon-sel.h gnome-less.h gnome-messagebox.h gnome-net.h \ gnome-number-entry.h gnome-popupmenu.h gnome-pixmap.h \ - gnome-preferences.h gnome-propertybox.h gnome-properties.h \ - gnome-scores.h gnome-startup.h gnome-rootwin.h gnome-stock.h \ - gnome-client.h gtkcalendar.h gtkcauldron.h gtk-clock.h \ - gtkdial.h gtk-plug.h gtk-ted.h gtk-socket.h gtkspell.h \ - gnome-dateedit.h gnome-calculator.h gnome-lamp.h gnome-mdi.h \ - gnome-mdi-child.h gnometypebuiltins.h + gnome-preferences.h gnome-mdi.h gnome-rootwin.h \ + gnome-mdi-child.h gnome-propertybox.h gnome-properties.h \ + gnome-scores.h gnome-startup.h gnome-stock.h gnome-client.h \ + gtkcalendar.h gtkcauldron.h gtk-clock.h gtkdial.h gtk-plug.h \ + gtk-ted.h gtk-socket.h gtkspell.h gnome-dateedit.h \ + gnome-calculator.h gnome-lamp.h gnometypebuiltins.h gnometypes.lo gnometypes.o: gnometypes.c libgnomeui.h \ ../libgnome/gnome-defs.h ../libgnome/gnome-parse.h \ ../support/argp.h ../support/getopt.h gnome-uidefs.h \ @@ -856,13 +868,14 @@ gnome-geometry.h gnome-icon-list.h gnome-icon-sel.h \ gnome-less.h gnome-messagebox.h gnome-net.h \ gnome-number-entry.h gnome-popupmenu.h gnome-pixmap.h \ - gnome-preferences.h gnome-propertybox.h gnome-properties.h \ - gnome-scores.h gnome-startup.h gnome-rootwin.h gnome-stock.h \ - gnome-client.h gtkcalendar.h gtkcauldron.h gtk-clock.h \ - gtkdial.h gtk-plug.h gtk-ted.h gtk-socket.h gtkspell.h \ - gnome-dateedit.h gnome-calculator.h gnome-lamp.h gnome-mdi.h \ - gnome-mdi-child.h gnometypebuiltins.h gnometypebuiltins_vars.c \ - gnometypebuiltins_evals.c gnometypebuiltins_ids.c + gnome-preferences.h gnome-mdi.h gnome-rootwin.h \ + gnome-mdi-child.h gnome-propertybox.h gnome-properties.h \ + gnome-scores.h gnome-startup.h gnome-stock.h gnome-client.h \ + gtkcalendar.h gtkcauldron.h gtk-clock.h gtkdial.h gtk-plug.h \ + gtk-ted.h gtk-socket.h gtkspell.h gnome-dateedit.h \ + gnome-calculator.h gnome-lamp.h gnometypebuiltins.h \ + gnometypebuiltins_vars.c gnometypebuiltins_evals.c \ + gnometypebuiltins_ids.c gtk-clock.lo gtk-clock.o: gtk-clock.c gtk-clock.h gtk-plug.lo gtk-plug.o: gtk-plug.c gtk-plug.h gtk-socket.lo gtk-socket.o: gtk-socket.c gtk-socket.h @@ -902,12 +915,12 @@ gnome-font-selector.h gnome-geometry.h gnome-icon-list.h \ gnome-icon-sel.h gnome-less.h gnome-messagebox.h gnome-net.h \ gnome-number-entry.h gnome-popupmenu.h gnome-pixmap.h \ - gnome-preferences.h gnome-propertybox.h gnome-properties.h \ - gnome-scores.h gnome-startup.h gnome-rootwin.h gnome-stock.h \ - gnome-client.h gtkcalendar.h gtkcauldron.h gtk-clock.h \ - gtkdial.h gtk-plug.h gtk-ted.h gtk-socket.h gtkspell.h \ - gnome-dateedit.h gnome-calculator.h gnome-lamp.h gnome-mdi.h \ - gnome-mdi-child.h gnometypebuiltins.h + gnome-preferences.h gnome-mdi.h gnome-rootwin.h \ + gnome-mdi-child.h gnome-propertybox.h gnome-properties.h \ + gnome-scores.h gnome-startup.h gnome-stock.h gnome-client.h \ + gtkcalendar.h gtkcauldron.h gtk-clock.h gtkdial.h gtk-plug.h \ + gtk-ted.h gtk-socket.h gtkspell.h gnome-dateedit.h \ + gnome-calculator.h gnome-lamp.h gnometypebuiltins.h ted_demo.o: ted_demo.c ../config.h ../gnome.h ../support/gnomesupport.h \ ../libgnome/libgnome.h ../libgnome/gnome-defs.h \ ../libgnome/gnome-config.h ../libgnome/gnome-dentry.h \ @@ -928,12 +941,12 @@ gnome-font-selector.h gnome-geometry.h gnome-icon-list.h \ gnome-icon-sel.h gnome-less.h gnome-messagebox.h gnome-net.h \ gnome-number-entry.h gnome-popupmenu.h gnome-pixmap.h \ - gnome-preferences.h gnome-propertybox.h gnome-properties.h \ - gnome-scores.h gnome-startup.h gnome-rootwin.h gnome-stock.h \ - gnome-client.h gtkcalendar.h gtkcauldron.h gtk-clock.h \ - gtkdial.h gtk-plug.h gtk-ted.h gtk-socket.h gtkspell.h \ - gnome-dateedit.h gnome-calculator.h gnome-lamp.h gnome-mdi.h \ - gnome-mdi-child.h gnometypebuiltins.h gtk-ted.h + gnome-preferences.h gnome-mdi.h gnome-rootwin.h \ + gnome-mdi-child.h gnome-propertybox.h gnome-properties.h \ + gnome-scores.h gnome-startup.h gnome-stock.h gnome-client.h \ + gtkcalendar.h gtkcauldron.h gtk-clock.h gtkdial.h gtk-plug.h \ + gtk-ted.h gtk-socket.h gtkspell.h gnome-dateedit.h \ + gnome-calculator.h gnome-lamp.h gnometypebuiltins.h gtk-ted.h info: info-recursive dvi: dvi-recursive diff -uNr gnome-libs-0.25/libgnomeui/gnome-mdi.c gnome-libs-0.26/libgnomeui/gnome-mdi.c --- gnome-libs-0.25/libgnomeui/gnome-mdi.c Mon Aug 3 15:07:35 1998 +++ gnome-libs-0.26/libgnomeui/gnome-mdi.c Thu Aug 6 12:57:54 1998 @@ -22,6 +22,7 @@ #include "gnome-app.h" #include "gnome-app-helper.h" #include "gnome-stock.h" +#include "gnome-preferences.h" #include "gnome-mdi.h" #include "gnome-mdi-child.h" @@ -256,8 +257,10 @@ static void gnome_mdi_init (GnomeMDI *mdi) { gchar hostname[128] = "\0", pid[12]; - mdi->mode = 0; - mdi->tab_pos = GTK_POS_TOP; + mdi->mode = GNOME_MDI_DEFAULT_MODE; + mdi->tab_pos = gnome_preferences_get_mdi_tab_pos(); + + printf("tp: %d\n", mdi->tab_pos); mdi->children = NULL; mdi->windows = NULL; @@ -1233,10 +1236,15 @@ g_return_if_fail(mdi != NULL); g_return_if_fail(GNOME_IS_MDI(mdi)); - if(mode==-1) + if(mode == GNOME_MDI_DEFAULT_MODE) + mode = gnome_preferences_get_mdi_mode(); + + if(mode == GNOME_MDI_REDRAW) mode = mdi->mode; else if(mdi->mode == mode) return; + + printf("mode: %d\n", mode); /* remove all views from their parents */ child_node = mdi->children; diff -uNr gnome-libs-0.25/libgnomeui/gnome-mdi.h gnome-libs-0.26/libgnomeui/gnome-mdi.h --- gnome-libs-0.25/libgnomeui/gnome-mdi.h Mon Aug 3 15:07:35 1998 +++ gnome-libs-0.26/libgnomeui/gnome-mdi.h Thu Aug 6 12:57:54 1998 @@ -58,10 +58,11 @@ typedef struct _GnomeMDIClass GnomeMDIClass; typedef enum { - GNOME_MDI_MS = 1, GNOME_MDI_NOTEBOOK, - GNOME_MDI_MODAL, GNOME_MDI_TOPLEVEL, + GNOME_MDI_MODAL, + GNOME_MDI_MS, + GNOME_MDI_DEFAULT_MODE = 42, GNOME_MDI_REDRAW = -1 /* do not change mode, just ``redraw'' the display */ } GnomeMDIMode; diff -uNr gnome-libs-0.25/libgnomeui/gnome-preferences.c gnome-libs-0.26/libgnomeui/gnome-preferences.c --- gnome-libs-0.25/libgnomeui/gnome-preferences.c Mon Jul 27 10:01:03 1998 +++ gnome-libs-0.26/libgnomeui/gnome-preferences.c Thu Aug 6 12:57:54 1998 @@ -37,7 +37,9 @@ int toolbar_relief : 1; int dialog_centered : 1; GtkWindowType dialog_type; - GtkWindowPosition dialog_position; + GtkWindowPosition dialog_position; + GnomeMDIMode mdi_mode; + GtkPositionType mdi_tab_pos; }; /* @@ -59,7 +61,9 @@ TRUE, /* Toolbar buttons are relieved */ TRUE, /* Center dialogs over apps when possible */ GTK_WINDOW_DIALOG, /* Dialogs are treated specially */ - GTK_WIN_POS_MOUSE /* Put dialogs at mouse pointer. */ + GTK_WIN_POS_MOUSE, /* Put dialogs at mouse pointer. */ + GNOME_MDI_NOTEBOOK, /* Use notebook MDI mode. */ + GTK_POS_TOP /* Show tabs on top of MDI notebooks. */ }; /* Tons of defines for where to store the preferences. */ @@ -72,6 +76,7 @@ #define DIALOGS "/Gnome/UI_Dialogs/" #define STATUSBAR "/Gnome/UI_StatusBar/" #define APP "/Gnome/UI_GnomeApp/" +#define MDI "/Gnome/UI_MDI/" /* ==================== GnomeDialog ===================== */ @@ -129,6 +134,28 @@ #define TOOLBAR_RELIEF_KEY "Toolbar_relieved_buttons" +/* =========== MDI ================================= */ + +#define MDI_MODE_KEY "MDI_mode" +#define MDI_TAB_POS_KEY "MDI_tab_pos" + +static const gchar * const mdi_modes [] = { + "Notebook", + "Toplevel", + "Modal" +}; + +#define NUM_MDI_MODES 3 + +static const gchar * const tab_positions [] = { + "Left", + "Right", + "Top", + "Bottom" +}; + +#define NUM_TAB_POSITIONS 4 + static gboolean enum_from_strings(gint * setme, gchar * findme, const gchar * const array[], gint N) @@ -242,6 +269,23 @@ prefs.toolbar_relief = b; gnome_config_pop_prefix(); + gnome_config_push_prefix(MDI); + + s = gnome_config_get_string(MDI_MODE_KEY); + + if ( ! enum_from_strings((int*) &prefs.mdi_mode, s, + mdi_modes, NUM_MDI_MODES) ) { + g_warning("Didn't recognize MDI mode in libgnomeui config"); + } + + s = gnome_config_get_string(MDI_TAB_POS_KEY); + + if ( ! enum_from_strings((int*) &prefs.mdi_tab_pos, s, + tab_positions, NUM_TAB_POSITIONS) ) { + g_warning("Didn't recognize MDI notebook tab position in libgnomeui config"); + } + + gnome_config_pop_prefix(); } void gnome_preferences_save(void) @@ -281,6 +325,13 @@ prefs.toolbar_relief); gnome_config_pop_prefix(); + gnome_config_push_prefix(MDI); + + gnome_config_set_string(MDI_MODE_KEY, mdi_modes[prefs.mdi_mode]); + gnome_config_set_string(MDI_TAB_POS_KEY, tab_positions[prefs.mdi_tab_pos]); + + gnome_config_pop_prefix(); + gnome_config_sync(); } @@ -375,5 +426,25 @@ void gnome_preferences_set_dialog_position (GtkWindowPosition p) { prefs.dialog_position = p; +} + +GnomeMDIMode gnome_preferences_get_mdi_mode () +{ + return prefs.mdi_mode; +} + +void gnome_preferences_set_mdi_mode (GnomeMDIMode m) +{ + prefs.mdi_mode = m; +} + +GtkPositionType gnome_preferences_get_mdi_tab_pos () +{ + return prefs.mdi_tab_pos; +} + +void gnome_preferences_set_mdi_tab_pos (GtkPositionType p) +{ + prefs.mdi_tab_pos = p; } diff -uNr gnome-libs-0.25/libgnomeui/gnome-preferences.h gnome-libs-0.26/libgnomeui/gnome-preferences.h --- gnome-libs-0.25/libgnomeui/gnome-preferences.h Mon Jul 27 10:01:03 1998 +++ gnome-libs-0.26/libgnomeui/gnome-preferences.h Thu Aug 6 12:57:54 1998 @@ -11,6 +11,8 @@ #include #include +#include "gnome-mdi.h" + BEGIN_GNOME_DECLS /* Global config choices. App-specific choices are handled in GnomeApp. */ @@ -57,6 +59,12 @@ GTK_WIN_POS_MOUSE */ GtkWindowPosition gnome_preferences_get_dialog_position (); void gnome_preferences_set_dialog_position (GtkWindowPosition p); + +/* default MDI mode and MDI notebook tab position */ +GnomeMDIMode gnome_preferences_get_mdi_mode (); +void gnome_preferences_set_mdi_mode (GnomeMDIMode m); +GtkPositionType gnome_preferences_get_mdi_tab_pos (); +void gnome_preferences_set_mdi_tab_pos (GtkPositionType p); END_GNOME_DECLS diff -uNr gnome-libs-0.25/libgnomeui/gnome-stock.c gnome-libs-0.26/libgnomeui/gnome-stock.c --- gnome-libs-0.25/libgnomeui/gnome-stock.c Wed Aug 5 19:22:42 1998 +++ gnome-libs-0.26/libgnomeui/gnome-stock.c Thu Aug 6 12:57:54 1998 @@ -472,8 +472,8 @@ {GNOME_STOCK_BUTTON_YES, GNOME_STOCK_PIXMAP_REGULAR, N_("Yes"), imlib_button_yes, TB_W, TB_H, TB_W, TB_H}, {GNOME_STOCK_BUTTON_NO, GNOME_STOCK_PIXMAP_REGULAR, N_("No"), imlib_button_no, TB_W, TB_H, TB_W, TB_H}, {GNOME_STOCK_BUTTON_HELP, GNOME_STOCK_PIXMAP_REGULAR, N_("Help"), imlib_help, TIGERT_W, TIGERT_H, TB_W, TB_H}, - {GNOME_STOCK_BUTTON_NEXT, GNOME_STOCK_PIXMAP_REGULAR, N_("Help"), imlib_right_arrow, TIGERT_W, TIGERT_H, TB_W, TB_H}, - {GNOME_STOCK_BUTTON_PREV, GNOME_STOCK_PIXMAP_REGULAR, N_("Help"), imlib_left_arrow, TIGERT_W, TIGERT_H, TB_W, TB_H}, + {GNOME_STOCK_BUTTON_NEXT, GNOME_STOCK_PIXMAP_REGULAR, N_("Next"), imlib_right_arrow, TIGERT_W, TIGERT_H, TB_W, TB_H}, + {GNOME_STOCK_BUTTON_PREV, GNOME_STOCK_PIXMAP_REGULAR, N_("Prev"), imlib_left_arrow, TIGERT_W, TIGERT_H, TB_W, TB_H}, {GNOME_STOCK_MENU_NEW, GNOME_STOCK_PIXMAP_REGULAR, NULL, imlib_new, TIGERT_W, TIGERT_H, MENU_W, MENU_H}, {GNOME_STOCK_MENU_SAVE, GNOME_STOCK_PIXMAP_REGULAR, NULL, imlib_save, TIGERT_W, TIGERT_H, MENU_W, MENU_H}, {GNOME_STOCK_MENU_SAVE_AS, GNOME_STOCK_PIXMAP_REGULAR, NULL, imlib_save_as, TIGERT_W, TIGERT_H, MENU_W, MENU_H}, diff -uNr gnome-libs-0.25/libgnomeui/stock_demo.c gnome-libs-0.26/libgnomeui/stock_demo.c --- gnome-libs-0.25/libgnomeui/stock_demo.c Wed Aug 5 19:22:42 1998 +++ gnome-libs-0.26/libgnomeui/stock_demo.c Thu Aug 6 12:57:54 1998 @@ -566,39 +566,6 @@ gtk_widget_show(w); gtk_table_attach_defaults(table, w, column, column + 1, row + 2, row + 3); - column++; - w = GTK_WIDGET(gnome_stock_pixmap_widget(window, GNOME_STOCK_PIXMAP_TRASH)); - gtk_widget_show(w); - gtk_table_attach_defaults(table, w, column, column + 1, row, row + 1); - w = GTK_WIDGET(gnome_stock_pixmap_widget(window, GNOME_STOCK_MENU_TRASH)); - gtk_widget_show(w); - gtk_table_attach_defaults(table, w, column, column + 1, row + 1, row + 2); - w = gtk_label_new("Trash"); - gtk_widget_show(w); - gtk_table_attach_defaults(table, w, column, column + 1, row + 2, row + 3); - - column++; - w = GTK_WIDGET(gnome_stock_pixmap_widget(window, GNOME_STOCK_PIXMAP_UNDELETE)); - gtk_widget_show(w); - gtk_table_attach_defaults(table, w, column, column + 1, row, row + 1); - w = GTK_WIDGET(gnome_stock_pixmap_widget(window, GNOME_STOCK_MENU_UNDELETE)); - gtk_widget_show(w); - gtk_table_attach_defaults(table, w, column, column + 1, row + 1, row + 2); - w = gtk_label_new("Undelete"); - gtk_widget_show(w); - gtk_table_attach_defaults(table, w, column, column + 1, row + 2, row + 3); - - column++; - w = GTK_WIDGET(gnome_stock_pixmap_widget(window, GNOME_STOCK_PIXMAP_TRASH_FULL)); - gtk_widget_show(w); - gtk_table_attach_defaults(table, w, column, column + 1, row, row + 1); - w = GTK_WIDGET(gnome_stock_pixmap_widget(window, GNOME_STOCK_MENU_TRASH_FULL)); - gtk_widget_show(w); - gtk_table_attach_defaults(table, w, column, column + 1, row + 1, row + 2); - w = gtk_label_new("Trash Full"); - gtk_widget_show(w); - gtk_table_attach_defaults(table, w, column, column + 1, row + 2, row + 3); - column = 0; row += 3; w = GTK_WIDGET(gnome_stock_pixmap_widget(window, GNOME_STOCK_PIXMAP_BACK)); gtk_widget_show(w); @@ -849,6 +816,39 @@ gtk_widget_show(w); gtk_table_attach_defaults(table, w, column, column + 1, row + 2, row + 3); + column++; + w = GTK_WIDGET(gnome_stock_pixmap_widget(window, GNOME_STOCK_PIXMAP_TRASH)); + gtk_widget_show(w); + gtk_table_attach_defaults(table, w, column, column + 1, row, row + 1); + w = GTK_WIDGET(gnome_stock_pixmap_widget(window, GNOME_STOCK_MENU_TRASH)); + gtk_widget_show(w); + gtk_table_attach_defaults(table, w, column, column + 1, row + 1, row + 2); + w = gtk_label_new("Trash"); + gtk_widget_show(w); + gtk_table_attach_defaults(table, w, column, column + 1, row + 2, row + 3); + + column++; + w = GTK_WIDGET(gnome_stock_pixmap_widget(window, GNOME_STOCK_PIXMAP_UNDELETE)); + gtk_widget_show(w); + gtk_table_attach_defaults(table, w, column, column + 1, row, row + 1); + w = GTK_WIDGET(gnome_stock_pixmap_widget(window, GNOME_STOCK_MENU_UNDELETE)); + gtk_widget_show(w); + gtk_table_attach_defaults(table, w, column, column + 1, row + 1, row + 2); + w = gtk_label_new("Undelete"); + gtk_widget_show(w); + gtk_table_attach_defaults(table, w, column, column + 1, row + 2, row + 3); + + column++; + w = GTK_WIDGET(gnome_stock_pixmap_widget(window, GNOME_STOCK_PIXMAP_TRASH_FULL)); + gtk_widget_show(w); + gtk_table_attach_defaults(table, w, column, column + 1, row, row + 1); + w = GTK_WIDGET(gnome_stock_pixmap_widget(window, GNOME_STOCK_MENU_TRASH_FULL)); + gtk_widget_show(w); + gtk_table_attach_defaults(table, w, column, column + 1, row + 1, row + 2); + w = gtk_label_new("Trash Full"); + gtk_widget_show(w); + gtk_table_attach_defaults(table, w, column, column + 1, row + 2, row + 3); + #ifdef USE_BUTTON column++; w = gnome_pixmap_new_from_file(gnome_pixmap_file("gnome-unknown.png")); @@ -930,32 +930,37 @@ hbox = gtk_hbox_new(FALSE, 0); gtk_container_border_width(GTK_CONTAINER(hbox), 5); gtk_widget_show(hbox); - gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); - w = gnome_stock_button(GNOME_STOCK_BUTTON_CLOSE); + w = gnome_stock_button(GNOME_STOCK_BUTTON_NEXT); gtk_widget_show(w); gtk_box_pack_end(GTK_BOX(hbox), w, FALSE, FALSE, 3); - gtk_signal_connect_object(GTK_OBJECT(w), "clicked", - (GtkSignalFunc)message_dlg, - NULL); - w = gnome_stock_button(GNOME_STOCK_BUTTON_HELP); + w = gnome_stock_button(GNOME_STOCK_BUTTON_PREV); gtk_widget_show(w); gtk_box_pack_end(GTK_BOX(hbox), w, FALSE, FALSE, 3); - w = gnome_stock_button(GNOME_STOCK_BUTTON_NEXT); + w = gnome_stock_button(GNOME_STOCK_BUTTON_NO); gtk_widget_show(w); gtk_box_pack_end(GTK_BOX(hbox), w, FALSE, FALSE, 3); - w = gnome_stock_button(GNOME_STOCK_BUTTON_PREV); + w = gnome_stock_button(GNOME_STOCK_BUTTON_YES); gtk_widget_show(w); gtk_box_pack_end(GTK_BOX(hbox), w, FALSE, FALSE, 3); - w = gnome_stock_button(GNOME_STOCK_BUTTON_NO); + hbox = gtk_hbox_new(FALSE, 0); + gtk_container_border_width(GTK_CONTAINER(hbox), 5); + gtk_widget_show(hbox); + gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); + + w = gnome_stock_button(GNOME_STOCK_BUTTON_CLOSE); gtk_widget_show(w); gtk_box_pack_end(GTK_BOX(hbox), w, FALSE, FALSE, 3); + gtk_signal_connect_object(GTK_OBJECT(w), "clicked", + (GtkSignalFunc)message_dlg, + NULL); - w = gnome_stock_button(GNOME_STOCK_BUTTON_YES); + w = gnome_stock_button(GNOME_STOCK_BUTTON_HELP); gtk_widget_show(w); gtk_box_pack_end(GTK_BOX(hbox), w, FALSE, FALSE, 3); diff -uNr gnome-libs-0.25/po/ChangeLog gnome-libs-0.26/po/ChangeLog --- gnome-libs-0.25/po/ChangeLog Mon Aug 3 15:07:35 1998 +++ gnome-libs-0.26/po/ChangeLog Thu Aug 6 12:53:03 1998 @@ -1,3 +1,8 @@ +1998-08-06 Federico Mena Quintero + + * POTFILES.in: Removed spurious files that are not in + gtk-xmhtml/Makefile.am. + 1998-08-03 Nuno Ferreira * pt.po: Updated translations. diff -uNr gnome-libs-0.25/po/POTFILES.in gnome-libs-0.26/po/POTFILES.in --- gnome-libs-0.25/po/POTFILES.in Wed Aug 5 11:38:48 1998 +++ gnome-libs-0.26/po/POTFILES.in Thu Aug 6 12:52:20 1998 @@ -2,11 +2,7 @@ gnome-hello/gnome-hello-3-parse-args.c gnome-hello/gnome-hello-4-SM.c gnome-hello/gnome-hello-7-mdi.c -gnome-hello/gnome-hello.c -gtk-xmhtml/Parser-motif.c -gtk-xmhtml/Parser.c gtk-xmhtml/StringUtil.c -gtk-xmhtml/XCC.c gtk-xmhtml/XmHTML-motif.c gtk-xmhtml/XmHTML.c gtk-xmhtml/XmHTMLI.h @@ -14,7 +10,6 @@ gtk-xmhtml/colors.c gtk-xmhtml/fonts.c gtk-xmhtml/format.c -gtk-xmhtml/forms.c gtk-xmhtml/frames.c gtk-xmhtml/gtk-forms.c gtk-xmhtml/gtk-xmhtml.c diff -uNr gnome-libs-0.25/po/cat-id-tbl.c gnome-libs-0.26/po/cat-id-tbl.c --- gnome-libs-0.25/po/cat-id-tbl.c Wed Aug 5 12:01:47 1998 +++ gnome-libs-0.26/po/cat-id-tbl.c Thu Aug 6 13:02:20 1998 @@ -37,185 +37,177 @@ {"MDI Mode", 28}, {"Children/", 29}, {"\ -%s: A gnomified 'Hello World' program\n\ \n\ -Usage: %s [--help] [--version]\n\ -\n\ -Options:\n\ - --help display this help and exit\n\ - --version output version information and exit\n", 30}, - {"Gnome Hello %s.\n", 31}, - {"Options error\n", 32}, - {"\ -\n\ -Generic options", 33}, - {"Author:", 34}, - {"Authors:", 35}, - {"Authors: ", 36}, - {"About", 37}, - {" (press return)", 38}, - {"ERROR: ", 39}, - {"Warning: ", 40}, - {"y", 41}, - {"yes", 42}, - {"n", 43}, - {"no", 44}, - {" (yes or no)", 45}, - {" - OK? (yes or no)", 46}, - {"Progress", 47}, - {"Top", 48}, - {"Bottom", 49}, - {"Left", 50}, - {"Right", 51}, - {"Configure toolbar", 52}, - {"DEG", 53}, - {"RAD", 54}, - {"GRAD", 55}, - {"1/x", 56}, - {"x^2", 57}, - {"SQRT", 58}, - {"CE/C", 59}, - {"AC", 60}, - {"sin", 61}, - {"cos", 62}, - {"tan", 63}, - {"e", 64}, - {"EE", 65}, - {"log", 66}, - {"ln", 67}, - {"x^y", 68}, - {"PI", 69}, - {"x!", 70}, - {"(", 71}, - {")", 72}, - {"/", 73}, - {"STO", 74}, - {"7", 75}, - {"8", 76}, - {"9", 77}, - {"*", 78}, - {"RCL", 79}, - {"4", 80}, - {"5", 81}, - {"6", 82}, - {"-", 83}, - {"SUM", 84}, - {"1", 85}, - {"2", 86}, - {"3", 87}, - {"+", 88}, - {"EXC", 89}, - {"0", 90}, - {".", 91}, - {"+/-", 92}, - {"=", 93}, - {"INV", 94}, - {"Specify session management id", 95}, - {"Specify id of cloned client", 96}, - {"Disable connection to session manager", 97}, - {"Calendar", 98}, - {"Name:", 99}, - {"Comment:", 100}, - {"Command:", 101}, - {"Type:", 102}, - {"Run in Terminal", 103}, - {"Try this before using:", 104}, - {"Documentation:", 105}, - {"Easy", 106}, - {"Advanced", 107}, +Generic options", 30}, + {"Author:", 31}, + {"Authors:", 32}, + {"Authors: ", 33}, + {"About", 34}, + {" (press return)", 35}, + {"ERROR: ", 36}, + {"Warning: ", 37}, + {"y", 38}, + {"yes", 39}, + {"n", 40}, + {"no", 41}, + {" (yes or no)", 42}, + {" - OK? (yes or no)", 43}, + {"Progress", 44}, + {"Top", 45}, + {"Bottom", 46}, + {"Left", 47}, + {"Right", 48}, + {"Configure toolbar", 49}, + {"DEG", 50}, + {"RAD", 51}, + {"GRAD", 52}, + {"1/x", 53}, + {"x^2", 54}, + {"SQRT", 55}, + {"CE/C", 56}, + {"AC", 57}, + {"sin", 58}, + {"cos", 59}, + {"tan", 60}, + {"e", 61}, + {"EE", 62}, + {"log", 63}, + {"ln", 64}, + {"x^y", 65}, + {"PI", 66}, + {"x!", 67}, + {"(", 68}, + {")", 69}, + {"/", 70}, + {"STO", 71}, + {"7", 72}, + {"8", 73}, + {"9", 74}, + {"*", 75}, + {"RCL", 76}, + {"4", 77}, + {"5", 78}, + {"6", 79}, + {"-", 80}, + {"SUM", 81}, + {"1", 82}, + {"2", 83}, + {"3", 84}, + {"+", 85}, + {"EXC", 86}, + {"0", 87}, + {".", 88}, + {"+/-", 89}, + {"=", 90}, + {"INV", 91}, + {"Specify session management id", 92}, + {"Specify id of cloned client", 93}, + {"Disable connection to session manager", 94}, + {"Calendar", 95}, + {"Name:", 96}, + {"Comment:", 97}, + {"Command:", 98}, + {"Type:", 99}, + {"Run in Terminal", 100}, + {"Try this before using:", 101}, + {"Documentation:", 102}, + {"Easy", 103}, + {"Advanced", 104}, {"\ No\n\ -icon", 108}, +icon", 105}, {"\ Couldn't\n\ load\n\ -icon", 109}, - {"Choose an icon", 110}, - {"Select file", 111}, - {"Browse...", 112}, - {"Loading Icons...", 113}, - {"\ -\n\ -Gtk toolkit options", 114}, - {"DISPLAY", 115}, - {"X display to use", 116}, - {"Don't use X shared memory extension", 117}, - {"NAME", 118}, - {"FIXME", 119}, - {"CLASS", 120}, - {"HOST", 121}, - {"PORT", 122}, - {"STYLE", 123}, - {"Information", 124}, - {"Warning", 125}, - {"Error", 126}, - {"Question", 127}, - {"Message", 128}, - {"Calculator", 129}, - {"Calculator...", 130}, - {"Top Ten", 131}, - {"User", 132}, - {"Score", 133}, - {"Date", 134}, - {"OK", 135}, - {"Apply", 136}, - {"Cancel", 137}, - {"Close", 138}, - {"Yes", 139}, - {"No", 140}, - {"Menu Accelerator Keys", 141}, - {"Global", 142}, - {"Menu Item", 143}, - {"Accelerator", 144}, +icon", 106}, + {"Choose an icon", 107}, + {"Select file", 108}, + {"Browse...", 109}, + {"Loading Icons...", 110}, + {"\ +\n\ +Gtk toolkit options", 111}, + {"DISPLAY", 112}, + {"X display to use", 113}, + {"Don't use X shared memory extension", 114}, + {"NAME", 115}, + {"FIXME", 116}, + {"CLASS", 117}, + {"HOST", 118}, + {"PORT", 119}, + {"STYLE", 120}, + {"Information", 121}, + {"Warning", 122}, + {"Error", 123}, + {"Question", 124}, + {"Message", 125}, + {"Calculator", 126}, + {"Calculator...", 127}, + {"Top Ten", 128}, + {"User", 129}, + {"Score", 130}, + {"Date", 131}, + {"OK", 132}, + {"Apply", 133}, + {"Cancel", 134}, + {"Close", 135}, + {"Yes", 136}, + {"No", 137}, + {"Next", 138}, + {"Prev", 139}, + {"Menu Accelerator Keys", 140}, + {"Global", 141}, + {"Menu Item", 142}, + {"Accelerator", 143}, {"\ No, and ignore\n\ -future SIGSEGV's", 145}, +future SIGSEGV's", 144}, {"\ Application \"%s\" has a bug.\n\ SIGSEGV received at PC %#lx in PID %d.\n\ \n\ \n\ -Do you want to exit this program?", 146}, - {"New...", 147}, - {"Open...", 148}, - {"Save", 149}, - {"Save as...", 150}, - {"Print...", 151}, - {"Setup Page...", 152}, - {"Quit", 153}, - {"Undo", 154}, - {"Redo", 155}, - {"Delete", 156}, - {"Cut", 157}, - {"Copy", 158}, - {"Paste", 159}, - {"Properties...", 160}, - {"Preferences...", 161}, - {"Scores...", 162}, - {"Edit", 163}, - {"Give this help list", 164}, - {"Give a short usage message", 165}, - {"Set the program name", 166}, - {"Hang for SECS seconds (default 3600)", 167}, - {"Print program version", 168}, - {"(PROGRAM ERROR) No version known!?", 169}, - {"%s: Too many arguments\n", 170}, - {"(PROGRAM ERROR) Option should have been recognized!?", 171}, - {"Unknown system error", 172}, - {"%s: option `%s' is ambiguous\n", 173}, - {"%s: option `--%s' doesn't allow an argument\n", 174}, - {"%s: option `%c%s' doesn't allow an argument\n", 175}, - {"%s: option `%s' requires an argument\n", 176}, - {"%s: unrecognized option `--%s'\n", 177}, - {"%s: unrecognized option `%c%s'\n", 178}, - {"%s: illegal option -- %c\n", 179}, - {"%s: invalid option -- %c\n", 180}, - {"%s: option requires an argument -- %c\n", 181}, - {"%s: option `-W %s' is ambiguous\n", 182}, - {"%s: option `-W %s' doesn't allow an argument\n", 183}, - {"The user chose Yes/OK with data:\n", 184}, - {"The user chose No/Cancel with data:\n", 185}, - {"Weird number in reply callback", 186}, +Do you want to exit this program?", 145}, + {"New...", 146}, + {"Open...", 147}, + {"Save", 148}, + {"Save as...", 149}, + {"Print...", 150}, + {"Setup Page...", 151}, + {"Quit", 152}, + {"Undo", 153}, + {"Redo", 154}, + {"Delete", 155}, + {"Cut", 156}, + {"Copy", 157}, + {"Paste", 158}, + {"Properties...", 159}, + {"Preferences...", 160}, + {"Scores...", 161}, + {"Edit", 162}, + {"Give this help list", 163}, + {"Give a short usage message", 164}, + {"Set the program name", 165}, + {"Hang for SECS seconds (default 3600)", 166}, + {"Print program version", 167}, + {"(PROGRAM ERROR) No version known!?", 168}, + {"%s: Too many arguments\n", 169}, + {"(PROGRAM ERROR) Option should have been recognized!?", 170}, + {"Unknown system error", 171}, + {"%s: option `%s' is ambiguous\n", 172}, + {"%s: option `--%s' doesn't allow an argument\n", 173}, + {"%s: option `%c%s' doesn't allow an argument\n", 174}, + {"%s: option `%s' requires an argument\n", 175}, + {"%s: unrecognized option `--%s'\n", 176}, + {"%s: unrecognized option `%c%s'\n", 177}, + {"%s: illegal option -- %c\n", 178}, + {"%s: invalid option -- %c\n", 179}, + {"%s: option requires an argument -- %c\n", 180}, + {"%s: option `-W %s' is ambiguous\n", 181}, + {"%s: option `-W %s' doesn't allow an argument\n", 182}, + {"The user chose Yes/OK with data:\n", 183}, + {"The user chose No/Cancel with data:\n", 184}, + {"Weird number in reply callback", 185}, }; -int _msg_tbl_length = 186; +int _msg_tbl_length = 185; diff -uNr gnome-libs-0.25/po/gnome-libs.pot gnome-libs-0.26/po/gnome-libs.pot --- gnome-libs-0.25/po/gnome-libs.pot Wed Aug 5 19:38:02 1998 +++ gnome-libs-0.26/po/gnome-libs.pot Thu Aug 6 13:02:20 1998 @@ -1,26 +1,26 @@ msgid "" msgstr "" -"Date: 1998-08-05 19:38:01-0400\n" +"Date: 1998-08-06 13:02:18-0400\n" "From: \n" "Content-Type: text/plain; charset=\n" "Xgettext-Options: --default-domain=gnome-libs --directory=.. --add-comments --keyword=_ --keyword=N_ --files-from=./POTFILES.in\n" -"Files: gnome-hello/gnome-hello-2-i18n.c gnome-hello/gnome-hello-3-parse-args.c gnome-hello/gnome-hello-4-SM.c gnome-hello/gnome-hello-7-mdi.c gnome-hello/gnome-hello.c gtk-xmhtml/Parser-motif.c gtk-xmhtml/Parser.c gtk-xmhtml/StringUtil.c gtk-xmhtml/XCC.c gtk-xmhtml/XmHTML-motif.c gtk-xmhtml/XmHTML.c gtk-xmhtml/XmHTMLI.h gtk-xmhtml/callbacks.c gtk-xmhtml/colors.c gtk-xmhtml/fonts.c gtk-xmhtml/format.c gtk-xmhtml/forms.c gtk-xmhtml/frames.c gtk-xmhtml/gtk-forms.c gtk-xmhtml/gtk-xmhtml.c gtk-xmhtml/images.c gtk-xmhtml/layout.c gtk-xmhtml/map.c gtk-xmhtml/miniparse.h gtk-xmhtml/paint.c gtk-xmhtml/parse.c gtk-xmhtml/plc.c gtk-xmhtml/readFLG.c gtk-xmhtml/readGIF.c gtk-xmhtml/readGIFplc.c gtk-xmhtml/readJPEGplc.c gtk-xmhtml/readPNG.c gtk-xmhtml/readXPM.c libgnome/gnome-i18n.h libgnome/gnome-i18nP.h libgnome/gnome-parse.c libgnomeui/gnome-about.c libgnomeui/gnome-about.h libgnomeui/gnome-app-helper.c libgnomeui/gnome-app-util.c libgnomeui/gnome-app.c libgnomeui/gnome-calculator.c " -"libgnomeui/gnome-client.c libgnomeui/gnome-dateedit.c libgnomeui/gnome-dentry-edit.c libgnomeui/gnome-file-entry.c libgnomeui/gnome-icon-sel.c libgnomeui/gnome-init.c libgnomeui/gnome-mdi.h libgnomeui/gnome-messagebox.c libgnomeui/gnome-number-entry.c libgnomeui/gnome-scores.c libgnomeui/gnome-scores.h libgnomeui/gnome-stock.c libgnomeui/gnome_segv.c libgnomeui/stock_demo.c support/argp-fmtstream.h support/argp-parse.c support/argp.h support/easy-vsnprintf.c support/error.c support/error.h support/getopt.c test-gnome/testgnome.c\n" +"Files: gnome-hello/gnome-hello-2-i18n.c gnome-hello/gnome-hello-3-parse-args.c gnome-hello/gnome-hello-4-SM.c gnome-hello/gnome-hello-7-mdi.c gtk-xmhtml/StringUtil.c gtk-xmhtml/XmHTML-motif.c gtk-xmhtml/XmHTML.c gtk-xmhtml/XmHTMLI.h gtk-xmhtml/callbacks.c gtk-xmhtml/colors.c gtk-xmhtml/fonts.c gtk-xmhtml/format.c gtk-xmhtml/frames.c gtk-xmhtml/gtk-forms.c gtk-xmhtml/gtk-xmhtml.c gtk-xmhtml/images.c gtk-xmhtml/layout.c gtk-xmhtml/map.c gtk-xmhtml/miniparse.h gtk-xmhtml/paint.c gtk-xmhtml/parse.c gtk-xmhtml/plc.c gtk-xmhtml/readFLG.c gtk-xmhtml/readGIF.c gtk-xmhtml/readGIFplc.c gtk-xmhtml/readJPEGplc.c gtk-xmhtml/readPNG.c gtk-xmhtml/readXPM.c libgnome/gnome-i18n.h libgnome/gnome-i18nP.h libgnome/gnome-parse.c libgnomeui/gnome-about.c libgnomeui/gnome-about.h libgnomeui/gnome-app-helper.c libgnomeui/gnome-app-util.c libgnomeui/gnome-app.c libgnomeui/gnome-calculator.c libgnomeui/gnome-client.c libgnomeui/gnome-dateedit.c libgnomeui/gnome-dentry-edit.c libgnomeui/gnome-file-entry.c " +"libgnomeui/gnome-icon-sel.c libgnomeui/gnome-init.c libgnomeui/gnome-mdi.h libgnomeui/gnome-messagebox.c libgnomeui/gnome-number-entry.c libgnomeui/gnome-scores.c libgnomeui/gnome-scores.h libgnomeui/gnome-stock.c libgnomeui/gnome_segv.c libgnomeui/stock_demo.c support/argp-fmtstream.h support/argp-parse.c support/argp.h support/easy-vsnprintf.c support/error.c support/error.h support/getopt.c test-gnome/testgnome.c\n" -#: gnome-hello/gnome-hello-2-i18n.c:31 gnome-hello/gnome-hello-3-parse-args.c:33 gnome-hello/gnome-hello.c:40 +#: gnome-hello/gnome-hello-2-i18n.c:31 gnome-hello/gnome-hello-3-parse-args.c:33 msgid "File/Exit" msgstr "" -#: gnome-hello/gnome-hello-2-i18n.c:31 gnome-hello/gnome-hello-3-parse-args.c:33 gnome-hello/gnome-hello.c:40 +#: gnome-hello/gnome-hello-2-i18n.c:31 gnome-hello/gnome-hello-3-parse-args.c:33 msgid "E" msgstr "" #. The '...' end indicate that the options open a dialog -#: gnome-hello/gnome-hello-2-i18n.c:33 gnome-hello/gnome-hello-3-parse-args.c:35 gnome-hello/gnome-hello.c:42 +#: gnome-hello/gnome-hello-2-i18n.c:33 gnome-hello/gnome-hello-3-parse-args.c:35 msgid "Help/About..." msgstr "" -#: gnome-hello/gnome-hello-2-i18n.c:33 gnome-hello/gnome-hello-3-parse-args.c:35 gnome-hello/gnome-hello.c:42 +#: gnome-hello/gnome-hello-2-i18n.c:33 gnome-hello/gnome-hello-3-parse-args.c:35 msgid "A" msgstr "" @@ -32,20 +32,20 @@ #. We make a button, bind the 'clicked' signal to hello and setting it #. to be the content of the main window -#: gnome-hello/gnome-hello-2-i18n.c:83 gnome-hello/gnome-hello-3-parse-args.c:113 gnome-hello/gnome-hello-4-SM.c:213 gnome-hello/gnome-hello.c:103 +#: gnome-hello/gnome-hello-2-i18n.c:83 gnome-hello/gnome-hello-3-parse-args.c:113 gnome-hello/gnome-hello-4-SM.c:213 msgid "Hello GNOME" msgstr "" -#: gnome-hello/gnome-hello-2-i18n.c:102 gnome-hello/gnome-hello-3-parse-args.c:132 gnome-hello/gnome-hello-4-SM.c:232 gnome-hello/gnome-hello.c:122 +#: gnome-hello/gnome-hello-2-i18n.c:102 gnome-hello/gnome-hello-3-parse-args.c:132 gnome-hello/gnome-hello-4-SM.c:232 msgid "Hello GNOME\n" msgstr "" -#: gnome-hello/gnome-hello-2-i18n.c:125 gnome-hello/gnome-hello-3-parse-args.c:155 gnome-hello/gnome-hello-4-SM.c:255 gnome-hello/gnome-hello.c:145 +#: gnome-hello/gnome-hello-2-i18n.c:125 gnome-hello/gnome-hello-3-parse-args.c:155 gnome-hello/gnome-hello-4-SM.c:255 msgid "The Hello World Gnomified" msgstr "" #. another comments -#: gnome-hello/gnome-hello-2-i18n.c:130 gnome-hello/gnome-hello-3-parse-args.c:160 gnome-hello/gnome-hello-4-SM.c:260 gnome-hello/gnome-hello.c:150 +#: gnome-hello/gnome-hello-2-i18n.c:130 gnome-hello/gnome-hello-3-parse-args.c:160 gnome-hello/gnome-hello-4-SM.c:260 msgid "GNOME is a civilized software system so we've a \"hello world\" program" msgstr "" @@ -75,7 +75,7 @@ msgid "File" msgstr "" -#: gnome-hello/gnome-hello-4-SM.c:79 gnome-hello/gnome-hello-7-mdi.c:404 libgnomeui/gnome-stock.c:474 libgnomeui/gnome-stock.c:475 libgnomeui/gnome-stock.c:476 libgnomeui/stock_demo.c:342 +#: gnome-hello/gnome-hello-4-SM.c:79 gnome-hello/gnome-hello-7-mdi.c:404 libgnomeui/gnome-stock.c:474 libgnomeui/stock_demo.c:342 msgid "Help" msgstr "" @@ -127,25 +127,6 @@ msgid "Children/" msgstr "" -#: gnome-hello/gnome-hello.c:208 -msgid "" -"%s: A gnomified 'Hello World' program\n" -"\n" -"Usage: %s [--help] [--version]\n" -"\n" -"Options:\n" -" --help display this help and exit\n" -" --version output version information and exit\n" -msgstr "" - -#: gnome-hello/gnome-hello.c:217 -msgid "Gnome Hello %s.\n" -msgstr "" - -#: gnome-hello/gnome-hello.c:231 -msgid "Options error\n" -msgstr "" - #: libgnome/gnome-parse.c:44 msgid "" "\n" @@ -585,6 +566,14 @@ #: libgnomeui/gnome-stock.c:473 msgid "No" +msgstr "" + +#: libgnomeui/gnome-stock.c:475 +msgid "Next" +msgstr "" + +#: libgnomeui/gnome-stock.c:476 +msgid "Prev" msgstr "" #: libgnomeui/gnome-stock.c:1394 diff -uNr gnome-libs-0.25/support/ChangeLog gnome-libs-0.26/support/ChangeLog --- gnome-libs-0.25/support/ChangeLog Mon Aug 3 09:46:23 1998 +++ gnome-libs-0.26/support/ChangeLog Thu Aug 6 12:57:55 1998 @@ -1,3 +1,7 @@ +1998-08-05 Raja R Harinath + + * Makefile.am (noinst_HEADERS): Add `gnomesupport-fake.h'. + 1998-08-02 Raja R Harinath * error.c (program_name): Clean up #ifdef logic some more. diff -uNr gnome-libs-0.25/support/Makefile.am gnome-libs-0.26/support/Makefile.am --- gnome-libs-0.25/support/Makefile.am Wed Jul 29 06:50:19 1998 +++ gnome-libs-0.26/support/Makefile.am Thu Aug 6 12:57:55 1998 @@ -15,7 +15,7 @@ # These are internal headers: they are used only when compiling and # should not be installed -noinst_HEADERS = argp-fmtstream.h argp-namefrob.h +noinst_HEADERS = argp-fmtstream.h argp-namefrob.h gnomesupport-fake.h libgnomesupport_la_SOURCES = long-options.c gnome-argp.c libgnomesupport_la_LIBADD = @LTLIBOBJS@ diff -uNr gnome-libs-0.25/support/Makefile.in gnome-libs-0.26/support/Makefile.in --- gnome-libs-0.25/support/Makefile.in Wed Aug 5 19:58:54 1998 +++ gnome-libs-0.26/support/Makefile.in Thu Aug 6 13:13:01 1998 @@ -139,7 +139,7 @@ # These are internal headers: they are used only when compiling and # should not be installed -@BUILD_GNOME_SUPPORT_TRUE@noinst_HEADERS = argp-fmtstream.h argp-namefrob.h +@BUILD_GNOME_SUPPORT_TRUE@noinst_HEADERS = argp-fmtstream.h argp-namefrob.h gnomesupport-fake.h @BUILD_GNOME_SUPPORT_TRUE@libgnomesupport_la_SOURCES = long-options.c gnome-argp.c @BUILD_GNOME_SUPPORT_TRUE@libgnomesupport_la_LIBADD = @LTLIBOBJS@ diff -uNr gnome-libs-0.25/support/gnomesupport-fake.h gnome-libs-0.26/support/gnomesupport-fake.h --- gnome-libs-0.25/support/gnomesupport-fake.h Wed Dec 31 19:00:00 1969 +++ gnome-libs-0.26/support/gnomesupport-fake.h Thu Jul 30 07:45:59 1998 @@ -0,0 +1,23 @@ +#ifndef GNOMESUPPORT_FAKE_H_ +#define GNOMESUPPORT_FAKE_H_ + +#if HAVE_CONFIG_H +# include +#endif + +#include +#include + +/* Override some of config.h. + Gnomesupport provides the replacements for these, so you actually + HAVE_ them. */ + +#ifndef HAVE_STRERROR +# define HAVE_STRERROR 1 +#endif + +#ifndef HAVE_PROGRAM_INVOCATION_NAME +# define HAVE_PROGRAM_INVOCATION_NAME 1 +#endif + +#endif /* GNOMESUPPORT_FAKE_H_ */ diff -uNr gnome-libs-0.25/test-gnome/Makefile.in gnome-libs-0.26/test-gnome/Makefile.in --- gnome-libs-0.25/test-gnome/Makefile.in Wed Aug 5 19:59:12 1998 +++ gnome-libs-0.26/test-gnome/Makefile.in Thu Aug 6 13:13:20 1998 @@ -306,18 +306,17 @@ ../libgnomeui/gnome-messagebox.h ../libgnomeui/gnome-net.h \ ../libgnomeui/gnome-number-entry.h \ ../libgnomeui/gnome-popupmenu.h ../libgnomeui/gnome-pixmap.h \ - ../libgnomeui/gnome-preferences.h \ + ../libgnomeui/gnome-preferences.h ../libgnomeui/gnome-mdi.h \ + ../libgnomeui/gnome-rootwin.h ../libgnomeui/gnome-mdi-child.h \ ../libgnomeui/gnome-propertybox.h \ ../libgnomeui/gnome-properties.h ../libgnomeui/gnome-scores.h \ - ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-rootwin.h \ - ../libgnomeui/gnome-stock.h ../libgnomeui/gnome-client.h \ - ../libgnomeui/gtkcalendar.h ../libgnomeui/gtkcauldron.h \ - ../libgnomeui/gtk-clock.h ../libgnomeui/gtkdial.h \ - ../libgnomeui/gtk-plug.h ../libgnomeui/gtk-ted.h \ - ../libgnomeui/gtk-socket.h ../libgnomeui/gtkspell.h \ - ../libgnomeui/gnome-dateedit.h ../libgnomeui/gnome-calculator.h \ - ../libgnomeui/gnome-lamp.h ../libgnomeui/gnome-mdi.h \ - ../libgnomeui/gnome-mdi-child.h \ + ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-stock.h \ + ../libgnomeui/gnome-client.h ../libgnomeui/gtkcalendar.h \ + ../libgnomeui/gtkcauldron.h ../libgnomeui/gtk-clock.h \ + ../libgnomeui/gtkdial.h ../libgnomeui/gtk-plug.h \ + ../libgnomeui/gtk-ted.h ../libgnomeui/gtk-socket.h \ + ../libgnomeui/gtkspell.h ../libgnomeui/gnome-dateedit.h \ + ../libgnomeui/gnome-calculator.h ../libgnomeui/gnome-lamp.h \ ../libgnomeui/gnometypebuiltins.h canvas-fifteen.o: canvas-fifteen.c ../config.h testgnome.h ../gnome.h \ ../support/gnomesupport.h ../libgnome/libgnome.h \ @@ -350,18 +349,17 @@ ../libgnomeui/gnome-messagebox.h ../libgnomeui/gnome-net.h \ ../libgnomeui/gnome-number-entry.h \ ../libgnomeui/gnome-popupmenu.h ../libgnomeui/gnome-pixmap.h \ - ../libgnomeui/gnome-preferences.h \ + ../libgnomeui/gnome-preferences.h ../libgnomeui/gnome-mdi.h \ + ../libgnomeui/gnome-rootwin.h ../libgnomeui/gnome-mdi-child.h \ ../libgnomeui/gnome-propertybox.h \ ../libgnomeui/gnome-properties.h ../libgnomeui/gnome-scores.h \ - ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-rootwin.h \ - ../libgnomeui/gnome-stock.h ../libgnomeui/gnome-client.h \ - ../libgnomeui/gtkcalendar.h ../libgnomeui/gtkcauldron.h \ - ../libgnomeui/gtk-clock.h ../libgnomeui/gtkdial.h \ - ../libgnomeui/gtk-plug.h ../libgnomeui/gtk-ted.h \ - ../libgnomeui/gtk-socket.h ../libgnomeui/gtkspell.h \ - ../libgnomeui/gnome-dateedit.h ../libgnomeui/gnome-calculator.h \ - ../libgnomeui/gnome-lamp.h ../libgnomeui/gnome-mdi.h \ - ../libgnomeui/gnome-mdi-child.h \ + ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-stock.h \ + ../libgnomeui/gnome-client.h ../libgnomeui/gtkcalendar.h \ + ../libgnomeui/gtkcauldron.h ../libgnomeui/gtk-clock.h \ + ../libgnomeui/gtkdial.h ../libgnomeui/gtk-plug.h \ + ../libgnomeui/gtk-ted.h ../libgnomeui/gtk-socket.h \ + ../libgnomeui/gtkspell.h ../libgnomeui/gnome-dateedit.h \ + ../libgnomeui/gnome-calculator.h ../libgnomeui/gnome-lamp.h \ ../libgnomeui/gnometypebuiltins.h canvas-primitives.o: canvas-primitives.c ../config.h testgnome.h \ ../gnome.h ../support/gnomesupport.h ../libgnome/libgnome.h \ @@ -394,18 +392,17 @@ ../libgnomeui/gnome-messagebox.h ../libgnomeui/gnome-net.h \ ../libgnomeui/gnome-number-entry.h \ ../libgnomeui/gnome-popupmenu.h ../libgnomeui/gnome-pixmap.h \ - ../libgnomeui/gnome-preferences.h \ + ../libgnomeui/gnome-preferences.h ../libgnomeui/gnome-mdi.h \ + ../libgnomeui/gnome-rootwin.h ../libgnomeui/gnome-mdi-child.h \ ../libgnomeui/gnome-propertybox.h \ ../libgnomeui/gnome-properties.h ../libgnomeui/gnome-scores.h \ - ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-rootwin.h \ - ../libgnomeui/gnome-stock.h ../libgnomeui/gnome-client.h \ - ../libgnomeui/gtkcalendar.h ../libgnomeui/gtkcauldron.h \ - ../libgnomeui/gtk-clock.h ../libgnomeui/gtkdial.h \ - ../libgnomeui/gtk-plug.h ../libgnomeui/gtk-ted.h \ - ../libgnomeui/gtk-socket.h ../libgnomeui/gtkspell.h \ - ../libgnomeui/gnome-dateedit.h ../libgnomeui/gnome-calculator.h \ - ../libgnomeui/gnome-lamp.h ../libgnomeui/gnome-mdi.h \ - ../libgnomeui/gnome-mdi-child.h \ + ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-stock.h \ + ../libgnomeui/gnome-client.h ../libgnomeui/gtkcalendar.h \ + ../libgnomeui/gtkcauldron.h ../libgnomeui/gtk-clock.h \ + ../libgnomeui/gtkdial.h ../libgnomeui/gtk-plug.h \ + ../libgnomeui/gtk-ted.h ../libgnomeui/gtk-socket.h \ + ../libgnomeui/gtkspell.h ../libgnomeui/gnome-dateedit.h \ + ../libgnomeui/gnome-calculator.h ../libgnomeui/gnome-lamp.h \ ../libgnomeui/gnometypebuiltins.h canvas.o: canvas.c ../config.h testgnome.h ../gnome.h \ ../support/gnomesupport.h ../libgnome/libgnome.h \ @@ -438,18 +435,17 @@ ../libgnomeui/gnome-messagebox.h ../libgnomeui/gnome-net.h \ ../libgnomeui/gnome-number-entry.h \ ../libgnomeui/gnome-popupmenu.h ../libgnomeui/gnome-pixmap.h \ - ../libgnomeui/gnome-preferences.h \ + ../libgnomeui/gnome-preferences.h ../libgnomeui/gnome-mdi.h \ + ../libgnomeui/gnome-rootwin.h ../libgnomeui/gnome-mdi-child.h \ ../libgnomeui/gnome-propertybox.h \ ../libgnomeui/gnome-properties.h ../libgnomeui/gnome-scores.h \ - ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-rootwin.h \ - ../libgnomeui/gnome-stock.h ../libgnomeui/gnome-client.h \ - ../libgnomeui/gtkcalendar.h ../libgnomeui/gtkcauldron.h \ - ../libgnomeui/gtk-clock.h ../libgnomeui/gtkdial.h \ - ../libgnomeui/gtk-plug.h ../libgnomeui/gtk-ted.h \ - ../libgnomeui/gtk-socket.h ../libgnomeui/gtkspell.h \ - ../libgnomeui/gnome-dateedit.h ../libgnomeui/gnome-calculator.h \ - ../libgnomeui/gnome-lamp.h ../libgnomeui/gnome-mdi.h \ - ../libgnomeui/gnome-mdi-child.h \ + ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-stock.h \ + ../libgnomeui/gnome-client.h ../libgnomeui/gtkcalendar.h \ + ../libgnomeui/gtkcauldron.h ../libgnomeui/gtk-clock.h \ + ../libgnomeui/gtkdial.h ../libgnomeui/gtk-plug.h \ + ../libgnomeui/gtk-ted.h ../libgnomeui/gtk-socket.h \ + ../libgnomeui/gtkspell.h ../libgnomeui/gnome-dateedit.h \ + ../libgnomeui/gnome-calculator.h ../libgnomeui/gnome-lamp.h \ ../libgnomeui/gnometypebuiltins.h testgnome.o: testgnome.c ../config.h testgnome.h ../gnome.h \ ../support/gnomesupport.h ../libgnome/libgnome.h \ @@ -482,18 +478,17 @@ ../libgnomeui/gnome-messagebox.h ../libgnomeui/gnome-net.h \ ../libgnomeui/gnome-number-entry.h \ ../libgnomeui/gnome-popupmenu.h ../libgnomeui/gnome-pixmap.h \ - ../libgnomeui/gnome-preferences.h \ + ../libgnomeui/gnome-preferences.h ../libgnomeui/gnome-mdi.h \ + ../libgnomeui/gnome-rootwin.h ../libgnomeui/gnome-mdi-child.h \ ../libgnomeui/gnome-propertybox.h \ ../libgnomeui/gnome-properties.h ../libgnomeui/gnome-scores.h \ - ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-rootwin.h \ - ../libgnomeui/gnome-stock.h ../libgnomeui/gnome-client.h \ - ../libgnomeui/gtkcalendar.h ../libgnomeui/gtkcauldron.h \ - ../libgnomeui/gtk-clock.h ../libgnomeui/gtkdial.h \ - ../libgnomeui/gtk-plug.h ../libgnomeui/gtk-ted.h \ - ../libgnomeui/gtk-socket.h ../libgnomeui/gtkspell.h \ - ../libgnomeui/gnome-dateedit.h ../libgnomeui/gnome-calculator.h \ - ../libgnomeui/gnome-lamp.h ../libgnomeui/gnome-mdi.h \ - ../libgnomeui/gnome-mdi-child.h \ + ../libgnomeui/gnome-startup.h ../libgnomeui/gnome-stock.h \ + ../libgnomeui/gnome-client.h ../libgnomeui/gtkcalendar.h \ + ../libgnomeui/gtkcauldron.h ../libgnomeui/gtk-clock.h \ + ../libgnomeui/gtkdial.h ../libgnomeui/gtk-plug.h \ + ../libgnomeui/gtk-ted.h ../libgnomeui/gtk-socket.h \ + ../libgnomeui/gtkspell.h ../libgnomeui/gnome-dateedit.h \ + ../libgnomeui/gnome-calculator.h ../libgnomeui/gnome-lamp.h \ ../libgnomeui/gnometypebuiltins.h bomb.xpm info: