[gnome-power-manager/gnome-3-2] Don't use the deprecated pango_cairo_font_map_create_context()
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-power-manager/gnome-3-2] Don't use the deprecated pango_cairo_font_map_create_context()
- Date: Mon, 17 Oct 2011 10:14:38 +0000 (UTC)
commit c94b9e4de76ab79ca68a66a8b027e8dce684dc56
Author: Richard Hughes <richard hughsie com>
Date: Mon Oct 17 11:00:55 2011 +0100
Don't use the deprecated pango_cairo_font_map_create_context()
src/gpm-graph-widget.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/src/gpm-graph-widget.c b/src/gpm-graph-widget.c
index 884864a..9cd00dc 100644
--- a/src/gpm-graph-widget.c
+++ b/src/gpm-graph-widget.c
@@ -300,7 +300,6 @@ gpm_graph_widget_class_init (GpmGraphWidgetClass *class)
static void
gpm_graph_widget_init (GpmGraphWidget *graph)
{
- PangoFontMap *fontmap;
PangoContext *context;
PangoFontDescription *desc;
@@ -318,8 +317,7 @@ gpm_graph_widget_init (GpmGraphWidget *graph)
graph->priv->type_y = GPM_GRAPH_WIDGET_TYPE_PERCENTAGE;
/* do pango stuff */
- fontmap = pango_cairo_font_map_get_default ();
- context = pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP (fontmap));
+ context = gtk_widget_get_pango_context (GTK_WIDGET (graph));
pango_context_set_base_gravity (context, PANGO_GRAVITY_AUTO);
graph->priv->layout = pango_layout_new (context);
@@ -349,7 +347,6 @@ gpm_graph_widget_data_clear (GpmGraphWidget *graph)
static void
gpm_graph_widget_finalize (GObject *object)
{
- PangoContext *context;
GpmGraphWidget *graph = (GpmGraphWidget*) object;
/* clear key and data */
@@ -360,9 +357,8 @@ gpm_graph_widget_finalize (GObject *object)
g_ptr_array_unref (graph->priv->data_list);
g_ptr_array_unref (graph->priv->plot_list);
- context = pango_layout_get_context (graph->priv->layout);
g_object_unref (graph->priv->layout);
- g_object_unref (context);
+
G_OBJECT_CLASS (gpm_graph_widget_parent_class)->finalize (object);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]