gimp r26409 - in branches/soc-2008-tagging: . app/widgets

[aurisj svn gnome org]

Author: aurisj
Date: Wed Aug  6 20:40:04 2008
New Revision: 26409
URL: http://svn.gnome.org/viewvc/gimp?rev=26409&view=rev

Log:
2008-08-06  Aurimas JuÅka  <aurisj svn gnome org>

	* app/widgets/gimpcombotagentry.c
	* app/widgets/gimptagpopup.c: fixed owner/child responsibilities.



Modified:
   branches/soc-2008-tagging/ChangeLog
   branches/soc-2008-tagging/app/widgets/gimpcombotagentry.c
   branches/soc-2008-tagging/app/widgets/gimptagpopup.c

Modified: branches/soc-2008-tagging/app/widgets/gimpcombotagentry.c
==============================================================================
--- branches/soc-2008-tagging/app/widgets/gimpcombotagentry.c	(original)
+++ branches/soc-2008-tagging/app/widgets/gimpcombotagentry.c	Wed Aug  6 20:40:04 2008
@@ -50,6 +50,8 @@
                                                         gpointer                user_data);
 
 static void     gimp_combo_tag_entry_popup_list        (GimpComboTagEntry *combo_entry);
+static void     gimp_combo_tag_entry_popup_destroy     (GtkObject         *object,
+                                                        GimpComboTagEntry *combo_entry);
 
 static void     gimp_combo_tag_entry_tag_count_changed (GimpFilteredContainer  *container,
                                                         gint                    tag_count,
@@ -253,9 +255,21 @@
   if (tag_count > 0)
     {
       combo_entry->popup = gimp_tag_popup_new (combo_entry);
+      g_signal_connect (combo_entry->popup, "destroy",
+                        G_CALLBACK (gimp_combo_tag_entry_popup_destroy),
+                        combo_entry);
     }
 }
 
+
+static void
+gimp_combo_tag_entry_popup_destroy     (GtkObject         *object,
+                                        GimpComboTagEntry *combo_entry)
+{
+  combo_entry->popup = NULL;
+  gtk_widget_grab_focus (GTK_WIDGET (combo_entry));
+}
+
 static void
 gimp_combo_tag_entry_tag_count_changed (GimpFilteredContainer  *container,
                                         gint                    tag_count,

Modified: branches/soc-2008-tagging/app/widgets/gimptagpopup.c
==============================================================================
--- branches/soc-2008-tagging/app/widgets/gimptagpopup.c	(original)
+++ branches/soc-2008-tagging/app/widgets/gimptagpopup.c	Wed Aug  6 20:40:04 2008
@@ -122,13 +122,7 @@
 
   gimp_tag_popup_remove_scroll_timeout (tag_popup);
 
-  /* FIXME: parent should do this on destroy event */
-  if (tag_popup->combo_entry)
-    {
-      gtk_widget_grab_focus (GTK_WIDGET (tag_popup->combo_entry));
-      tag_popup->combo_entry->popup = NULL;
-      tag_popup->combo_entry = NULL;
-    }
+  tag_popup->combo_entry = NULL;
 
   if (tag_popup->layout)
     {