Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
GNOME
GIMP
Commits
5439aa49
Commit
5439aa49
authored
Mar 28, 2006
by
Sven Neumann
Committed by
Sven Neumann
Mar 28, 2006
Browse files
did a global gdisp -> display substitution.
2006-03-28 Sven Neumann <sven@gimp.org> * app/*: did a global gdisp -> display substitution.
parent
20ef3ba4
Changes
104
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
5439aa49
2006-03-28 Sven Neumann <sven@gimp.org>
* app/*: did a global gdisp -> display substitution.
2006-03-28 Sven Neumann <sven@gimp.org>
* app/*
...
...
app/actions/actions.h
View file @
5439aa49
...
...
@@ -65,9 +65,9 @@ GimpObject * action_select_object (GimpActionSelectType select_type,
if (! image) \
return
#define return_if_no_display(
g
disp,data) \
g
disp = action_data_get_display (data); \
if (!
g
disp) \
#define return_if_no_display(disp
lay
,data) \
disp
lay
= action_data_get_display (data); \
if (! disp
lay
) \
return
#define return_if_no_widget(widget,data) \
...
...
app/actions/buffers-commands.c
View file @
5439aa49
...
...
@@ -135,21 +135,21 @@ buffers_paste (GimpBufferView *view,
if
(
buffer
&&
gimp_container_have
(
container
,
GIMP_OBJECT
(
buffer
)))
{
GimpDisplay
*
g
disp
=
gimp_context_get_display
(
context
);
GimpImage
*
image
=
NULL
;
gint
x
=
-
1
;
gint
y
=
-
1
;
gint
width
=
-
1
;
gint
height
=
-
1
;
if
(
g
disp
)
GimpDisplay
*
disp
lay
=
gimp_context_get_display
(
context
);
GimpImage
*
image
=
NULL
;
gint
x
=
-
1
;
gint
y
=
-
1
;
gint
width
=
-
1
;
gint
height
=
-
1
;
if
(
disp
lay
)
{
GimpDisplayShell
*
shell
=
GIMP_DISPLAY_SHELL
(
g
disp
->
shell
);
GimpDisplayShell
*
shell
=
GIMP_DISPLAY_SHELL
(
disp
lay
->
shell
);
gimp_display_shell_untransform_viewport
(
shell
,
&
x
,
&
y
,
&
width
,
&
height
);
image
=
g
disp
->
image
;
image
=
disp
lay
->
image
;
}
else
{
...
...
app/actions/documents-commands.c
View file @
5439aa49
...
...
@@ -329,15 +329,15 @@ static void
documents_raise_display
(
gpointer
data
,
gpointer
user_data
)
{
GimpDisplay
*
g
disp
=
data
;
GimpDisplay
*
disp
lay
=
data
;
RaiseClosure
*
closure
=
user_data
;
const
gchar
*
uri
;
uri
=
gimp_object_get_name
(
GIMP_OBJECT
(
g
disp
->
image
));
uri
=
gimp_object_get_name
(
GIMP_OBJECT
(
disp
lay
->
image
));
if
(
uri
&&
!
strcmp
(
closure
->
name
,
uri
))
{
closure
->
found
=
TRUE
;
gtk_window_present
(
GTK_WINDOW
(
g
disp
->
shell
));
gtk_window_present
(
GTK_WINDOW
(
disp
lay
->
shell
));
}
}
app/actions/edit-commands.c
View file @
5439aa49
...
...
@@ -57,7 +57,7 @@
/* local function prototypes */
static
void
edit_paste
(
GimpDisplay
*
g
disp
,
static
void
edit_paste
(
GimpDisplay
*
disp
lay
,
gboolean
paste_into
);
static
void
cut_named_buffer_callback
(
GtkWidget
*
widget
,
const
gchar
*
name
,
...
...
@@ -198,10 +198,10 @@ void
edit_paste_cmd_callback
(
GtkAction
*
action
,
gpointer
data
)
{
GimpDisplay
*
g
disp
=
action_data_get_display
(
data
);
GimpDisplay
*
disp
lay
=
action_data_get_display
(
data
);
if
(
g
disp
)
edit_paste
(
g
disp
,
FALSE
);
if
(
disp
lay
)
edit_paste
(
disp
lay
,
FALSE
);
else
edit_paste_as_new_cmd_callback
(
action
,
data
);
}
...
...
@@ -210,10 +210,10 @@ void
edit_paste_into_cmd_callback
(
GtkAction
*
action
,
gpointer
data
)
{
GimpDisplay
*
g
disp
;
return_if_no_display
(
g
disp
,
data
);
GimpDisplay
*
disp
lay
;
return_if_no_display
(
disp
lay
,
data
);
edit_paste
(
g
disp
,
TRUE
);
edit_paste
(
disp
lay
,
TRUE
);
}
void
...
...
@@ -348,20 +348,20 @@ edit_fill_cmd_callback (GtkAction *action,
/* private functions */
static
void
edit_paste
(
GimpDisplay
*
g
disp
,
edit_paste
(
GimpDisplay
*
disp
lay
,
gboolean
paste_into
)
{
gchar
*
svg
;
gsize
svg_size
;
svg
=
gimp_clipboard_get_svg
(
g
disp
->
image
->
gimp
,
&
svg_size
);
svg
=
gimp_clipboard_get_svg
(
disp
lay
->
image
->
gimp
,
&
svg_size
);
if
(
svg
)
{
if
(
gimp_vectors_import_buffer
(
g
disp
->
image
,
svg
,
svg_size
,
if
(
gimp_vectors_import_buffer
(
disp
lay
->
image
,
svg
,
svg_size
,
TRUE
,
TRUE
,
-
1
,
NULL
))
{
gimp_image_flush
(
g
disp
->
image
);
gimp_image_flush
(
disp
lay
->
image
);
}
g_free
(
svg
);
...
...
@@ -370,22 +370,22 @@ edit_paste (GimpDisplay *gdisp,
{
GimpBuffer
*
buffer
;
buffer
=
gimp_clipboard_get_buffer
(
g
disp
->
image
->
gimp
);
buffer
=
gimp_clipboard_get_buffer
(
disp
lay
->
image
->
gimp
);
if
(
buffer
)
{
GimpDisplayShell
*
shell
=
GIMP_DISPLAY_SHELL
(
g
disp
->
shell
);
GimpDisplayShell
*
shell
=
GIMP_DISPLAY_SHELL
(
disp
lay
->
shell
);
gint
x
,
y
;
gint
width
,
height
;
gimp_display_shell_untransform_viewport
(
shell
,
&
x
,
&
y
,
&
width
,
&
height
);
if
(
gimp_edit_paste
(
g
disp
->
image
,
gimp_image_active_drawable
(
g
disp
->
image
),
if
(
gimp_edit_paste
(
disp
lay
->
image
,
gimp_image_active_drawable
(
disp
lay
->
image
),
buffer
,
paste_into
,
x
,
y
,
width
,
height
))
{
gimp_image_flush
(
g
disp
->
image
);
gimp_image_flush
(
disp
lay
->
image
);
}
g_object_unref
(
buffer
);
...
...
app/actions/file-commands.c
View file @
5439aa49
...
...
@@ -76,7 +76,7 @@ static void file_new_template_callback (GtkWidget *widget,
gpointer
data
);
static
void
file_revert_confirm_response
(
GtkWidget
*
dialog
,
gint
response_id
,
GimpDisplay
*
g
disp
);
GimpDisplay
*
disp
lay
);
/* public functions */
...
...
@@ -112,14 +112,14 @@ void
file_open_as_layer_cmd_callback
(
GtkAction
*
action
,
gpointer
data
)
{
GimpDisplay
*
g
disp
;
GimpDisplay
*
disp
lay
;
GtkWidget
*
widget
;
GimpImage
*
image
;
const
gchar
*
uri
;
return_if_no_display
(
g
disp
,
data
);
return_if_no_display
(
disp
lay
,
data
);
return_if_no_widget
(
widget
,
data
);
image
=
g
disp
->
image
;
image
=
disp
lay
->
image
;
uri
=
gimp_object_get_name
(
GIMP_OBJECT
(
image
));
file_open_dialog_show
(
widget
,
image
,
uri
,
TRUE
);
...
...
@@ -184,11 +184,11 @@ void
file_save_cmd_callback
(
GtkAction
*
action
,
gpointer
data
)
{
GimpDisplay
*
g
disp
;
GimpDisplay
*
disp
lay
;
GimpImage
*
image
;
return_if_no_display
(
g
disp
,
data
);
return_if_no_display
(
disp
lay
,
data
);
image
=
g
disp
->
image
;
image
=
disp
lay
->
image
;
if
(
!
gimp_image_active_drawable
(
image
))
return
;
...
...
@@ -225,7 +225,7 @@ file_save_cmd_callback (GtkAction *action,
}
status
=
file_save
(
image
,
action_data_get_context
(
data
),
GIMP_PROGRESS
(
g
disp
),
GIMP_PROGRESS
(
disp
lay
),
uri
,
save_proc
,
GIMP_RUN_WITH_LAST_VALS
,
FALSE
,
&
error
);
...
...
@@ -256,15 +256,15 @@ void
file_save_as_cmd_callback
(
GtkAction
*
action
,
gpointer
data
)
{
GimpDisplay
*
g
disp
;
GimpDisplay
*
disp
lay
;
GtkWidget
*
widget
;
return_if_no_display
(
g
disp
,
data
);
return_if_no_display
(
disp
lay
,
data
);
return_if_no_widget
(
widget
,
data
);
if
(
!
gimp_image_active_drawable
(
g
disp
->
image
))
if
(
!
gimp_image_active_drawable
(
disp
lay
->
image
))
return
;
file_save_dialog_show
(
g
disp
->
image
,
widget
,
file_save_dialog_show
(
disp
lay
->
image
,
widget
,
_
(
"Save Image"
),
FALSE
);
}
...
...
@@ -272,15 +272,15 @@ void
file_save_a_copy_cmd_callback
(
GtkAction
*
action
,
gpointer
data
)
{
GimpDisplay
*
g
disp
;
GimpDisplay
*
disp
lay
;
GtkWidget
*
widget
;
return_if_no_display
(
g
disp
,
data
);
return_if_no_display
(
disp
lay
,
data
);
return_if_no_widget
(
widget
,
data
);
if
(
!
gimp_image_active_drawable
(
g
disp
->
image
))
if
(
!
gimp_image_active_drawable
(
disp
lay
->
image
))
return
;
file_save_dialog_show
(
g
disp
->
image
,
widget
,
file_save_dialog_show
(
disp
lay
->
image
,
widget
,
_
(
"Save a Copy of the Image"
),
TRUE
);
}
...
...
@@ -288,18 +288,18 @@ void
file_save_template_cmd_callback
(
GtkAction
*
action
,
gpointer
data
)
{
GimpDisplay
*
g
disp
;
GimpDisplay
*
disp
lay
;
GtkWidget
*
dialog
;
return_if_no_display
(
g
disp
,
data
);
return_if_no_display
(
disp
lay
,
data
);
dialog
=
gimp_query_string_box
(
_
(
"Create New Template"
),
g
disp
->
shell
,
disp
lay
->
shell
,
gimp_standard_help_func
,
GIMP_HELP_FILE_SAVE_AS_TEMPLATE
,
_
(
"Enter a name for this template"
),
NULL
,
G_OBJECT
(
g
disp
->
image
),
"disconnect"
,
file_new_template_callback
,
g
disp
->
image
);
G_OBJECT
(
disp
lay
->
image
),
"disconnect"
,
file_new_template_callback
,
disp
lay
->
image
);
gtk_widget_show
(
dialog
);
}
...
...
@@ -307,14 +307,14 @@ void
file_revert_cmd_callback
(
GtkAction
*
action
,
gpointer
data
)
{
GimpDisplay
*
g
disp
;
GimpDisplay
*
disp
lay
;
GtkWidget
*
dialog
;
const
gchar
*
uri
;
return_if_no_display
(
g
disp
,
data
);
return_if_no_display
(
disp
lay
,
data
);
uri
=
gimp_object_get_name
(
GIMP_OBJECT
(
g
disp
->
image
));
uri
=
gimp_object_get_name
(
GIMP_OBJECT
(
disp
lay
->
image
));
dialog
=
g_object_get_data
(
G_OBJECT
(
g
disp
->
image
),
REVERT_DATA_KEY
);
dialog
=
g_object_get_data
(
G_OBJECT
(
disp
lay
->
image
),
REVERT_DATA_KEY
);
if
(
!
uri
)
{
...
...
@@ -331,7 +331,7 @@ file_revert_cmd_callback (GtkAction *action,
dialog
=
gimp_message_dialog_new
(
_
(
"Revert Image"
),
GIMP_STOCK_QUESTION
,
g
disp
->
shell
,
0
,
disp
lay
->
shell
,
0
,
gimp_standard_help_func
,
GIMP_HELP_FILE_REVERT
,
GTK_STOCK_CANCEL
,
GTK_RESPONSE_CANCEL
,
...
...
@@ -344,13 +344,13 @@ file_revert_cmd_callback (GtkAction *action,
GTK_RESPONSE_CANCEL
,
-
1
);
g_signal_connect_object
(
g
disp
,
"disconnect"
,
g_signal_connect_object
(
disp
lay
,
"disconnect"
,
G_CALLBACK
(
gtk_widget_destroy
),
dialog
,
G_CONNECT_SWAPPED
);
g_signal_connect
(
dialog
,
"response"
,
G_CALLBACK
(
file_revert_confirm_response
),
g
disp
);
disp
lay
);
basename
=
file_utils_uri_display_basename
(
uri
);
filename
=
file_utils_uri_display_name
(
uri
);
...
...
@@ -366,7 +366,7 @@ file_revert_cmd_callback (GtkAction *action,
"on disk, you will lose all changes, "
"including all undo information."
));
g_object_set_data
(
G_OBJECT
(
g
disp
->
image
),
REVERT_DATA_KEY
,
dialog
);
g_object_set_data
(
G_OBJECT
(
disp
lay
->
image
),
REVERT_DATA_KEY
,
dialog
);
gtk_widget_show
(
dialog
);
}
...
...
@@ -521,9 +521,9 @@ file_new_template_callback (GtkWidget *widget,
static
void
file_revert_confirm_response
(
GtkWidget
*
dialog
,
gint
response_id
,
GimpDisplay
*
g
disp
)
GimpDisplay
*
disp
lay
)
{
GimpImage
*
old_image
=
g
disp
->
image
;
GimpImage
*
old_image
=
disp
lay
->
image
;
gtk_widget_destroy
(
dialog
);
...
...
@@ -540,7 +540,7 @@ file_revert_confirm_response (GtkWidget *dialog,
uri
=
gimp_object_get_name
(
GIMP_OBJECT
(
old_image
));
new_image
=
file_open_image
(
gimp
,
gimp_get_user_context
(
gimp
),
GIMP_PROGRESS
(
g
disp
),
GIMP_PROGRESS
(
disp
lay
),
uri
,
uri
,
NULL
,
GIMP_RUN_INTERACTIVE
,
&
status
,
NULL
,
&
error
);
...
...
app/actions/image-commands.c
View file @
5439aa49
...
...
@@ -68,7 +68,7 @@ typedef struct _ImageResizeOptions ImageResizeOptions;
struct
_ImageResizeOptions
{
GimpContext
*
context
;
GimpDisplay
*
g
disp
;
GimpDisplay
*
disp
lay
;
};
...
...
@@ -152,10 +152,10 @@ image_convert_cmd_callback (GtkAction *action,
{
GimpImage
*
image
;
GtkWidget
*
widget
;
GimpDisplay
*
g
disp
;
GimpDisplay
*
disp
lay
;
return_if_no_image
(
image
,
data
);
return_if_no_widget
(
widget
,
data
);
return_if_no_display
(
g
disp
,
data
);
return_if_no_display
(
disp
lay
,
data
);
switch
((
GimpImageBaseType
)
value
)
{
...
...
@@ -168,7 +168,7 @@ image_convert_cmd_callback (GtkAction *action,
case
GIMP_INDEXED
:
gtk_widget_show
(
convert_dialog_new
(
image
,
widget
,
GIMP_PROGRESS
(
g
disp
)));
GIMP_PROGRESS
(
disp
lay
)));
break
;
}
}
...
...
@@ -180,22 +180,22 @@ image_resize_cmd_callback (GtkAction *action,
ImageResizeOptions
*
options
;
GimpImage
*
image
;
GtkWidget
*
widget
;
GimpDisplay
*
g
disp
;
GimpDisplay
*
disp
lay
;
GtkWidget
*
dialog
;
GimpUnit
unit
;
return_if_no_image
(
image
,
data
);
return_if_no_widget
(
widget
,
data
);
return_if_no_display
(
g
disp
,
data
);
return_if_no_display
(
disp
lay
,
data
);
options
=
g_new0
(
ImageResizeOptions
,
1
);
options
->
g
disp
=
g
disp
;
options
->
disp
lay
=
disp
lay
;
options
->
context
=
action_data_get_context
(
data
);
unit
=
GPOINTER_TO_INT
(
g_object_get_data
(
G_OBJECT
(
image
),
"scale-dialog-unit"
));
if
(
!
unit
)
unit
=
GIMP_DISPLAY_SHELL
(
g
disp
->
shell
)
->
unit
;
unit
=
GIMP_DISPLAY_SHELL
(
disp
lay
->
shell
)
->
unit
;
dialog
=
resize_dialog_new
(
GIMP_VIEWABLE
(
image
),
_
(
"Set Image Canvas Size"
),
"gimp-image-resize"
,
...
...
@@ -205,7 +205,7 @@ image_resize_cmd_callback (GtkAction *action,
image_resize_callback
,
options
);
g_signal_connect_object
(
g
disp
,
"disconnect"
,
g_signal_connect_object
(
disp
lay
,
"disconnect"
,
G_CALLBACK
(
gtk_widget_destroy
),
dialog
,
G_CONNECT_SWAPPED
);
...
...
@@ -219,22 +219,21 @@ void
image_resize_to_layers_cmd_callback
(
GtkAction
*
action
,
gpointer
data
)
{
GimpDisplay
*
g
disp
;
GimpDisplay
*
disp
lay
;
GimpProgress
*
progress
;
return_if_no_display
(
display
,
data
);
return_if_no_display
(
gdisp
,
data
);
progress
=
gimp_progress_start
(
GIMP_PROGRESS
(
gdisp
),
progress
=
gimp_progress_start
(
GIMP_PROGRESS
(
display
),
_
(
"Resizing"
),
FALSE
);
gimp_image_resize_to_layers
(
g
disp
->
image
,
gimp_image_resize_to_layers
(
disp
lay
->
image
,
action_data_get_context
(
data
),
progress
);
if
(
progress
)
gimp_progress_end
(
progress
);
gimp_image_flush
(
g
disp
->
image
);
gimp_image_flush
(
disp
lay
->
image
);
}
void
...
...
@@ -242,12 +241,12 @@ image_print_size_cmd_callback (GtkAction *action,
gpointer
data
)
{
GtkWidget
*
dialog
;
GimpDisplay
*
g
disp
;
GimpDisplay
*
disp
lay
;
GtkWidget
*
widget
;
return_if_no_display
(
g
disp
,
data
);
return_if_no_display
(
disp
lay
,
data
);
return_if_no_widget
(
widget
,
data
);
dialog
=
print_size_dialog_new
(
g
disp
->
image
,
dialog
=
print_size_dialog_new
(
disp
lay
->
image
,
_
(
"Set Image Print Resolution"
),
"gimp-image-print-size"
,
widget
,
...
...
@@ -256,7 +255,7 @@ image_print_size_cmd_callback (GtkAction *action,
image_print_size_callback
,
NULL
);
g_signal_connect_object
(
g
disp
,
"disconnect"
,
g_signal_connect_object
(
disp
lay
,
"disconnect"
,
G_CALLBACK
(
gtk_widget_destroy
),
dialog
,
G_CONNECT_SWAPPED
);
...
...
@@ -268,17 +267,17 @@ image_scale_cmd_callback (GtkAction *action,
gpointer
data
)
{
ImageScaleDialog
*
dialog
;
GimpDisplay
*
g
disp
;
GimpDisplay
*
disp
lay
;
GtkWidget
*
widget
;
return_if_no_display
(
g
disp
,
data
);
return_if_no_display
(
disp
lay
,
data
);
return_if_no_widget
(
widget
,
data
);
dialog
=
image_scale_dialog_new
(
g
disp
->
image
,
g
disp
,
dialog
=
image_scale_dialog_new
(
disp
lay
->
image
,
disp
lay
,
action_data_get_context
(
data
),
widget
,
image_scale_callback
);
g_signal_connect_object
(
g
disp
,
"disconnect"
,
g_signal_connect_object
(
disp
lay
,
"disconnect"
,
G_CALLBACK
(
gtk_widget_destroy
),
dialog
->
dialog
,
G_CONNECT_SWAPPED
);
...
...
@@ -290,20 +289,20 @@ image_flip_cmd_callback (GtkAction *action,
gint
value
,
gpointer
data
)
{
GimpDisplay
*
g
disp
;
GimpDisplay
*
disp
lay
;
GimpProgress
*
progress
;
return_if_no_display
(
g
disp
,
data
);
return_if_no_display
(
disp
lay
,
data
);
progress
=
gimp_progress_start
(
GIMP_PROGRESS
(
g
disp
),
progress
=
gimp_progress_start
(
GIMP_PROGRESS
(
disp
lay
),
_
(
"Flipping"
),
FALSE
);
gimp_image_flip
(
g
disp
->
image
,
action_data_get_context
(
data
),
gimp_image_flip
(
disp
lay
->
image
,
action_data_get_context
(
data
),
(
GimpOrientationType
)
value
,
progress
);
if
(
progress
)
gimp_progress_end
(
progress
);
gimp_image_flush
(
g
disp
->
image
);
gimp_image_flush
(
disp
lay
->
image
);
}
void
...
...
@@ -311,20 +310,20 @@ image_rotate_cmd_callback (GtkAction *action,
gint
value
,
gpointer
data
)
{
GimpDisplay
*
g
disp
;
GimpDisplay
*
disp
lay
;
GimpProgress
*
progress
;
return_if_no_display
(
g
disp
,
data
);
return_if_no_display
(
disp
lay
,
data
);
progress
=
gimp_progress_start
(
GIMP_PROGRESS
(
g
disp
),
progress
=
gimp_progress_start
(
GIMP_PROGRESS
(
disp
lay
),
_
(
"Rotating"
),
FALSE
);
gimp_image_rotate
(
g
disp
->
image
,
action_data_get_context
(
data
),
gimp_image_rotate
(
disp
lay
->
image
,
action_data_get_context
(
data
),
(
GimpRotationType
)
value
,
progress
);
if
(
progress
)
gimp_progress_end
(
progress
);
gimp_image_flush
(
g
disp
->
image
);
gimp_image_flush
(
disp
lay
->
image
);
}
void
...
...
@@ -351,14 +350,14 @@ void
image_duplicate_cmd_callback
(
GtkAction
*
action
,
gpointer
data
)
{
GimpDisplay
*
g
disp
;
GimpDisplay
*
disp
lay
;
GimpDisplayShell
*
shell
;
GimpImage
*
new_image
;
return_if_no_display
(
g
disp
,
data
);
return_if_no_display
(
disp
lay
,
data
);
shell
=
GIMP_DISPLAY_SHELL
(
g
disp
->
shell
);
shell
=
GIMP_DISPLAY_SHELL
(
disp
lay
->
shell
);
new_image
=
gimp_image_duplicate
(
g
disp
->
image
);
new_image
=
gimp_image_duplicate
(
disp
lay
->
image
);
gimp_create_display
(
new_image
->
gimp
,
new_image
,
...
...
@@ -405,20 +404,20 @@ void
image_configure_grid_cmd_callback
(
GtkAction
*
action
,
gpointer
data
)
{
GimpDisplay
*
g
disp
;
GimpDisplay
*
disp
lay
;
GimpDisplayShell
*
shell
;
GimpImage
*
image
;
return_if_no_display
(
g
disp
,
data
);
return_if_no_display
(
disp
lay
,
data
);
shell
=
GIMP_DISPLAY_SHELL
(
g
disp
->
shell
);
image
=
g
disp
->
image
;
shell
=
GIMP_DISPLAY_SHELL
(
disp
lay
->
shell
);
image
=
disp
lay
->
image
;
if
(
!
shell
->
grid_dialog
)
{
shell
->
grid_dialog
=
grid_dialog_new
(
g
disp
->
image
,
g
disp
->
shell
);
shell
->
grid_dialog
=
grid_dialog_new
(
disp
lay
->
image
,
disp
lay
->
shell
);
gtk_window_set_transient_for
(
GTK_WINDOW
(
shell
->
grid_dialog
),
GTK_WINDOW
(
g
disp
->
shell
));
GTK_WINDOW
(
disp
lay
->
shell
));
gtk_window_set_destroy_with_parent
(
GTK_WINDOW
(
shell
->
grid_dialog
),
TRUE
);
...
...
@@ -433,19 +432,19 @@ void
image_properties_cmd_callback
(
GtkAction
*
action
,
gpointer
data
)
{
GimpDisplay
*
g
disp
;
GimpDisplay
*
disp
lay
;
GimpDisplayShell
*
shell
;
GimpImage
*
image
;
GtkWidget
*
dialog
;
return_if_no_display
(
g
disp
,
data
);
return_if_no_display
(
disp
lay
,
data
);
shell
=
GIMP_DISPLAY_SHELL
(
g
disp
->
shell
);
image
=
g
disp
->
image
;
shell
=
GIMP_DISPLAY_SHELL
(
disp
lay
->
shell
);
image
=
disp
lay
->
image
;
dialog
=
image_properties_dialog_new
(
g
disp
->
image
,
g
disp
->
shell
);
dialog
=
image_properties_dialog_new
(
disp
lay
->
image
,
disp
lay
->
shell
);
gtk_window_set_transient_for
(
GTK_WINDOW
(
dialog
),
GTK_WINDOW
(
g
disp
->
shell
));
GTK_WINDOW
(
disp
lay
->
shell
));
gtk_window_set_destroy_with_parent
(
GTK_WINDOW
(
dialog
),
TRUE
);
...
...
@@ -471,7 +470,7 @@ image_resize_callback (GtkWidget *dialog,
if
(
width
>
0
&&
height
>
0
)
{
GimpImage
*
image
=
GIMP_IMAGE
(
viewable
);
GimpDisplay
*
g
disp
=
options
->
g
disp
;
GimpDisplay
*
disp
lay
=
options
->
disp
lay
;
GimpContext
*
context
=
options
->
context
;
GimpProgress
*
progress
;
...
...
@@ -484,7 +483,7 @@ image_resize_callback (GtkWidget *dialog,
if
(
width
==
image
->
width
&&
height
==
image
->
height
)
return
;