sync with GObject-ization of PangoLayout and PangoContext, which isn't

committed to Pango yet, so this branch is now uncompilable for everyone but
me.

2 files changed, 7 insertions, 4 deletions

diff --git a/gdk/gdkpango.c b/gdk/gdkpango.c
index e3fc1f958..4ce10acfc 100644
--- a/gdk/gdkpango.c
+++ b/gdk/gdkpango.c
@@ -48,14 +48,17 @@ gdk_pango_context_destroy (GdkPangoContextInfo *info)
 static GdkPangoContextInfo *
 gdk_pango_context_get_info (PangoContext *context, gboolean create)
 {
-  GdkPangoContextInfo *info = pango_context_get_data (context, GDK_INFO_KEY);
+  GdkPangoContextInfo *info =
+    g_object_get_qdata (G_OBJECT (context),
+                        g_quark_try_string (GDK_INFO_KEY));
   if (!info && create)
     {
       info = g_new (GdkPangoContextInfo, 1);
       info->colormap = NULL;
 
-      pango_context_set_data (context, GDK_INFO_KEY,
-			      info, (GDestroyNotify)gdk_pango_context_destroy);
+      g_object_set_qdata_full (G_OBJECT (context),
+                               g_quark_from_static_string (GDK_INFO_KEY),
+                               info, (GDestroyNotify)gdk_pango_context_destroy);
     }
 
   return info;
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 76dca3565..d0d501d0b 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -3250,7 +3250,7 @@ gtk_widget_create_pango_layout (GtkWidget *widget)
 
   context = gtk_widget_create_pango_context (widget);
   layout = pango_layout_new (context);
-  pango_context_unref (context);
+  g_object_unref (G_OBJECT (context));
 
   return layout;
 }