2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e530465..7a72c7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-06  Havoc Pennington  <hp@redhat.com>
+
+	* src/ui.c (meta_text_property_to_utf8): fix gdkatom/xatom screwup
+	- gee, I should read my warnings
+
 2001-12-03  Laszlo Peter  <laca@ireland.sun.com>
 
 	* src/frames.c: add a dummy element to the enum so
diff --git a/src/ui.c b/src/ui.c
index 12693ca..e132215 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -518,7 +518,7 @@ meta_text_property_to_utf8 (Display             *xdisplay,
   
   list = NULL;
 
-  count = gdk_text_property_to_utf8_list (prop->encoding,
+  count = gdk_text_property_to_utf8_list (gdk_x11_xatom_to_atom (prop->encoding),
                                           prop->format,
                                           prop->value,
                                           prop->nitems,