From edb969f196aaa41b2804b6c16e3fa1b4664c04f4 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 30 May 2000 21:57:43 +0000 Subject: [PATCH] Track g_locale_get_codeset() to g_get_codeset() change. Tue May 30 16:05:39 2000 Owen Taylor * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Track g_locale_get_codeset() to g_get_codeset() change. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/x11/gdkfont-x11.c | 2 +- 8 files changed, 36 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a72a222803..1bfc764ba4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue May 30 16:05:39 2000 Owen Taylor + + * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Track + g_locale_get_codeset() to g_get_codeset() change. + Tue May 30 15:03:19 2000 Owen Taylor * gtk/testcalendar.c (calendar_font_selection_ok): Use font diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index a72a222803..1bfc764ba4 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Tue May 30 16:05:39 2000 Owen Taylor + + * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Track + g_locale_get_codeset() to g_get_codeset() change. + Tue May 30 15:03:19 2000 Owen Taylor * gtk/testcalendar.c (calendar_font_selection_ok): Use font diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a72a222803..1bfc764ba4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue May 30 16:05:39 2000 Owen Taylor + + * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Track + g_locale_get_codeset() to g_get_codeset() change. + Tue May 30 15:03:19 2000 Owen Taylor * gtk/testcalendar.c (calendar_font_selection_ok): Use font diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index a72a222803..1bfc764ba4 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Tue May 30 16:05:39 2000 Owen Taylor + + * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Track + g_locale_get_codeset() to g_get_codeset() change. + Tue May 30 15:03:19 2000 Owen Taylor * gtk/testcalendar.c (calendar_font_selection_ok): Use font diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a72a222803..1bfc764ba4 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue May 30 16:05:39 2000 Owen Taylor + + * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Track + g_locale_get_codeset() to g_get_codeset() change. + Tue May 30 15:03:19 2000 Owen Taylor * gtk/testcalendar.c (calendar_font_selection_ok): Use font diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a72a222803..1bfc764ba4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue May 30 16:05:39 2000 Owen Taylor + + * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Track + g_locale_get_codeset() to g_get_codeset() change. + Tue May 30 15:03:19 2000 Owen Taylor * gtk/testcalendar.c (calendar_font_selection_ok): Use font diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a72a222803..1bfc764ba4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue May 30 16:05:39 2000 Owen Taylor + + * gdk/x11/gdkfont-x11.c (gdk_font_charset_for_locale): Track + g_locale_get_codeset() to g_get_codeset() change. + Tue May 30 15:03:19 2000 Owen Taylor * gtk/testcalendar.c (calendar_font_selection_ok): Use font diff --git a/gdk/x11/gdkfont-x11.c b/gdk/x11/gdkfont-x11.c index 3ee07358d2..a0fc46aebb 100644 --- a/gdk/x11/gdkfont-x11.c +++ b/gdk/x11/gdkfont-x11.c @@ -152,7 +152,7 @@ gdk_font_charset_for_locale () { "ISO-8859-9", "iso8859-9" }, }; - char *codeset = g_locale_get_codeset (); + char *codeset = g_get_codeset (); char *result = NULL; int i;