From e312daffd506aaabc63acc65471041c16b7339a8 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 7 Dec 2001 00:54:32 +0000 Subject: [PATCH] fix gdkatom/xatom screwup - gee, I should read my warnings 2001-12-06 Havoc Pennington * src/ui.c (meta_text_property_to_utf8): fix gdkatom/xatom screwup - gee, I should read my warnings --- ChangeLog | 5 +++++ src/ui.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e53046569..7a72c7d99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-12-06 Havoc Pennington + + * src/ui.c (meta_text_property_to_utf8): fix gdkatom/xatom screwup + - gee, I should read my warnings + 2001-12-03 Laszlo Peter * src/frames.c: add a dummy element to the enum so diff --git a/src/ui.c b/src/ui.c index 12693ca04..e132215f6 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,