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

[aurisj svn gnome org]

Author: aurisj
Date: Sat Jul 26 10:09:05 2008
New Revision: 26313
URL: http://svn.gnome.org/viewvc/gimp?rev=26313&view=rev

Log:
2008-07-26  Aurimas JuÅka  <aurisj svn gnome org>

	* app/widgets/gimptagentry.[ch]: do not autocomplete when tags are
	selected from tag popup list.



Modified:
   branches/soc-2008-tagging/ChangeLog
   branches/soc-2008-tagging/app/widgets/gimptagentry.c
   branches/soc-2008-tagging/app/widgets/gimptagentry.h

Modified: branches/soc-2008-tagging/app/widgets/gimptagentry.c
==============================================================================
--- branches/soc-2008-tagging/app/widgets/gimptagentry.c	(original)
+++ branches/soc-2008-tagging/app/widgets/gimptagentry.c	Sat Jul 26 10:09:05 2008
@@ -204,8 +204,10 @@
 gimp_tag_entry_set_tag_string (GimpTagEntry    *tag_entry,
                                const gchar     *tag_string)
 {
+  tag_entry->internal_change = TRUE;
   gtk_entry_set_text (GTK_ENTRY (tag_entry), tag_string);
   gtk_editable_set_position (GTK_EDITABLE (tag_entry), -1);
+  tag_entry->internal_change = FALSE;
 
   if (tag_entry->mode == GIMP_TAG_ENTRY_MODE_ASSIGN)
     {
@@ -246,8 +248,11 @@
                                 gint              *position,
                                 gpointer           user_data)
 {
-  g_idle_add ((GSourceFunc)gimp_tag_entry_auto_complete,
-              editable);
+  if (! GIMP_TAG_ENTRY (editable)->internal_change)
+    {
+      g_idle_add ((GSourceFunc)gimp_tag_entry_auto_complete,
+                  editable);
+    }
 }
 
 static void

Modified: branches/soc-2008-tagging/app/widgets/gimptagentry.h
==============================================================================
--- branches/soc-2008-tagging/app/widgets/gimptagentry.h	(original)
+++ branches/soc-2008-tagging/app/widgets/gimptagentry.h	Sat Jul 26 10:09:05 2008
@@ -47,6 +47,7 @@
   GList                        *selected_items;
   GimpTagEntryMode              mode;
   gboolean                      description_shown;
+  gboolean                      internal_change;
 };
 
 struct _GimpTagEntryClass