[gtk: 2/2] Merge branch 'kill-entry-buffer-demo' into 'master'

[Benjamin Otte <otte src gnome org>]

commit ab407ba57ca0f5d70583bc07e07a13d9f14fe215
Merge: 07f2024bfc e8d890ae0c
Author: Benjamin Otte <otte benjamin googlemail com>
Date:   Tue Nov 5 19:08:22 2019 +0000

    Merge branch 'kill-entry-buffer-demo' into 'master'
    
    gtk-demo: Drop the entry buffer demo
    
    See merge request GNOME/gtk!1166

 demos/gtk-demo/demo.gresource.xml |  1 -
 demos/gtk-demo/entry_buffer.c     | 60 ---------------------------------------
 demos/gtk-demo/meson.build        |  1 -
 3 files changed, 62 deletions(-)
---
diff --cc demos/gtk-demo/demo.gresource.xml
index 2a30e84349,b4d01428e1..df235ca960
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@@ -167,9 -167,7 +167,8 @@@
      <file>drawingarea.c</file>
      <file>dnd.c</file>
      <file>editable_cells.c</file>
-     <file>entry_buffer.c</file>
      <file>entry_completion.c</file>
 +    <file>entry_undo.c</file>
      <file>expander.c</file>
      <file>filtermodel.c</file>
      <file>fishbowl.c</file>
diff --cc demos/gtk-demo/meson.build
index 3d20727e6c,a6254b48e5..b10b799dea
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@@ -22,9 -22,7 +22,8 @@@ demos = files(
    'drawingarea.c',
    'dnd.c',
    'editable_cells.c',
-   'entry_buffer.c',
    'entry_completion.c',
 +  'entry_undo.c',
    'expander.c',
    'filtermodel.c',
    'fishbowl.c',