From 8189a1c29dc28a11293c6bf7c65e4c6b27fdf7a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin.noel@collabora.com>
Date: Mon, 15 Jun 2020 18:41:44 +0200
Subject: gtk: Add emoji properties to GtkEntry

---
 plugins/gtk+/glade-entry-editor.ui | 199 ++++++++++++++-----------------------
 plugins/gtk+/gtk+.xml              |   2 +
 2 files changed, 78 insertions(+), 123 deletions(-)

diff --git a/plugins/gtk+/glade-entry-editor.ui b/plugins/gtk+/glade-entry-editor.ui
index 1d98cb5d..07729992 100644
--- a/plugins/gtk+/glade-entry-editor.ui
+++ b/plugins/gtk+/glade-entry-editor.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 
+<!-- Generated with glade 3.36.0 
 
 libgladegtk - Glade UI Designer Gtk+ support plugin
 Copyright (C) 2013 Tristan Van Berkom <tvb@gnome.org>
@@ -49,7 +49,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
             <property name="left_attach">0</property>
             <property name="top_attach">2</property>
             <property name="width">6</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -61,7 +60,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
             <property name="left_attach">0</property>
             <property name="top_attach">0</property>
             <property name="width">6</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -76,7 +74,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
             <property name="left_attach">0</property>
             <property name="top_attach">3</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -89,8 +86,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -105,7 +100,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
             <property name="left_attach">0</property>
             <property name="top_attach">4</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -118,8 +112,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">4</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -135,7 +127,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
             <property name="left_attach">0</property>
             <property name="top_attach">5</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -148,8 +139,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -164,8 +153,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -178,8 +165,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -194,8 +179,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">10</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -208,8 +191,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">10</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -225,7 +206,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
             <property name="left_attach">0</property>
             <property name="top_attach">11</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -239,8 +219,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">11</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -256,7 +234,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
             <property name="left_attach">0</property>
             <property name="top_attach">12</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -270,8 +247,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">12</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -287,7 +262,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
             <property name="left_attach">0</property>
             <property name="top_attach">13</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -302,7 +276,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
             <property name="left_attach">0</property>
             <property name="top_attach">6</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -315,8 +288,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">6</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -330,8 +301,6 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">13</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -347,9 +316,8 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">14</property>
+            <property name="top_attach">15</property>
             <property name="width">6</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -373,9 +341,8 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">15</property>
+            <property name="top_attach">16</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -387,9 +354,8 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">15</property>
+            <property name="top_attach">16</property>
             <property name="width">4</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -414,9 +380,8 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">16</property>
+            <property name="top_attach">17</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -428,9 +393,8 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">16</property>
+            <property name="top_attach">17</property>
             <property name="width">4</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -443,9 +407,8 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">17</property>
+            <property name="top_attach">18</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -457,9 +420,8 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">17</property>
+            <property name="top_attach">18</property>
             <property name="width">4</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -475,9 +437,8 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">18</property>
+            <property name="top_attach">19</property>
             <property name="width">6</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -490,9 +451,8 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">19</property>
+            <property name="top_attach">20</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -504,9 +464,7 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">19</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
+            <property name="top_attach">20</property>
           </packing>
         </child>
         <child>
@@ -519,9 +477,8 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">20</property>
+            <property name="top_attach">21</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -533,9 +490,7 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">20</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
+            <property name="top_attach">21</property>
           </packing>
         </child>
         <child>
@@ -551,9 +506,8 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">21</property>
+            <property name="top_attach">22</property>
             <property name="width">6</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -577,9 +531,8 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">22</property>
+            <property name="top_attach">23</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -591,9 +544,7 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">22</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
+            <property name="top_attach">23</property>
           </packing>
         </child>
         <child>
@@ -618,9 +569,8 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">23</property>
+            <property name="top_attach">24</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -645,9 +595,8 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">24</property>
+            <property name="top_attach">25</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -659,9 +608,7 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">23</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
+            <property name="top_attach">24</property>
           </packing>
         </child>
         <child>
@@ -673,9 +620,7 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">24</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
+            <property name="top_attach">25</property>
           </packing>
         </child>
         <child>
@@ -714,9 +659,8 @@ Author: Tristan Van Berkom <tvb@gnome.org>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">26</property>
+            <property name="top_attach">27</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -736,9 +680,8 @@ primary icon's tooltip
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">27</property>
+            <property name="top_attach">28</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -776,7 +719,7 @@ primary icon's tooltip
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">25</property>
+            <property name="top_attach">26</property>
             <property name="width">4</property>
             <property name="height">3</property>
           </packing>
@@ -792,9 +735,8 @@ primary icon's tooltip
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">28</property>
+            <property name="top_attach">29</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -807,9 +749,7 @@ primary icon's tooltip
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">28</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
+            <property name="top_attach">29</property>
           </packing>
         </child>
         <child>
@@ -825,9 +765,8 @@ primary icon's tooltip
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">29</property>
+            <property name="top_attach">30</property>
             <property name="width">6</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -851,9 +790,8 @@ primary icon's tooltip
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">30</property>
+            <property name="top_attach">31</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -878,9 +816,8 @@ primary icon's tooltip
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">31</property>
+            <property name="top_attach">32</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -905,9 +842,8 @@ primary icon's tooltip
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">32</property>
+            <property name="top_attach">33</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -919,9 +855,7 @@ primary icon's tooltip
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">30</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
+            <property name="top_attach">31</property>
           </packing>
         </child>
         <child>
@@ -933,9 +867,7 @@ primary icon's tooltip
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">31</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
+            <property name="top_attach">32</property>
           </packing>
         </child>
         <child>
@@ -947,9 +879,7 @@ primary icon's tooltip
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">32</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
+            <property name="top_attach">33</property>
           </packing>
         </child>
         <child>
@@ -988,9 +918,8 @@ primary icon's tooltip
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">34</property>
+            <property name="top_attach">35</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -1009,9 +938,8 @@ secondary icon's tooltip</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">35</property>
+            <property name="top_attach">36</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -1049,7 +977,7 @@ secondary icon's tooltip</property>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">33</property>
+            <property name="top_attach">34</property>
             <property name="width">4</property>
             <property name="height">3</property>
           </packing>
@@ -1065,9 +993,8 @@ secondary icon's tooltip</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">36</property>
+            <property name="top_attach">37</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -1080,9 +1007,7 @@ secondary icon's tooltip</property>
           </object>
           <packing>
             <property name="left_attach">2</property>
-            <property name="top_attach">36</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
+            <property name="top_attach">37</property>
           </packing>
         </child>
         <child>
@@ -1096,8 +1021,6 @@ secondary icon's tooltip</property>
           <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">9</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -1111,8 +1034,6 @@ secondary icon's tooltip</property>
           <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">10</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -1127,7 +1048,6 @@ secondary icon's tooltip</property>
             <property name="left_attach">0</property>
             <property name="top_attach">7</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -1140,8 +1060,6 @@ secondary icon's tooltip</property>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">7</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -1157,7 +1075,6 @@ secondary icon's tooltip</property>
             <property name="left_attach">0</property>
             <property name="top_attach">8</property>
             <property name="width">2</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -1170,8 +1087,6 @@ secondary icon's tooltip</property>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">8</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -1186,9 +1101,45 @@ secondary icon's tooltip</property>
             <property name="left_attach">0</property>
             <property name="top_attach">1</property>
             <property name="width">6</property>
-            <property name="height">1</property>
           </packing>
         </child>
+        <child>
+          <object class="GladePropertyShell" id="enable_emoji_completion_editor">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">12</property>
+            <property name="hexpand">False</property>
+            <property name="property_name">enable-emoji-completion</property>
+            <property name="editor_type">GladeEpropCheck</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">14</property>
+            <property name="width">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GladePropertyShell" id="show_emoji_icon_editor">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">False</property>
+            <property name="property_name">show-emoji-icon</property>
+            <property name="editor_type">GladeEpropCheck</property>
+          </object>
+          <packing>
+            <property name="left_attach">2</property>
+            <property name="top_attach">14</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
         <child>
           <placeholder/>
         </child>
@@ -1410,6 +1361,7 @@ secondary icon's tooltip</property>
       <editor id="has_frame_editor"/>
       <editor id="shadow_type_editor"/>
       <editor id="editable_editor"/>
+      <editor id="enable_emoji_completion_editor"/>
       <editor id="activates_default_editor"/>
       <editor id="overwrite_editor"/>
       <editor id="truncate_editor"/>
@@ -1451,6 +1403,7 @@ secondary icon's tooltip</property>
       <editor id="secondary_tooltip_markup_editor"/>
       <editor id="secondary_icon_sensitive_editor"/>
       <editor id="secondary_icon_activatable_editor"/>
+      <editor id="show_emoji_icon_editor"/>
       <editor id="invisible_char_label"/>
       <editor id="shadow_type_label"/>
       <editor id="width_chars_label"/>
diff --git a/plugins/gtk+/gtk+.xml b/plugins/gtk+/gtk+.xml
index 96b84560..e56d3b8b 100644
--- a/plugins/gtk+/gtk+.xml
+++ b/plugins/gtk+/gtk+.xml
@@ -1559,6 +1559,8 @@
           <property id="truncate-multiline" custom-layout="True" since="2.10"/>
           <property id="shadow-type" custom-layout="True" since="2.12"/>
           <property id="editing-canceled" disabled="True" since="2.20"/>
+          <property id="show-emoji-icon" custom-layout="True" since="3.22"/>
+          <property id="enable-emoji-completion" custom-layout="True" since="3.24"/>
           <property id="primary-icon-gicon" disabled="True"/>
           <property id="secondary-icon-gicon" disabled="True"/>
           <property id="primary-icon-stock" name="Primary Stock Icon" since="2.16" custom-layout="True"
-- 
cgit v1.2.1