From c8f7dfc8fac442dd958f8974a5ee7db17a174e4a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 8 Mar 1999 21:59:55 +0000 Subject: [PATCH] A line had been deleted by mistake. * app/devices.c (devices_write_rc): A line had been deleted by mistake. * app/frac.c: Removed some CRs. * app/install.c (install_run): Typo. * modules/module.def: New file. * Makefile.am app/Makefile.am libgimp/Makefile.am modules/Makefile.am: Added Win32 implementation files to distributed file set. --- ChangeLog | 15 +++++++++++++++ Makefile.am | 6 +++++- app/Makefile.am | 6 +++++- app/devices.c | 2 ++ app/dialogs/user-install-dialog.c | 2 +- app/frac.c | 16 ++++++++-------- app/gui/device-status-dialog.c | 2 ++ app/gui/input-dialog.c | 2 ++ app/gui/user-install-dialog.c | 2 +- app/install.c | 2 +- app/user_install.c | 2 +- app/widgets/gimpdeviceinfo.c | 2 ++ app/widgets/gimpdevices.c | 2 ++ libgimp/Makefile.am | 7 ++++++- modules/Makefile.am | 4 ++++ modules/module.def | 3 +++ 16 files changed, 60 insertions(+), 15 deletions(-) create mode 100644 modules/module.def diff --git a/ChangeLog b/ChangeLog index 9bfe8cad9a..94150e9033 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +1999-03-08 Tor Lillqvist + + * app/devices.c (devices_write_rc): A line had been deleted by + mistake. + + * app/frac.c: Removed some CRs. + + * app/install.c (install_run): Typo. + + * modules/module.def: New file. + + * Makefile.am app/Makefile.am libgimp/Makefile.am + modules/Makefile.am: Added Win32 implementation files to + distributed file set. + Mon Mar 8 21:23:10 CET 1999 Marc Lehmann * app/layer_cmds.c: updated gimp_layer_new and gimp_layer_set_mode to diff --git a/Makefile.am b/Makefile.am index 20ff2dd543..e5718d3f9b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,7 @@ bin_SCRIPTS = gimptool EXTRA_DIST = \ README.i18n \ + README.win32 \ ChangeLog.pre-1-0 \ MAINTAINERS \ TODO \ @@ -15,12 +16,15 @@ EXTRA_DIST = \ gimp1_1_splash.ppm \ rmshm \ user_install \ + user_install.bat \ gimp_tips.txt \ ps-menurc \ gimp.1 \ gimptool.1 \ gtkrc.forest2 \ - gimp.m4 + gimp.m4 \ + gimprc.win32 \ + config.h.win32 gimpdata_DATA = \ gimprc \ diff --git a/app/Makefile.am b/app/Makefile.am index e8ef2c5ed7..adc709a41c 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -369,7 +369,11 @@ EXTRA_DIST = \ tools/penedit.xpm \ tools/pennorm.xpm \ tools/penstroke.xpm \ - tools/ptoselection.xpm + tools/ptoselection.xpm \ + makefile.msc \ + gimp.def \ + gimp.rc \ + wilber.ico CPPFLAGS = \ diff --git a/app/devices.c b/app/devices.c index ec29bec6c6..4db5323f36 100644 --- a/app/devices.c +++ b/app/devices.c @@ -625,6 +625,8 @@ devices_write_rc (void) char *filename; FILE *fp; + devices_save_current_info (); + filename = gimp_personal_rc_file ("devicerc"); fp = fopen (filename, "wb"); g_free (filename); diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c index 1d6e41a147..72565e71cf 100644 --- a/app/dialogs/user-install-dialog.c +++ b/app/dialogs/user-install-dialog.c @@ -554,8 +554,8 @@ install_run (InstallCallback callback) } else executable = FALSE; - } #endif /* !NATIVE_WIN32 */ + } if (executable == FALSE) gtk_text_insert (GTK_TEXT (text), font, NULL, NULL, diff --git a/app/frac.c b/app/frac.c index 8c19119f21..ee08531895 100644 --- a/app/frac.c +++ b/app/frac.c @@ -938,8 +938,8 @@ compress_range(gint x, gint y, gint s_log) { } -/* Quantize a value in the range 0.0 .. max to the range 0..imax - * ensuring that 0.0 is encoded as 0 and max as imax. +/* Quantize a value in the range 0.0 .. max to the range 0..imax + * ensuring that 0.0 is encoded as 0 and max as imax. */ static gint quantize(double value, double max, gint imax) { @@ -1203,8 +1203,8 @@ typedef struct map_info_struct map_info *map_head = NULL; /* head of the linked list of all affine maps */ -/* Read the affine map for a range, or split the range if the compressor - did so in the function compress_range(). +/* Read the affine map for a range, or split the range if the compressor + did so in the function compress_range(). */ static void decompress_range(gint x, gint y, gint s_log) @@ -1268,9 +1268,9 @@ decompress_range(gint x, gint y, gint s_log) map->dom_x = map->dom_y = 0; } - /* Scale the range and domain if necessary. This implementation - * uses only an integer scale to make sure that the union of all - * ranges is exactly the scaled image, that ranges never overlap, + /* Scale the range and domain if necessary. This implementation + * uses only an integer scale to make sure that the union of all + * ranges is exactly the scaled image, that ranges never overlap, * and that all range sizes are even. */ if (image_scale != 1) { @@ -1347,7 +1347,7 @@ refine_image() } } -/* Go through all ranges to smooth the transition between adjacent +/* Go through all ranges to smooth the transition between adjacent ranges, except those of minimal size. */ static void diff --git a/app/gui/device-status-dialog.c b/app/gui/device-status-dialog.c index ec29bec6c6..4db5323f36 100644 --- a/app/gui/device-status-dialog.c +++ b/app/gui/device-status-dialog.c @@ -625,6 +625,8 @@ devices_write_rc (void) char *filename; FILE *fp; + devices_save_current_info (); + filename = gimp_personal_rc_file ("devicerc"); fp = fopen (filename, "wb"); g_free (filename); diff --git a/app/gui/input-dialog.c b/app/gui/input-dialog.c index ec29bec6c6..4db5323f36 100644 --- a/app/gui/input-dialog.c +++ b/app/gui/input-dialog.c @@ -625,6 +625,8 @@ devices_write_rc (void) char *filename; FILE *fp; + devices_save_current_info (); + filename = gimp_personal_rc_file ("devicerc"); fp = fopen (filename, "wb"); g_free (filename); diff --git a/app/gui/user-install-dialog.c b/app/gui/user-install-dialog.c index 1d6e41a147..72565e71cf 100644 --- a/app/gui/user-install-dialog.c +++ b/app/gui/user-install-dialog.c @@ -554,8 +554,8 @@ install_run (InstallCallback callback) } else executable = FALSE; - } #endif /* !NATIVE_WIN32 */ + } if (executable == FALSE) gtk_text_insert (GTK_TEXT (text), font, NULL, NULL, diff --git a/app/install.c b/app/install.c index 1d6e41a147..72565e71cf 100644 --- a/app/install.c +++ b/app/install.c @@ -554,8 +554,8 @@ install_run (InstallCallback callback) } else executable = FALSE; - } #endif /* !NATIVE_WIN32 */ + } if (executable == FALSE) gtk_text_insert (GTK_TEXT (text), font, NULL, NULL, diff --git a/app/user_install.c b/app/user_install.c index 1d6e41a147..72565e71cf 100644 --- a/app/user_install.c +++ b/app/user_install.c @@ -554,8 +554,8 @@ install_run (InstallCallback callback) } else executable = FALSE; - } #endif /* !NATIVE_WIN32 */ + } if (executable == FALSE) gtk_text_insert (GTK_TEXT (text), font, NULL, NULL, diff --git a/app/widgets/gimpdeviceinfo.c b/app/widgets/gimpdeviceinfo.c index ec29bec6c6..4db5323f36 100644 --- a/app/widgets/gimpdeviceinfo.c +++ b/app/widgets/gimpdeviceinfo.c @@ -625,6 +625,8 @@ devices_write_rc (void) char *filename; FILE *fp; + devices_save_current_info (); + filename = gimp_personal_rc_file ("devicerc"); fp = fopen (filename, "wb"); g_free (filename); diff --git a/app/widgets/gimpdevices.c b/app/widgets/gimpdevices.c index ec29bec6c6..4db5323f36 100644 --- a/app/widgets/gimpdevices.c +++ b/app/widgets/gimpdevices.c @@ -625,6 +625,8 @@ devices_write_rc (void) char *filename; FILE *fp; + devices_save_current_info (); + filename = gimp_personal_rc_file ("devicerc"); fp = fopen (filename, "wb"); g_free (filename); diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am index 9828b894d0..85caabd497 100644 --- a/libgimp/Makefile.am +++ b/libgimp/Makefile.am @@ -16,7 +16,12 @@ INCLUDES = \ EXTRA_DIST = \ chain.xpm \ - gimpfeatures.h.in + gimpfeatures.h.in \ + makefile.msc \ + gimp.def \ + gimpi.def \ + gimpui.def \ + gimpfeatures.h.win32 lib_LTLIBRARIES = libgimp.la libgimpui.la noinst_LIBRARIES = libgimpi.a diff --git a/modules/Makefile.am b/modules/Makefile.am index bf87e450aa..1a6f853285 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -11,6 +11,10 @@ INCLUDES = \ $(GTK_CFLAGS) \ -I$(includedir) +EXTRA_DIST = \ + makefile.msc \ + module.def + module_LTLIBRARIES = \ libcolorsel_gtk.la \ libcolorsel_triangle.la diff --git a/modules/module.def b/modules/module.def new file mode 100644 index 0000000000..c208c36c84 --- /dev/null +++ b/modules/module.def @@ -0,0 +1,3 @@ +EXPORTS + module_init + module_unload