From b3496287b4f5cc38b64d247b064e295efd48d20f Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Fri, 21 Apr 2000 18:37:25 +0000 Subject: [PATCH] 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 --- ChangeLog | 9 +++++++++ libgimp/Makefile.am | 2 ++ libgimp/gimpsignal.c | 2 +- libgimpbase/gimpsignal.c | 2 +- plug-ins/common/png.c | 2 +- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58b73c249a..3195f3878a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Fri Apr 21 11:25:24 PDT 2000 Manish Singh + + * 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 * plug-ins/common/png.c: Fix #9380 as K&R intended :) diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am index 2a08986375..a77915f01a 100644 --- a/libgimp/Makefile.am +++ b/libgimp/Makefile.am @@ -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 \ diff --git a/libgimp/gimpsignal.c b/libgimp/gimpsignal.c index 745c565c2c..e814e35b66 100644 --- a/libgimp/gimpsignal.c +++ b/libgimp/gimpsignal.c @@ -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; } diff --git a/libgimpbase/gimpsignal.c b/libgimpbase/gimpsignal.c index 745c565c2c..e814e35b66 100644 --- a/libgimpbase/gimpsignal.c +++ b/libgimpbase/gimpsignal.c @@ -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; } diff --git a/plug-ins/common/png.c b/plug-ins/common/png.c index d56885a7d1..fd9d89fd86 100644 --- a/plug-ins/common/png.c +++ b/plug-ins/common/png.c @@ -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 */