From f649837613471a2d3c688a0d3cece6922d2644a8 Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Sun, 14 Sep 2003 13:51:27 +0000 Subject: [PATCH] Unref the PangoFontMetrics. Patch from Steve Chaplin (#122257). Sun Sep 14 15:49:00 2003 Soeren Sandmann * gtk/gtktoolbar.c (toolbar_item_is_homogeneous): Unref the PangoFontMetrics. Patch from Steve Chaplin (#122257). --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktoolbar.c | 2 ++ 6 files changed, 27 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0db332cb0..18aed370f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Sep 14 15:49:00 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (toolbar_item_is_homogeneous): Unref the + PangoFontMetrics. Patch from Steve Chaplin (#122257). + 2003-09-14 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (show_window_internal): Remove diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0db332cb0..18aed370f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Sep 14 15:49:00 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (toolbar_item_is_homogeneous): Unref the + PangoFontMetrics. Patch from Steve Chaplin (#122257). + 2003-09-14 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (show_window_internal): Remove diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0db332cb0..18aed370f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Sep 14 15:49:00 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (toolbar_item_is_homogeneous): Unref the + PangoFontMetrics. Patch from Steve Chaplin (#122257). + 2003-09-14 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (show_window_internal): Remove diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0db332cb0..18aed370f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Sep 14 15:49:00 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (toolbar_item_is_homogeneous): Unref the + PangoFontMetrics. Patch from Steve Chaplin (#122257). + 2003-09-14 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (show_window_internal): Remove diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0db332cb0..18aed370f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Sep 14 15:49:00 2003 Soeren Sandmann + + * gtk/gtktoolbar.c (toolbar_item_is_homogeneous): Unref the + PangoFontMetrics. Patch from Steve Chaplin (#122257). + 2003-09-14 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (show_window_internal): Remove diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 011db4b54..c2ce588c0 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -638,6 +638,8 @@ toolbar_item_is_homogeneous (GtkToolbar *toolbar, widget->style->font_desc, pango_context_get_language (context)); char_width = pango_font_metrics_get_approximate_char_width (metrics); + pango_font_metrics_unref (metrics); + max_homogeneous_pixels = PANGO_PIXELS (MAX_HOMOGENEOUS_N_CHARS * char_width); result = gtk_tool_item_get_homogeneous (item) && !GTK_IS_SEPARATOR_TOOL_ITEM (item);