From: John Darrington <john@darrington.wattle.id.au>
Date: Wed, 26 Nov 2008 10:16:20 +0000 (+0900)
Subject: Remove obscure pango_font_description munging which caused criticals
X-Git-Tag: v0.7.1~110
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3ed16d6f22eb58d277af46b3c77993920faa0dc;p=pspp-builds.git

Remove obscure pango_font_description munging which caused criticals
---

diff --git a/lib/gtksheet/gtksheet.c b/lib/gtksheet/gtksheet.c
index 45ee30d7..fbd63046 100644
--- a/lib/gtksheet/gtksheet.c
+++ b/lib/gtksheet/gtksheet.c
@@ -2054,8 +2054,6 @@ gtk_sheet_cell_draw (GtkSheet *sheet, gint row, gint col)
 			  area.width, area.height);
     }
 
-  //  gtk_sheet_cell_draw_label (sheet, row, col);
-
 
   label = gtk_sheet_cell_get_text (sheet, row, col);
   if (NULL == label)
@@ -4525,7 +4523,6 @@ gtk_sheet_size_allocate_entry (GtkSheet *sheet)
   GtkSheetCellAttr attributes = { 0 };
   GtkEntry *sheet_entry;
 
-
   if (!GTK_WIDGET_REALIZED (GTK_WIDGET (sheet))) return;
   if (!GTK_WIDGET_MAPPED (GTK_WIDGET (sheet))) return;
 
@@ -4536,8 +4533,6 @@ gtk_sheet_size_allocate_entry (GtkSheet *sheet)
 				   &attributes) )
     return ;
 
-  gtk_widget_ensure_style (GTK_WIDGET (sheet_entry));
-
   if ( GTK_WIDGET_REALIZED (sheet->entry_widget) )
     {
       GtkStyle *style = GTK_WIDGET (sheet_entry)->style;
@@ -4548,10 +4543,6 @@ gtk_sheet_size_allocate_entry (GtkSheet *sheet)
       style->bg[GTK_STATE_ACTIVE] = attributes.background;
       style->fg[GTK_STATE_ACTIVE] = attributes.foreground;
       style->text[GTK_STATE_ACTIVE] = attributes.foreground;
-
-      pango_font_description_free (style->font_desc);
-      g_assert (attributes.font_desc);
-      style->font_desc = pango_font_description_copy (attributes.font_desc);
     }
 
   rectangle_from_cell (sheet, sheet->active_cell.row,
@@ -5227,7 +5218,6 @@ gtk_sheet_get_attributes (const GtkSheet *sheet, gint row, gint col,
 
   if (row < 0 || col < 0) return FALSE;
 
-
   attr->foreground = GTK_WIDGET (sheet)->style->black;
   attr->background = sheet->color[BG_COLOR];