Commit 72848df0 authored by Manish Singh's avatar Manish Singh
Browse files

make xdelta not built by default, so poor users aren't confused

* configure.in: make xdelta not built by default, so poor users aren't confused

* libgimp/gimp.c
* app/blob.c
* app/errors.c
* plug-ins/script-fu/script-fu-server.c: fixes for glib changes with
s/g_debug/g_on_error_debug/ and s/g_vsprintf/g_strdup_vprintf/

-Yosh
parent 64aa182a
......@@ -721,7 +721,7 @@ blob_ellipse (double xc, double yc, double xp, double yp, double xq, double yq)
if (xprod == 0) /* colinear points */
{
g_print("Colinear points!\n");
g_debug("gsumi");
g_on_error_query("gimp");
}
if (xprod < 0)
......
......@@ -66,7 +66,7 @@ fatal_error (char *fmt, ...)
printf ("\n");
va_end (args);
g_debug (prog_name);
g_on_error_query (prog_name);
app_exit (1);
}
......@@ -82,6 +82,6 @@ terminate (char *fmt, ...)
va_end (args);
if (use_debug_handler)
g_debug (prog_name);
g_on_error_query (prog_name);
gdk_exit (1);
}
......@@ -721,7 +721,7 @@ blob_ellipse (double xc, double yc, double xp, double yp, double xq, double yq)
if (xprod == 0) /* colinear points */
{
g_print("Colinear points!\n");
g_debug("gsumi");
g_on_error_query("gimp");
}
if (xprod < 0)
......
......@@ -721,7 +721,7 @@ blob_ellipse (double xc, double yc, double xp, double yp, double xq, double yq)
if (xprod == 0) /* colinear points */
{
g_print("Colinear points!\n");
g_debug("gsumi");
g_on_error_query("gimp");
}
if (xprod < 0)
......
......@@ -721,7 +721,7 @@ blob_ellipse (double xc, double yc, double xp, double yp, double xq, double yq)
if (xprod == 0) /* colinear points */
{
g_print("Colinear points!\n");
g_debug("gsumi");
g_on_error_query("gimp");
}
if (xprod < 0)
......
......@@ -195,7 +195,9 @@ dnl Test for libmpeg
AC_MSG_WARN(*** MPEG plug-in will not be built (MPEG library not found) ***))
fi
dnl Test for libxdelta
dnl Test for libxdelta (optional)
AC_ARG_WITH(xdelta, [ --with-xdelta compile the xdelta plugin ])
if test "x$with_xdelta" = "xyes"; then
if test -z "$LIBXDELTA_LIB"; then
AC_CHECK_LIB(xdelta, xd_checkin,
xdelta_ok=yes ; LIBXDELTA_LIB='-lxdelta -lglib -lgdbm',
......@@ -218,6 +220,7 @@ dnl Test for libxdelta
fi
fi
fi
fi
dnl Test for libXpm
if test -z "$LIBXPM_LIB"; then
......@@ -322,7 +325,7 @@ if test "$have_glib_inline" = "no"; then
fi
dnl Threads
AC_ARG_WITH(threads, [ --with-threads=[posix] support threading ])
AC_ARG_WITH(threads, [ --with-threads=[posix] support threading ])
THREAD_LIBS=
if test "x$with_threads" = "xposix" || test "x$with_threads" = "xyes"; then
AC_CHECK_LIB(pthread, pthread_attr_init,
......
......@@ -918,7 +918,7 @@ gimp_signal (int signum)
case SIGBUS:
case SIGSEGV:
case SIGFPE:
g_debug (progname);
g_on_error_query (progname);
break;
default:
break;
......
......@@ -125,8 +125,6 @@ static void ok_callback (GtkWidget *widget,
static void cancel_callback (GtkWidget *widget,
gpointer data);
extern char* g_vsprintf (gchar *fmt, va_list *args, va_list *args2);
/*
* Global variables
*/
......@@ -508,10 +506,8 @@ server_log (gchar *format, ...)
char *buf;
va_start (args, format);
va_start (args2, format);
buf = g_vsprintf (format, &args, &args2);
buf = g_strdup_vprintf (format, args);
va_end (args);
va_end (args2);
fputs (buf, server_log_file);
if (server_log_file != stdout)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment