diff --git a/ChangeLog b/ChangeLog index 6f7cda10ec..71154565a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-08-09 Alexander Larsson + + * gdk/win32/gdkfont-win32.c: + Update to the new pango win32 api. + 2001-08-08 HideToshi Tajima * gtk/gtkclipboard.c (request_text_received_func): ask apps for diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 6f7cda10ec..71154565a8 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-08-09 Alexander Larsson + + * gdk/win32/gdkfont-win32.c: + Update to the new pango win32 api. + 2001-08-08 HideToshi Tajima * gtk/gtkclipboard.c (request_text_received_func): ask apps for diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6f7cda10ec..71154565a8 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-08-09 Alexander Larsson + + * gdk/win32/gdkfont-win32.c: + Update to the new pango win32 api. + 2001-08-08 HideToshi Tajima * gtk/gtkclipboard.c (request_text_received_func): ask apps for diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 6f7cda10ec..71154565a8 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-08-09 Alexander Larsson + + * gdk/win32/gdkfont-win32.c: + Update to the new pango win32 api. + 2001-08-08 HideToshi Tajima * gtk/gtkclipboard.c (request_text_received_func): ask apps for diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6f7cda10ec..71154565a8 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-08-09 Alexander Larsson + + * gdk/win32/gdkfont-win32.c: + Update to the new pango win32 api. + 2001-08-08 HideToshi Tajima * gtk/gtkclipboard.c (request_text_received_func): ask apps for diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6f7cda10ec..71154565a8 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-08-09 Alexander Larsson + + * gdk/win32/gdkfont-win32.c: + Update to the new pango win32 api. + 2001-08-08 HideToshi Tajima * gtk/gtkclipboard.c (request_text_received_func): ask apps for diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6f7cda10ec..71154565a8 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-08-09 Alexander Larsson + + * gdk/win32/gdkfont-win32.c: + Update to the new pango win32 api. + 2001-08-08 HideToshi Tajima * gtk/gtkclipboard.c (request_text_received_func): ask apps for diff --git a/gdk/win32/gdkfont-win32.c b/gdk/win32/gdkfont-win32.c index 30f3388593..16056308ff 100644 --- a/gdk/win32/gdkfont-win32.c +++ b/gdk/win32/gdkfont-win32.c @@ -1584,20 +1584,10 @@ gdk_font_from_description (PangoFontDescription *font_desc) if (font) { - gint n_subfonts; - PangoWin32Subfont *subfont_ids; - - n_subfonts = pango_win32_list_subfonts (font, PANGO_WIN32_U_BASIC_LATIN, - &subfont_ids); - if (n_subfonts > 0) - { - LOGFONT *lfp = - pango_win32_font_subfont_logfont (font, subfont_ids[0]); - result = gdk_font_from_one_singlefont (gdk_font_load_logfont (lfp)); - g_free (lfp); - } - - g_free (subfont_ids); + LOGFONT *lfp = + pango_win32_font_logfont (font); + result = gdk_font_from_one_singlefont (gdk_font_load_logfont (lfp)); + g_free (lfp); g_object_unref (G_OBJECT (font)); }