From 2f589a4efdd371c7f3cc31629299d56343c61836 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Mon, 16 Mar 1998 06:33:58 +0000 Subject: [PATCH] configure saves CFLAGS properly all plugins should parse gtkrc now -Yosh --- ChangeLog | 6 ++++++ configure.in | 12 ++++++------ plug-ins/AlienMap/AlienMap.c | 1 + plug-ins/bumpmap/bumpmap.c | 2 +- plug-ins/common/bumpmap.c | 2 +- plug-ins/common/despeckle.c | 8 +++++++- plug-ins/common/destripe.c | 2 +- plug-ins/common/displace.c | 2 +- plug-ins/common/exchange.c | 1 + plug-ins/common/grid.c | 1 + plug-ins/common/papertile.c | 1 + plug-ins/common/png.c | 7 +++++++ plug-ins/common/randomize.c | 2 ++ plug-ins/common/xpm.c | 1 + plug-ins/despeckle/despeckle.c | 8 +++++++- plug-ins/destripe/destripe.c | 2 +- plug-ins/displace/displace.c | 2 +- plug-ins/exchange/exchange.c | 1 + plug-ins/grid/grid.c | 1 + plug-ins/megawidget/megawidget.c | 1 + plug-ins/papertile/papertile.c | 1 + plug-ins/png/png.c | 7 +++++++ plug-ins/randomize/randomize.c | 2 ++ plug-ins/sgi/sgi.c | 7 +++++++ plug-ins/xpm/xpm.c | 1 + 25 files changed, 67 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0748485bf1..ec18aa7cfd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Mar 15 22:32:17 PST 1998 Manish Singh + + * all plugins parse gtkrc now + + * configure.in: save CFLAGS properly + Mon Mar 16 00:28:16 CST 1998 Larry Ewing * app/undo.c: added back in the "extra" update I removed earlier. diff --git a/configure.in b/configure.in index 32cb3db5ed..e720db7f75 100644 --- a/configure.in +++ b/configure.in @@ -62,12 +62,6 @@ AC_PROG_LN_S AC_PROG_MAKE_SET AC_GIMP_CHECK -gimp_save_CFLAGS="$CFLAGS" -gimp_save_LIBS="$LIBS" - -CFLAGS="$GTK_CFLAGS $CFLAGS" -LIBS="$LIBS $GTK_LIBS" - if eval "test x$GCC = xyes"; then if echo "$CFLAGS" | grep "\-Wall" > /dev/null 2> /dev/null; then CFLAGS="$CFLAGS" @@ -90,6 +84,12 @@ if eval "test x$GCC = xyes"; then fi fi +gimp_save_CFLAGS="$CFLAGS" +gimp_save_LIBS="$LIBS" + +CFLAGS="$GTK_CFLAGS $CFLAGS" +LIBS="$LIBS $GTK_LIBS" + dnl Test for Xmu if test -z "$LIBXMU_LIB"; then AC_CHECK_LIB(Xmu, XmuClientWindow, diff --git a/plug-ins/AlienMap/AlienMap.c b/plug-ins/AlienMap/AlienMap.c index 2dda8d34e6..e7dd4a4e88 100644 --- a/plug-ins/AlienMap/AlienMap.c +++ b/plug-ins/AlienMap/AlienMap.c @@ -646,6 +646,7 @@ alienmap_dialog(void) argv[0] = g_strdup("alienmap"); gtk_init(&argc, &argv); + gtk_rc_parse(gimp_gtkrc()); gtk_preview_set_gamma(gimp_gamma()); gtk_preview_set_install_cmap(gimp_install_cmap()); diff --git a/plug-ins/bumpmap/bumpmap.c b/plug-ins/bumpmap/bumpmap.c index d43ee79d98..26569b64c8 100644 --- a/plug-ins/bumpmap/bumpmap.c +++ b/plug-ins/bumpmap/bumpmap.c @@ -798,7 +798,7 @@ bumpmap_dialog(void) argv[0] = g_strdup("bumpmap"); gtk_init(&argc, &argv); - + gtk_rc_parse(gimp_gtkrc()); gdk_set_use_xshm(gimp_use_xshm()); gtk_preview_set_gamma(gimp_gamma()); diff --git a/plug-ins/common/bumpmap.c b/plug-ins/common/bumpmap.c index d43ee79d98..26569b64c8 100644 --- a/plug-ins/common/bumpmap.c +++ b/plug-ins/common/bumpmap.c @@ -798,7 +798,7 @@ bumpmap_dialog(void) argv[0] = g_strdup("bumpmap"); gtk_init(&argc, &argv); - + gtk_rc_parse(gimp_gtkrc()); gdk_set_use_xshm(gimp_use_xshm()); gtk_preview_set_gamma(gimp_gamma()); diff --git a/plug-ins/common/despeckle.c b/plug-ins/common/despeckle.c index b8b1ff4833..0f89363b28 100644 --- a/plug-ins/common/despeckle.c +++ b/plug-ins/common/despeckle.c @@ -43,6 +43,12 @@ * Revision History: * * $Log$ + * Revision 1.6 1998/03/16 06:33:44 yosh + * configure saves CFLAGS properly + * all plugins should parse gtkrc now + * + * -Yosh + * * Revision 1.5 1998/01/25 09:29:23 yosh * Plugin updates * Properly generated aa Makefile (still not built by default) @@ -246,7 +252,7 @@ query(void) "Michael Sweet ", "Michael Sweet ", PLUG_IN_VERSION, - "/Filters/Enhance/Despeckle...", "RGB*, GRAY*", + "/Filters/Enhance/Despeckle", "RGB*, GRAY*", PROC_PLUG_IN, nargs, nreturn_vals, args, return_vals); } diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c index 096d37e7ea..fe3fcc18ed 100644 --- a/plug-ins/common/destripe.c +++ b/plug-ins/common/destripe.c @@ -158,7 +158,7 @@ query(void) "This plug-in tries to remove vertical stripes from an image.", "Marc Lehmann ", "Marc Lehmann ", PLUG_IN_VERSION, - "/Filters/Enhance/Destripe...", + "/Filters/Enhance/Destripe", "RGB*, GRAY*", PROC_PLUG_IN, nargs, nreturn_vals, args, return_vals); } diff --git a/plug-ins/common/displace.c b/plug-ins/common/displace.c index 81b2cfad43..57889eb250 100644 --- a/plug-ins/common/displace.c +++ b/plug-ins/common/displace.c @@ -307,7 +307,7 @@ displace_dialog (GDrawable *drawable) #endif gtk_init (&argc, &argv); - + gtk_rc_parse(gimp_gtkrc()); dlg = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (dlg), "Displace"); gtk_window_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE); diff --git a/plug-ins/common/exchange.c b/plug-ins/common/exchange.c index af216f3f8c..0f4a4b291e 100644 --- a/plug-ins/common/exchange.c +++ b/plug-ins/common/exchange.c @@ -309,6 +309,7 @@ int doDialog() argv[0] = g_strdup("exchange"); gtk_init(&argc, &argv); + gtk_rc_parse(gimp_gtkrc()); /* set up the dialog */ dialog = gtk_dialog_new(); diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c index cf45ccd972..4cd5af4af5 100644 --- a/plug-ins/common/grid.c +++ b/plug-ins/common/grid.c @@ -286,6 +286,7 @@ dialog () argv[0] = g_strdup ("plasma"); gtk_init (&argc, &argv); + gtk_rc_parse(gimp_gtkrc()); dlg = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (dlg), "Grid"); diff --git a/plug-ins/common/papertile.c b/plug-ins/common/papertile.c index d750e775f8..0a0c2a2c9e 100644 --- a/plug-ins/common/papertile.c +++ b/plug-ins/common/papertile.c @@ -332,6 +332,7 @@ static int dialog( void ) gchar **argv = g_new( gchar *, 1 ); argv[0] = g_strdup( DIALOG_CAPTION ); gtk_init( &argc, &argv ); + gtk_rc_parse(gimp_gtkrc()); } /* dialog window */ diff --git a/plug-ins/common/png.c b/plug-ins/common/png.c index aa9f7afc7a..6136cad422 100644 --- a/plug-ins/common/png.c +++ b/plug-ins/common/png.c @@ -37,6 +37,12 @@ * Revision History: * * $Log$ + * Revision 1.3 1998/03/16 06:33:54 yosh + * configure saves CFLAGS properly + * all plugins should parse gtkrc now + * + * -Yosh + * * Revision 1.2 1998/01/05 09:30:23 yosh * Check for div-by-zero in by_color_select.c when threshold is 0 * The text tool handles the no fonts case better @@ -827,6 +833,7 @@ save_dialog(void) argv[0] = g_strdup("png"); gtk_init(&argc, &argv); + gtk_rc_parse(gimp_gtkrc()); /* * Open a dialog window... diff --git a/plug-ins/common/randomize.c b/plug-ins/common/randomize.c index fe13efd63d..4ca4e11f64 100644 --- a/plug-ins/common/randomize.c +++ b/plug-ins/common/randomize.c @@ -703,6 +703,8 @@ randomize_dialog() argv[0] = g_strdup("randomize"); gtk_init(&argc, &argv); + gtk_rc_parse(gimp_gtkrc()); + /* * Open a new dialog, label it and set up its * destroy callback. diff --git a/plug-ins/common/xpm.c b/plug-ins/common/xpm.c index 3a7139737d..6a1e56aa8b 100644 --- a/plug-ins/common/xpm.c +++ b/plug-ins/common/xpm.c @@ -731,6 +731,7 @@ save_dialog () argv[0] = g_strdup ("save"); gtk_init (&argc, &argv); + gtk_rc_parse(gimp_gtkrc()); dlg = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (dlg), "Save as Xpm"); diff --git a/plug-ins/despeckle/despeckle.c b/plug-ins/despeckle/despeckle.c index b8b1ff4833..0f89363b28 100644 --- a/plug-ins/despeckle/despeckle.c +++ b/plug-ins/despeckle/despeckle.c @@ -43,6 +43,12 @@ * Revision History: * * $Log$ + * Revision 1.6 1998/03/16 06:33:44 yosh + * configure saves CFLAGS properly + * all plugins should parse gtkrc now + * + * -Yosh + * * Revision 1.5 1998/01/25 09:29:23 yosh * Plugin updates * Properly generated aa Makefile (still not built by default) @@ -246,7 +252,7 @@ query(void) "Michael Sweet ", "Michael Sweet ", PLUG_IN_VERSION, - "/Filters/Enhance/Despeckle...", "RGB*, GRAY*", + "/Filters/Enhance/Despeckle", "RGB*, GRAY*", PROC_PLUG_IN, nargs, nreturn_vals, args, return_vals); } diff --git a/plug-ins/destripe/destripe.c b/plug-ins/destripe/destripe.c index 096d37e7ea..fe3fcc18ed 100644 --- a/plug-ins/destripe/destripe.c +++ b/plug-ins/destripe/destripe.c @@ -158,7 +158,7 @@ query(void) "This plug-in tries to remove vertical stripes from an image.", "Marc Lehmann ", "Marc Lehmann ", PLUG_IN_VERSION, - "/Filters/Enhance/Destripe...", + "/Filters/Enhance/Destripe", "RGB*, GRAY*", PROC_PLUG_IN, nargs, nreturn_vals, args, return_vals); } diff --git a/plug-ins/displace/displace.c b/plug-ins/displace/displace.c index 81b2cfad43..57889eb250 100644 --- a/plug-ins/displace/displace.c +++ b/plug-ins/displace/displace.c @@ -307,7 +307,7 @@ displace_dialog (GDrawable *drawable) #endif gtk_init (&argc, &argv); - + gtk_rc_parse(gimp_gtkrc()); dlg = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (dlg), "Displace"); gtk_window_position (GTK_WINDOW (dlg), GTK_WIN_POS_MOUSE); diff --git a/plug-ins/exchange/exchange.c b/plug-ins/exchange/exchange.c index af216f3f8c..0f4a4b291e 100644 --- a/plug-ins/exchange/exchange.c +++ b/plug-ins/exchange/exchange.c @@ -309,6 +309,7 @@ int doDialog() argv[0] = g_strdup("exchange"); gtk_init(&argc, &argv); + gtk_rc_parse(gimp_gtkrc()); /* set up the dialog */ dialog = gtk_dialog_new(); diff --git a/plug-ins/grid/grid.c b/plug-ins/grid/grid.c index cf45ccd972..4cd5af4af5 100644 --- a/plug-ins/grid/grid.c +++ b/plug-ins/grid/grid.c @@ -286,6 +286,7 @@ dialog () argv[0] = g_strdup ("plasma"); gtk_init (&argc, &argv); + gtk_rc_parse(gimp_gtkrc()); dlg = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (dlg), "Grid"); diff --git a/plug-ins/megawidget/megawidget.c b/plug-ins/megawidget/megawidget.c index 3894a28fb9..9d61927331 100644 --- a/plug-ins/megawidget/megawidget.c +++ b/plug-ins/megawidget/megawidget.c @@ -91,6 +91,7 @@ mw_app_new(gchar *resname, gchar *appname, gint *runpp){ argv[0] = g_strdup(resname); gtk_init(&argc, &argv); + gtk_rc_parse(gimp_gtkrc()); dlg = gtk_dialog_new(); gtk_object_set_data(GTK_OBJECT(dlg), "runp", runpp); diff --git a/plug-ins/papertile/papertile.c b/plug-ins/papertile/papertile.c index d750e775f8..0a0c2a2c9e 100644 --- a/plug-ins/papertile/papertile.c +++ b/plug-ins/papertile/papertile.c @@ -332,6 +332,7 @@ static int dialog( void ) gchar **argv = g_new( gchar *, 1 ); argv[0] = g_strdup( DIALOG_CAPTION ); gtk_init( &argc, &argv ); + gtk_rc_parse(gimp_gtkrc()); } /* dialog window */ diff --git a/plug-ins/png/png.c b/plug-ins/png/png.c index aa9f7afc7a..6136cad422 100644 --- a/plug-ins/png/png.c +++ b/plug-ins/png/png.c @@ -37,6 +37,12 @@ * Revision History: * * $Log$ + * Revision 1.3 1998/03/16 06:33:54 yosh + * configure saves CFLAGS properly + * all plugins should parse gtkrc now + * + * -Yosh + * * Revision 1.2 1998/01/05 09:30:23 yosh * Check for div-by-zero in by_color_select.c when threshold is 0 * The text tool handles the no fonts case better @@ -827,6 +833,7 @@ save_dialog(void) argv[0] = g_strdup("png"); gtk_init(&argc, &argv); + gtk_rc_parse(gimp_gtkrc()); /* * Open a dialog window... diff --git a/plug-ins/randomize/randomize.c b/plug-ins/randomize/randomize.c index fe13efd63d..4ca4e11f64 100644 --- a/plug-ins/randomize/randomize.c +++ b/plug-ins/randomize/randomize.c @@ -703,6 +703,8 @@ randomize_dialog() argv[0] = g_strdup("randomize"); gtk_init(&argc, &argv); + gtk_rc_parse(gimp_gtkrc()); + /* * Open a new dialog, label it and set up its * destroy callback. diff --git a/plug-ins/sgi/sgi.c b/plug-ins/sgi/sgi.c index ece9a0116a..e11bbc9bb8 100644 --- a/plug-ins/sgi/sgi.c +++ b/plug-ins/sgi/sgi.c @@ -34,6 +34,12 @@ * Revision History: * * $Log$ + * Revision 1.2 1998/03/16 06:33:56 yosh + * configure saves CFLAGS properly + * all plugins should parse gtkrc now + * + * -Yosh + * * Revision 1.1.1.1 1997/11/24 22:04:37 sopwith * Let's try this import one last time. * @@ -674,6 +680,7 @@ save_dialog(void) argv[0] = g_strdup("sgi"); gtk_init(&argc, &argv); + gtk_rc_parse(gimp_gtkrc()); signal(SIGBUS, SIG_DFL); signal(SIGSEGV, SIG_DFL); diff --git a/plug-ins/xpm/xpm.c b/plug-ins/xpm/xpm.c index 3a7139737d..6a1e56aa8b 100644 --- a/plug-ins/xpm/xpm.c +++ b/plug-ins/xpm/xpm.c @@ -731,6 +731,7 @@ save_dialog () argv[0] = g_strdup ("save"); gtk_init (&argc, &argv); + gtk_rc_parse(gimp_gtkrc()); dlg = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (dlg), "Save as Xpm");