stop using gtk_style_context_get_font

It's been deprecated.

https://bugzilla.gnome.org/show_bug.cgi?id=707538

diff --git a/libempathy-gtk/empathy-cell-renderer-text.c b/libempathy-gtk/empathy-cell-renderer-text.c
index 8b488f192682d6355ee2a289d601fb4a35c95594..5ce735f409f351cb3fb99716c50d794319118380 100644 (file)
--- a/libempathy-gtk/empathy-cell-renderer-text.c
+++ b/libempathy-gtk/empathy-cell-renderer-text.c
@@ -298,7 +298,7 @@ cell_renderer_text_update_text (EmpathyCellRendererText *cell,
                                gboolean                selected)
 {
        EmpathyCellRendererTextPriv *priv;
-       const PangoFontDescription *font_desc;
+       PangoFontDescription *font_desc;
        PangoAttrList              *attr_list;
        PangoAttribute             *attr_color = NULL, *attr_size;
        GtkStyleContext            *style;
@@ -330,8 +330,11 @@ cell_renderer_text_update_text (EmpathyCellRendererText *cell,
 
        attr_list = pango_attr_list_new ();
 
-       font_desc = gtk_style_context_get_font (style, GTK_STATE_FLAG_NORMAL);
+       gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL,
+               "font", &font_desc,
+               NULL);
        font_size = pango_font_description_get_size (font_desc);
+       pango_font_description_free (font_desc);
        attr_size = pango_attr_size_new (font_size / 1.2);
        attr_size->start_index = strlen (priv->name) + 1;
        attr_size->end_index = -1;

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 609b52c2e2f18e0e805ac36a85abedf65010af1c..f7c8707eb7f73dfe09c4b984ba4d9547a0fcb994 100644 (file)
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -382,15 +382,17 @@ chat_tab_style_updated_cb (GtkWidget *hbox,
   GtkWidget *button;
   int char_width, h, w;
   PangoContext *context;
-  const PangoFontDescription *font_desc;
+  PangoFontDescription *font_desc;
   PangoFontMetrics *metrics;
 
   button = g_object_get_data (G_OBJECT (user_data),
     "chat-window-tab-close-button");
   context = gtk_widget_get_pango_context (hbox);
 
-  font_desc = gtk_style_context_get_font (gtk_widget_get_style_context (hbox),
-      GTK_STATE_FLAG_NORMAL);
+  gtk_style_context_get (gtk_widget_get_style_context (hbox),
+      GTK_STATE_FLAG_NORMAL,
+      "font", &font_desc,
+      NULL);
 
   metrics = pango_context_get_metrics (context, font_desc,
     pango_context_get_language (context));
@@ -406,6 +408,7 @@ chat_tab_style_updated_cb (GtkWidget *hbox,
     12 * PANGO_PIXELS (char_width) + 2 * w, -1);
 
   gtk_widget_set_size_request (button, w, h);
+  pango_font_description_free (font_desc);
 }
 
 static GtkWidget *