gimpsignal.[ch] needs to go into libgimp, since it is used in gimp.c

* libgimp/Makefile.am: gimpsignal.[ch] needs to go into libgimp,
since it is used in gimp.c

* libgimp/gimpsignal.c: use g_error instead of gimp_fatal_error

* plug-ins/common/png.c: typo fix for Nick's previous commit

-Yosh
This commit is contained in:
Manish Singh 2000-04-21 18:37:25 +00:00
parent ab4d26d21a
commit b3496287b4
5 changed files with 14 additions and 3 deletions

View File

@ -1,3 +1,12 @@
Fri Apr 21 11:25:24 PDT 2000 Manish Singh <yosh@gimp.org>
* libgimp/Makefile.am: gimpsignal.[ch] needs to go into libgimp,
since it is used in gimp.c
* libgimp/gimpsignal.c: use g_error instead of gimp_fatal_error
* plug-ins/common/png.c: typo fix for Nick's previous commit
2000-04-21 Nick Lamb <njl195@zepler.org.uk>
* plug-ins/common/png.c: Fix #9380 as K&R intended :)

View File

@ -98,6 +98,7 @@ libgimp_la_SOURCES = \
gimpprotocol.c \
gimpprotocol.h \
gimpselection.c \
gimpsignal.c \
gimptile.c \
gimpunit.c \
gimpunit.h \
@ -158,6 +159,7 @@ gimpinclude_HEADERS = \
gimppatheditor.h \
gimppixmap.h \
gimpquerybox.h \
gimpsignal.h \
gimpsizeentry.h \
gimpui.h \
gimpunit.h \

View File

@ -67,6 +67,6 @@ gimp_signal_private (gint signum, void (*gimp_sighandler)(int), gint sa_flags)
ret = sigaction (signum, &sa, &osa);
if (ret < 0)
gimp_fatal_error ("unable to set handler for signal %d\n", signum);
g_error ("unable to set handler for signal %d\n", signum);
return osa.sa_handler;
}

View File

@ -67,6 +67,6 @@ gimp_signal_private (gint signum, void (*gimp_sighandler)(int), gint sa_flags)
ret = sigaction (signum, &sa, &osa);
if (ret < 0)
gimp_fatal_error ("unable to set handler for signal %d\n", signum);
g_error ("unable to set handler for signal %d\n", signum);
return osa.sa_handler;
}

View File

@ -361,7 +361,7 @@ load_image (gchar *filename) /* I - File to load */
end, /* Ending tile row */
num; /* Number of rows to load */
FILE *fp; /* File pointer */
volatile gint32 image, /* Image -- preserved against setjmp() */
volatile gint32 image; /* Image -- preserved against setjmp() */
gint32 layer; /* Layer */
GDrawable *drawable; /* Drawable for layer */
GPixelRgn pixel_rgn; /* Pixel region for layer */