358,362d357
<   /*  Check if there is no confirm_dialog before
<    */
<   if (GTK_IS_WIDGET(text_tool->confirm_dialog))
<     return;
< 
448c443
<       
---
> 
459c454
<                   GIMP_RECTANGLE_TOOL_CREATING && !GTK_IS_WIDGET(text_tool->confirm_dialog))
---
>                   GIMP_RECTANGLE_TOOL_CREATING)
469c464
< 		  gimp_text_tool_editor_start (text_tool);
---
>                   gimp_text_tool_editor_start (text_tool);
483c478
< 	  
---
> 
1465,1466c1460
< #define RESPONSE_COPY_LAYER 0
< #define RESPONSE_NEW_LAYER 1 
---
> #define  RESPONSE_NEW 1
1480,1482c1474,1476
<         {	  
<         case RESPONSE_NEW_LAYER:
< 	  gimp_text_tool_create_layer (text_tool, NULL);
---
>         {
>         case RESPONSE_NEW:
>           gimp_text_tool_create_layer (text_tool, layer->text);
1485,1488d1478
< 	case RESPONSE_COPY_LAYER:
< 	  gimp_text_tool_create_layer (text_tool, layer->text);
< 	  break;
< 
1495c1485
< 	  gimp_text_tool_editor_start (text_tool);
---
>           gimp_text_tool_editor_start (text_tool);
1498,1499c1488,1489
< 	default:
< 	  break;
---
>         default:
>           break;
1515c1505
<   if (GTK_IS_WIDGET(text_tool->confirm_dialog))
---
>   if (text_tool->confirm_dialog)
1530,1533c1520,1522
<                                      _("Create _New Layer"),                RESPONSE_NEW_LAYER,
<                                      _("Create _Copy of the Layer"),        RESPONSE_COPY_LAYER,
< 				     GTK_STOCK_EDIT,                        GTK_RESPONSE_ACCEPT,
< 				     GTK_STOCK_CANCEL,                      GTK_RESPONSE_CANCEL,
---
>                                      _("Create _New Layer"), RESPONSE_NEW,
>                                      GTK_STOCK_CANCEL,       GTK_RESPONSE_CANCEL,
>                                      GTK_STOCK_EDIT,         GTK_RESPONSE_ACCEPT,
1538,1539c1527
<   					   RESPONSE_NEW_LAYER,
<                                            RESPONSE_COPY_LAYER,
---
>                                            RESPONSE_NEW,
1541c1529
< 					   GTK_RESPONSE_CANCEL,
---
>                                            GTK_RESPONSE_CANCEL,
1555c1543
<   
---
> 
1561,1563c1549,1550
<                            "You can edit the layer, "
<                            "create a copy of the text layer from its text attributes or "
< 			   "create a new text layer"));
---
>                            "You can edit the layer or create a new "
>                            "text layer from its text attributes."));
1568c1555
<   
---
> 
1585a1573,1575
>   /* all this stuff doesn't work quite yet, but it's better than before
>    */
> 
1658c1648
<   if (GTK_IS_WIDGET(text_tool->confirm_dialog))
---
>   if (text_tool->confirm_dialog)
1671c1661
< 	return TRUE;
---
>         return TRUE;
1675,1681c1665,1671
< 	  if(confirm)
< 	    {
< 	      gimp_text_tool_connect(text_tool, layer, NULL);
< 	      gimp_text_tool_confirm_dialog (text_tool);
< 	      return TRUE;
< 	    }
< 	}
---
>           if (confirm)
>             {
>               gimp_text_tool_connect (text_tool, layer, NULL);
>               gimp_text_tool_confirm_dialog (text_tool);
>               return TRUE;
>             }
>         }
