From 7ee605514bbc8488c44a8bcb29d4281f875f1e8e Mon Sep 17 00:00:00 2001 From: Adrian Likins Date: Mon, 22 Jun 1998 20:28:48 +0000 Subject: [PATCH] just a minor fix up for sven.. in color_select.c and plug_in.c just a minor fix up for sven.. in color_select.c and plug_in.c -adrian --- app/actions/plug-in-commands.c | 2 +- app/color_select.c | 3 ++- app/gui/color-select.c | 3 ++- app/gui/plug-in-commands.c | 2 +- app/gui/plug-in-menus.c | 2 +- app/menus/plug-in-menus.c | 2 +- app/plug-in/gimpplugin-message.c | 2 +- app/plug-in/gimpplugin-progress.c | 2 +- app/plug-in/gimpplugin.c | 2 +- app/plug-in/gimppluginmanager-call.c | 2 +- app/plug-in/gimppluginmanager-run.c | 2 +- app/plug-in/gimppluginmanager.c | 2 +- app/plug-in/gimppluginshm.c | 2 +- app/plug-in/plug-in-def.c | 2 +- app/plug-in/plug-in-message.c | 2 +- app/plug-in/plug-in-params.c | 2 +- app/plug-in/plug-in-progress.c | 2 +- app/plug-in/plug-in-run.c | 2 +- app/plug-in/plug-in-shm.c | 2 +- app/plug-in/plug-in.c | 2 +- app/plug-in/plug-ins.c | 2 +- app/plug_in.c | 2 +- libgimpwidgets/gimpcolorselect.c | 3 ++- 23 files changed, 26 insertions(+), 23 deletions(-) diff --git a/app/actions/plug-in-commands.c b/app/actions/plug-in-commands.c index c5f3e506af..1f7abd0b03 100644 --- a/app/actions/plug-in-commands.c +++ b/app/actions/plug-in-commands.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/app/color_select.c b/app/color_select.c index 2c00503310..269b050ac8 100644 --- a/app/color_select.c +++ b/app/color_select.c @@ -23,6 +23,7 @@ #include "colormaps.h" #include "errors.h" #include "gimprc.h" +#include "session.h" #define XY_DEF_WIDTH 240 #define XY_DEF_HEIGHT 240 @@ -183,7 +184,7 @@ color_select_new (int r, gtk_window_set_wmclass (GTK_WINDOW (csp->shell), "color_selection", "Gimp"); gtk_window_set_title (GTK_WINDOW (csp->shell), "Color Selection"); gtk_window_set_policy (GTK_WINDOW (csp->shell), FALSE, FALSE, FALSE); - gtk_widget_set_uposition (csp->shell, color_select_x, color_select_y); + /* handle the wm close signal */ gtk_signal_connect (GTK_OBJECT (csp->shell), "delete_event", diff --git a/app/gui/color-select.c b/app/gui/color-select.c index 2c00503310..269b050ac8 100644 --- a/app/gui/color-select.c +++ b/app/gui/color-select.c @@ -23,6 +23,7 @@ #include "colormaps.h" #include "errors.h" #include "gimprc.h" +#include "session.h" #define XY_DEF_WIDTH 240 #define XY_DEF_HEIGHT 240 @@ -183,7 +184,7 @@ color_select_new (int r, gtk_window_set_wmclass (GTK_WINDOW (csp->shell), "color_selection", "Gimp"); gtk_window_set_title (GTK_WINDOW (csp->shell), "Color Selection"); gtk_window_set_policy (GTK_WINDOW (csp->shell), FALSE, FALSE, FALSE); - gtk_widget_set_uposition (csp->shell, color_select_x, color_select_y); + /* handle the wm close signal */ gtk_signal_connect (GTK_OBJECT (csp->shell), "delete_event", diff --git a/app/gui/plug-in-commands.c b/app/gui/plug-in-commands.c index c5f3e506af..1f7abd0b03 100644 --- a/app/gui/plug-in-commands.c +++ b/app/gui/plug-in-commands.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/app/gui/plug-in-menus.c b/app/gui/plug-in-menus.c index c5f3e506af..1f7abd0b03 100644 --- a/app/gui/plug-in-menus.c +++ b/app/gui/plug-in-menus.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/app/menus/plug-in-menus.c b/app/menus/plug-in-menus.c index c5f3e506af..1f7abd0b03 100644 --- a/app/menus/plug-in-menus.c +++ b/app/menus/plug-in-menus.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/app/plug-in/gimpplugin-message.c b/app/plug-in/gimpplugin-message.c index c5f3e506af..1f7abd0b03 100644 --- a/app/plug-in/gimpplugin-message.c +++ b/app/plug-in/gimpplugin-message.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/app/plug-in/gimpplugin-progress.c b/app/plug-in/gimpplugin-progress.c index c5f3e506af..1f7abd0b03 100644 --- a/app/plug-in/gimpplugin-progress.c +++ b/app/plug-in/gimpplugin-progress.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/app/plug-in/gimpplugin.c b/app/plug-in/gimpplugin.c index c5f3e506af..1f7abd0b03 100644 --- a/app/plug-in/gimpplugin.c +++ b/app/plug-in/gimpplugin.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/app/plug-in/gimppluginmanager-call.c b/app/plug-in/gimppluginmanager-call.c index c5f3e506af..1f7abd0b03 100644 --- a/app/plug-in/gimppluginmanager-call.c +++ b/app/plug-in/gimppluginmanager-call.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/app/plug-in/gimppluginmanager-run.c b/app/plug-in/gimppluginmanager-run.c index c5f3e506af..1f7abd0b03 100644 --- a/app/plug-in/gimppluginmanager-run.c +++ b/app/plug-in/gimppluginmanager-run.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/app/plug-in/gimppluginmanager.c b/app/plug-in/gimppluginmanager.c index c5f3e506af..1f7abd0b03 100644 --- a/app/plug-in/gimppluginmanager.c +++ b/app/plug-in/gimppluginmanager.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/app/plug-in/gimppluginshm.c b/app/plug-in/gimppluginshm.c index c5f3e506af..1f7abd0b03 100644 --- a/app/plug-in/gimppluginshm.c +++ b/app/plug-in/gimppluginshm.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/app/plug-in/plug-in-def.c b/app/plug-in/plug-in-def.c index c5f3e506af..1f7abd0b03 100644 --- a/app/plug-in/plug-in-def.c +++ b/app/plug-in/plug-in-def.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/app/plug-in/plug-in-message.c b/app/plug-in/plug-in-message.c index c5f3e506af..1f7abd0b03 100644 --- a/app/plug-in/plug-in-message.c +++ b/app/plug-in/plug-in-message.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/app/plug-in/plug-in-params.c b/app/plug-in/plug-in-params.c index c5f3e506af..1f7abd0b03 100644 --- a/app/plug-in/plug-in-params.c +++ b/app/plug-in/plug-in-params.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/app/plug-in/plug-in-progress.c b/app/plug-in/plug-in-progress.c index c5f3e506af..1f7abd0b03 100644 --- a/app/plug-in/plug-in-progress.c +++ b/app/plug-in/plug-in-progress.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/app/plug-in/plug-in-run.c b/app/plug-in/plug-in-run.c index c5f3e506af..1f7abd0b03 100644 --- a/app/plug-in/plug-in-run.c +++ b/app/plug-in/plug-in-run.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/app/plug-in/plug-in-shm.c b/app/plug-in/plug-in-shm.c index c5f3e506af..1f7abd0b03 100644 --- a/app/plug-in/plug-in-shm.c +++ b/app/plug-in/plug-in-shm.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/app/plug-in/plug-in.c b/app/plug-in/plug-in.c index c5f3e506af..1f7abd0b03 100644 --- a/app/plug-in/plug-in.c +++ b/app/plug-in/plug-in.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/app/plug-in/plug-ins.c b/app/plug-in/plug-ins.c index c5f3e506af..1f7abd0b03 100644 --- a/app/plug-in/plug-ins.c +++ b/app/plug-in/plug-ins.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/app/plug_in.c b/app/plug_in.c index c5f3e506af..1f7abd0b03 100644 --- a/app/plug_in.c +++ b/app/plug_in.c @@ -3008,7 +3008,7 @@ plug_in_progress_init (PlugIn *plug_in, plug_in->progress = gtk_dialog_new (); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", "Gimp"); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); - gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); + gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy", (GtkSignalFunc) plug_in_progress_cancel, plug_in); diff --git a/libgimpwidgets/gimpcolorselect.c b/libgimpwidgets/gimpcolorselect.c index 2c00503310..269b050ac8 100644 --- a/libgimpwidgets/gimpcolorselect.c +++ b/libgimpwidgets/gimpcolorselect.c @@ -23,6 +23,7 @@ #include "colormaps.h" #include "errors.h" #include "gimprc.h" +#include "session.h" #define XY_DEF_WIDTH 240 #define XY_DEF_HEIGHT 240 @@ -183,7 +184,7 @@ color_select_new (int r, gtk_window_set_wmclass (GTK_WINDOW (csp->shell), "color_selection", "Gimp"); gtk_window_set_title (GTK_WINDOW (csp->shell), "Color Selection"); gtk_window_set_policy (GTK_WINDOW (csp->shell), FALSE, FALSE, FALSE); - gtk_widget_set_uposition (csp->shell, color_select_x, color_select_y); + /* handle the wm close signal */ gtk_signal_connect (GTK_OBJECT (csp->shell), "delete_event",