diff --git a/ChangeLog b/ChangeLog index a2fcaa6356..28cdd20321 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Aug 31 19:16:36 BST 1998 Adam D. Moss + + * app/gimpimage.c: I'm pleased to say that lewing doesn't + want to kill me any more. Hooray! + Mon Aug 31 18:15:16 BST 1998 Adam D. Moss * app/gimage.h app/gimpimage.c app/gimpimage.h diff --git a/app/core/gimpimage-guides.c b/app/core/gimpimage-guides.c index da46acf8cd..31594cc462 100644 --- a/app/core/gimpimage-guides.c +++ b/app/core/gimpimage-guides.c @@ -1018,7 +1018,8 @@ gimp_image_delete_guide_invoker (Argument *args) guides = gimage->guides; while (guides) { - if (((Guide*)guides->data)->guide_ID == guide_id) + if ((((Guide*)guides->data)->guide_ID == guide_id) && + (((Guide*)guides->data)->position >= 0) ) { GList *tmp_next; @@ -1027,7 +1028,9 @@ gimp_image_delete_guide_invoker (Argument *args) tmp_next = g_list_next(guides); - gimp_image_remove_guide (gimage, ((Guide*)guides->data)); + ((Guide*)guides->data)->position = -1; + undo_push_guide (gimage, ((Guide*)guides->data)); + /*gimp_image_remove_guide (gimage, ((Guide*)guides->data));*/ guides = tmp_next; } diff --git a/app/core/gimpimage-merge.c b/app/core/gimpimage-merge.c index da46acf8cd..31594cc462 100644 --- a/app/core/gimpimage-merge.c +++ b/app/core/gimpimage-merge.c @@ -1018,7 +1018,8 @@ gimp_image_delete_guide_invoker (Argument *args) guides = gimage->guides; while (guides) { - if (((Guide*)guides->data)->guide_ID == guide_id) + if ((((Guide*)guides->data)->guide_ID == guide_id) && + (((Guide*)guides->data)->position >= 0) ) { GList *tmp_next; @@ -1027,7 +1028,9 @@ gimp_image_delete_guide_invoker (Argument *args) tmp_next = g_list_next(guides); - gimp_image_remove_guide (gimage, ((Guide*)guides->data)); + ((Guide*)guides->data)->position = -1; + undo_push_guide (gimage, ((Guide*)guides->data)); + /*gimp_image_remove_guide (gimage, ((Guide*)guides->data));*/ guides = tmp_next; } diff --git a/app/core/gimpimage-projection.c b/app/core/gimpimage-projection.c index da46acf8cd..31594cc462 100644 --- a/app/core/gimpimage-projection.c +++ b/app/core/gimpimage-projection.c @@ -1018,7 +1018,8 @@ gimp_image_delete_guide_invoker (Argument *args) guides = gimage->guides; while (guides) { - if (((Guide*)guides->data)->guide_ID == guide_id) + if ((((Guide*)guides->data)->guide_ID == guide_id) && + (((Guide*)guides->data)->position >= 0) ) { GList *tmp_next; @@ -1027,7 +1028,9 @@ gimp_image_delete_guide_invoker (Argument *args) tmp_next = g_list_next(guides); - gimp_image_remove_guide (gimage, ((Guide*)guides->data)); + ((Guide*)guides->data)->position = -1; + undo_push_guide (gimage, ((Guide*)guides->data)); + /*gimp_image_remove_guide (gimage, ((Guide*)guides->data));*/ guides = tmp_next; } diff --git a/app/core/gimpimage-resize.c b/app/core/gimpimage-resize.c index da46acf8cd..31594cc462 100644 --- a/app/core/gimpimage-resize.c +++ b/app/core/gimpimage-resize.c @@ -1018,7 +1018,8 @@ gimp_image_delete_guide_invoker (Argument *args) guides = gimage->guides; while (guides) { - if (((Guide*)guides->data)->guide_ID == guide_id) + if ((((Guide*)guides->data)->guide_ID == guide_id) && + (((Guide*)guides->data)->position >= 0) ) { GList *tmp_next; @@ -1027,7 +1028,9 @@ gimp_image_delete_guide_invoker (Argument *args) tmp_next = g_list_next(guides); - gimp_image_remove_guide (gimage, ((Guide*)guides->data)); + ((Guide*)guides->data)->position = -1; + undo_push_guide (gimage, ((Guide*)guides->data)); + /*gimp_image_remove_guide (gimage, ((Guide*)guides->data));*/ guides = tmp_next; } diff --git a/app/core/gimpimage-scale.c b/app/core/gimpimage-scale.c index da46acf8cd..31594cc462 100644 --- a/app/core/gimpimage-scale.c +++ b/app/core/gimpimage-scale.c @@ -1018,7 +1018,8 @@ gimp_image_delete_guide_invoker (Argument *args) guides = gimage->guides; while (guides) { - if (((Guide*)guides->data)->guide_ID == guide_id) + if ((((Guide*)guides->data)->guide_ID == guide_id) && + (((Guide*)guides->data)->position >= 0) ) { GList *tmp_next; @@ -1027,7 +1028,9 @@ gimp_image_delete_guide_invoker (Argument *args) tmp_next = g_list_next(guides); - gimp_image_remove_guide (gimage, ((Guide*)guides->data)); + ((Guide*)guides->data)->position = -1; + undo_push_guide (gimage, ((Guide*)guides->data)); + /*gimp_image_remove_guide (gimage, ((Guide*)guides->data));*/ guides = tmp_next; } diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c index da46acf8cd..31594cc462 100644 --- a/app/core/gimpimage.c +++ b/app/core/gimpimage.c @@ -1018,7 +1018,8 @@ gimp_image_delete_guide_invoker (Argument *args) guides = gimage->guides; while (guides) { - if (((Guide*)guides->data)->guide_ID == guide_id) + if ((((Guide*)guides->data)->guide_ID == guide_id) && + (((Guide*)guides->data)->position >= 0) ) { GList *tmp_next; @@ -1027,7 +1028,9 @@ gimp_image_delete_guide_invoker (Argument *args) tmp_next = g_list_next(guides); - gimp_image_remove_guide (gimage, ((Guide*)guides->data)); + ((Guide*)guides->data)->position = -1; + undo_push_guide (gimage, ((Guide*)guides->data)); + /*gimp_image_remove_guide (gimage, ((Guide*)guides->data));*/ guides = tmp_next; } diff --git a/app/core/gimpprojection-construct.c b/app/core/gimpprojection-construct.c index da46acf8cd..31594cc462 100644 --- a/app/core/gimpprojection-construct.c +++ b/app/core/gimpprojection-construct.c @@ -1018,7 +1018,8 @@ gimp_image_delete_guide_invoker (Argument *args) guides = gimage->guides; while (guides) { - if (((Guide*)guides->data)->guide_ID == guide_id) + if ((((Guide*)guides->data)->guide_ID == guide_id) && + (((Guide*)guides->data)->position >= 0) ) { GList *tmp_next; @@ -1027,7 +1028,9 @@ gimp_image_delete_guide_invoker (Argument *args) tmp_next = g_list_next(guides); - gimp_image_remove_guide (gimage, ((Guide*)guides->data)); + ((Guide*)guides->data)->position = -1; + undo_push_guide (gimage, ((Guide*)guides->data)); + /*gimp_image_remove_guide (gimage, ((Guide*)guides->data));*/ guides = tmp_next; } diff --git a/app/gimpimage.c b/app/gimpimage.c index da46acf8cd..31594cc462 100644 --- a/app/gimpimage.c +++ b/app/gimpimage.c @@ -1018,7 +1018,8 @@ gimp_image_delete_guide_invoker (Argument *args) guides = gimage->guides; while (guides) { - if (((Guide*)guides->data)->guide_ID == guide_id) + if ((((Guide*)guides->data)->guide_ID == guide_id) && + (((Guide*)guides->data)->position >= 0) ) { GList *tmp_next; @@ -1027,7 +1028,9 @@ gimp_image_delete_guide_invoker (Argument *args) tmp_next = g_list_next(guides); - gimp_image_remove_guide (gimage, ((Guide*)guides->data)); + ((Guide*)guides->data)->position = -1; + undo_push_guide (gimage, ((Guide*)guides->data)); + /*gimp_image_remove_guide (gimage, ((Guide*)guides->data));*/ guides = tmp_next; }