gimp r28125 - in trunk: . app/dialogs

[neo svn gnome org]

Author: neo
Date: Sat Mar  7 12:11:44 2009
New Revision: 28125
URL: http://svn.gnome.org/viewvc/gimp?rev=28125&view=rev

Log:
2009-03-07  Sven Neumann  <sven gimp org>

	* app/dialogs/stroke-dialog.c (stroke_dialog_response): 
disconnect
	from the "paint-info" combo-box before destroying the dialog. 
The
	GimpContainerView emits "select-item" from its dispose handler.



Modified:
   trunk/ChangeLog
   trunk/app/dialogs/stroke-dialog.c

Modified: trunk/app/dialogs/stroke-dialog.c
==============================================================================
--- trunk/app/dialogs/stroke-dialog.c	(original)
+++ trunk/app/dialogs/stroke-dialog.c	Sat Mar  7 12:11:44 2009
@@ -262,20 +262,21 @@
   GimpItem          *item;
   GimpImage         *image;
   GimpContext       *context;
+  GtkWidget         *combo;
 
-  item = g_object_get_data (G_OBJECT (dialog), "gimp-item");
+  item    = g_object_get_data (G_OBJECT (dialog), "gimp-item");
   options = g_object_get_data (G_OBJECT (dialog), "gimp-stroke-options");
+  combo   = g_object_get_data (G_OBJECT (dialog), "gimp-tool-menu");;
 
   image   = gimp_item_get_image (item);
   context = GIMP_VIEWABLE_DIALOG (dialog)->context;
 
+
   switch (response_id)
     {
     case RESPONSE_RESET:
       {
         GimpToolInfo *tool_info = gimp_context_get_tool (context);
-        GtkWidget    *combo     = g_object_get_data (G_OBJECT (dialog),
-                                                     "gimp-tool-menu");;
 
         gimp_config_reset (GIMP_CONFIG (options));
 
@@ -331,6 +332,10 @@
       /* fallthrough */
 
     default:
+      g_signal_handlers_disconnect_by_func (combo,
+                                            G_CALLBACK (stroke_dialog_paint_info_selected),
+                                            options);
+
       gtk_widget_destroy (dialog);
       break;
     }