callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied fix for #51403. applied fix for #37761. applied fix for #50522.

Browse Source 
2001-06-21  Sven Neumann  <sven@gimp.org>

	* plug-ins/common/ps.c: applied fix for #51403.
	* plug-ins/flame/flame.c: applied fix for #37761.
	* plug-ins/script-fu/script-fu-console.c: applied fix for #50522.

	All fixes taken from the stable branch.

	* app/gui/file-open-dialog: ported fix for #51722 from stable branch.
This commit is contained in:
Sven Neumann
2001-06-21 09:25:06 +00:00
committed by Sven Neumann
parent d0fe8f45c4
commit 52d5e94eef
7 changed files with 81 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/dialogs/file-open-dialog.c
View File

@ -66,6 +66,10 @@
#define REVERT_DATA_KEY "revert_confirm_dialog"
static int file_open_with_proc_and_display (gchar *filename,
gchar *raw_filename,
PlugInProcDef *file_proc);
static void file_open_dialog_create (void);
static void file_revert_confirm_callback (GtkWidget *widget,
@ -225,6 +229,17 @@ file_open_by_extension_callback (GtkWidget *widget,
gint
file_open_with_display (gchar *filename,
gchar *raw_filename)
{
return file_open_with_proc_and_display (filename, raw_filename, NULL);
}
/* private functions */
static int
file_open_with_proc_and_display (gchar *filename,
gchar *raw_filename,
PlugInProcDef *file_proc)
{
GimpImage *gimage;
GDisplay *gdisplay;
@ -234,7 +249,7 @@ file_open_with_display (gchar *filename,
if ((gimage = file_open_image (filename,
raw_filename,
_("Open"),
NULL,
file_proc,
RUN_INTERACTIVE,
&status)) != NULL)
{
@ -262,9 +277,6 @@ file_open_with_display (gchar *filename,
return status;
}
/* private functions */
static void
file_open_dialog_create (void)
{
@ -713,7 +725,7 @@ file_open_genbutton_callback (GtkWidget *widget,
gimage_to_be_thumbed = file_open_image (full_filename,
list->data,
NULL,
load_file_proc,
NULL,
RUN_NONINTERACTIVE,
&dummy);
@ -809,7 +821,9 @@ file_open_ok_callback (GtkWidget *widget,
if (err) /* e.g. http://server/filename.jpg */
full_filename = raw_filename;
status = file_open_with_display (full_filename, raw_filename);
status = file_open_with_proc_and_display (full_filename,
raw_filename,
load_file_proc);
if (status == GIMP_PDB_SUCCESS)
{
@ -851,8 +865,9 @@ file_open_ok_callback (GtkWidget *widget,
if (! (err == 0 && (buf.st_mode & S_IFDIR)))
{ /* Is not directory. */
status = file_open_with_display (full_filename,
(gchar *) list->data);
status = file_open_with_proc_and_display (full_filename,
(gchar *) list->data,
load_file_proc);
if (status == GIMP_PDB_SUCCESS)
{
@ -926,7 +941,7 @@ file_revert_confirm_callback (GtkWidget *widget,
new_gimage = file_open_image (filename, filename,
_("Revert"),
load_file_proc,
NULL,
RUN_INTERACTIVE,
&status);