From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 21 Aug 2021 00:12:04 +0000 (-0400)
Subject: Handle new pango attribute type
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2^2~148^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5feba67a3dc52a25014498c9c3fe12b29e6a0935;p=gtk4.git

Handle new pango attribute type

Update all the places where we switch over
PangoAttrType to handle PANGO_ATTR_TEXT_TRANSFORM,
and do nothing for now - text-transform support
will land in 4.6.
---

diff --git a/demos/gtk-demo/fontify.c b/demos/gtk-demo/fontify.c
index a0a7e95428..8eb3c148f4 100644
--- a/demos/gtk-demo/fontify.c
+++ b/demos/gtk-demo/fontify.c
@@ -269,6 +269,11 @@ insert_tags_for_attributes (GtkTextBuffer     *buffer,
         case PANGO_ATTR_BACKGROUND_ALPHA:
           break;
 
+#if PANGO_VERSION_CHECK(1,49,0)
+        case PANGO_ATTR_TEXT_TRANSFORM:
+          break;
+#endif
+
         case PANGO_ATTR_INVALID:
         default:
           g_assert_not_reached ();
diff --git a/gtk/gtkpango.c b/gtk/gtkpango.c
index 3c458417dd..beb4a73ef0 100644
--- a/gtk/gtkpango.c
+++ b/gtk/gtkpango.c
@@ -258,6 +258,10 @@ attribute_from_text (GtkBuilder  *builder,
       if (gtk_builder_value_from_string_type (builder, G_TYPE_INT, value, &val, error))
         attribute = pango_attr_line_height_new_absolute (g_value_get_int (&val) * PANGO_SCALE);
       break;
+    case PANGO_ATTR_TEXT_TRANSFORM:
+      if (gtk_builder_value_from_string_type (builder, PANGO_TYPE_TEXT_TRANSFORM, value, &val, error))
+        attribute = pango_attr_text_transform_new (g_value_get_enum (&val));
+      break;
 #endif
     case PANGO_ATTR_INVALID:
     default:
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 556ac385f8..2101776e95 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -4711,6 +4711,11 @@ insert_tags_for_attributes (GtkTextBuffer     *buffer,
           INT_ATTR (insert_hyphens);
           break;
 
+#if PANGO_VERSION_CHECK(1, 49, 0)
+        case PANGO_ATTR_TEXT_TRANSFORM:
+          break;
+#endif
+
         case PANGO_ATTR_SHAPE:
         case PANGO_ATTR_ABSOLUTE_SIZE:
         case PANGO_ATTR_GRAVITY:
diff --git a/testsuite/gtk/label.c b/testsuite/gtk/label.c
index a08481c83f..e06623e00c 100644
--- a/testsuite/gtk/label.c
+++ b/testsuite/gtk/label.c
@@ -43,6 +43,7 @@ print_attribute (PangoAttribute *attr, GString *string)
     case PANGO_ATTR_SHOW:
 #if PANGO_VERSION_CHECK(1, 49, 0)
     case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT:
+    case PANGO_ATTR_TEXT_TRANSFORM:
 #endif
       g_string_append_printf (string, "%d", ((PangoAttrInt *)attr)->value);
       break;