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

Use gimp_display_get_image() instead of display->image

Browse Source
This commit is contained in:
Michael Natterer
2009-10-06 19:20:44 +02:00
parent bf41a773cb
commit c5b856f16f
73 changed files with 536 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/display/gimpdisplayshell-handlers.c
View File

@ -147,9 +147,10 @@ gimp_display_shell_connect (GimpDisplayShell *shell)
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (GIMP_IS_DISPLAY (shell->display));
g_return_if_fail (GIMP_IS_IMAGE (shell->display->image));
image = shell->display->image;
image = gimp_display_get_image (shell->display);
g_return_if_fail (GIMP_IS_IMAGE (image));
g_signal_connect (image, "clean",
G_CALLBACK (gimp_display_shell_clean_dirty_handler),
@ -289,9 +290,10 @@ gimp_display_shell_disconnect (GimpDisplayShell *shell)
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (GIMP_IS_DISPLAY (shell->display));
g_return_if_fail (GIMP_IS_IMAGE (shell->display->image));
image = shell->display->image;
image = gimp_display_get_image (shell->display);
g_return_if_fail (GIMP_IS_IMAGE (image));
gimp_display_shell_icon_idle_stop (shell);
@ -484,9 +486,9 @@ gimp_display_shell_quick_mask_changed_handler (GimpImage *image,
shell);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (shell->quick_mask_button),
shell->display->image->quick_mask_state);
image->quick_mask_state);
if (shell->display->image->quick_mask_state)
if (image->quick_mask_state)
gtk_image_set_from_stock (gtk_image, GIMP_STOCK_QUICK_MASK_ON,
GTK_ICON_SIZE_MENU);
else
@ -536,7 +538,7 @@ gimp_display_shell_size_changed_detailed_handler (GimpImage *image,
}
else
{
GimpImage *image = GIMP_IMAGE (shell->display->image);
GimpImage *image = gimp_display_get_image (shell->display);
gint new_width = gimp_image_get_width (image);
gint new_height = gimp_image_get_height (image);
gint scaled_previous_origin_x = SCALEX (shell, previous_origin_x);