gtk+ r19589 - in trunk: . gtk

[matthiasc svn gnome org]

Author: matthiasc
Date: Sat Feb 16 01:37:47 2008
New Revision: 19589
URL: http://svn.gnome.org/viewvc/gtk+?rev=19589&view=rev

Log:
2008-02-15  Matthias Clasen  <mclasen redhat com>

        * gtk/gtkselection.c (gtk_target_list_add_text_targets): Don't
        add the same target atom twice.  (#516087, Christian Persch)


Modified:
   trunk/ChangeLog
   trunk/gtk/gtkselection.c

Modified: trunk/gtk/gtkselection.c
==============================================================================
--- trunk/gtk/gtkselection.c	(original)
+++ trunk/gtk/gtkselection.c	Sat Feb 16 01:37:47 2008
@@ -338,7 +338,8 @@
   gtk_target_list_add (list, text_atom, 0, info);  
   gtk_target_list_add (list, GDK_TARGET_STRING, 0, info);  
   gtk_target_list_add (list, text_plain_utf8_atom, 0, info);  
-  gtk_target_list_add (list, text_plain_locale_atom, 0, info);  
+  if (!g_get_charset (NULL))
+    gtk_target_list_add (list, text_plain_locale_atom, 0, info);  
   gtk_target_list_add (list, text_plain_atom, 0, info);  
 }