[gtk+] gtk-demo: Stop using GtkShortcutsGesture

[Matthias Clasen <matthiasc src gnome org>]

commit 6dfcea304f6a80a66d0da942e67a5f1191898e45
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Nov 23 08:37:14 2015 -0500

    gtk-demo: Stop using GtkShortcutsGesture
    
    Use the new predefined gestures, and GtkShortcutsShortcut.

 demos/gtk-demo/demo.gresource.xml                 |    4 -
 demos/gtk-demo/gesture-two-finger-swipe-left.svg  |  173 ---------------------
 demos/gtk-demo/gesture-two-finger-swipe-right.svg |  169 --------------------
 demos/gtk-demo/shortcuts-builder.ui               |   17 +--
 demos/gtk-demo/shortcuts-gedit.ui                 |   17 +--
 5 files changed, 8 insertions(+), 372 deletions(-)
---
diff --git a/demos/gtk-demo/demo.gresource.xml b/demos/gtk-demo/demo.gresource.xml
index a19028b..4dea3a0 100644
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -220,8 +220,4 @@
   <gresource prefix="/modelbutton">
     <file>modelbutton.ui</file>
   </gresource>
-  <gresource prefix="/icons">
-    <file>gesture-two-finger-swipe-right.svg</file>
-    <file>gesture-two-finger-swipe-left.svg</file>
-  </gresource>
 </gresources>
diff --git a/demos/gtk-demo/shortcuts-builder.ui b/demos/gtk-demo/shortcuts-builder.ui
index c1ad79e..6b587f2 100644
--- a/demos/gtk-demo/shortcuts-builder.ui
+++ b/demos/gtk-demo/shortcuts-builder.ui
@@ -2,13 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.17 -->
 
-  <object class="GFileIcon" id="left-swipe-icon">
-    <property name="file">resource:///icons/gesture-two-finger-swipe-left.svg</property>
-  </object>
-  <object class="GFileIcon" id="right-swipe-icon">
-    <property name="file">resource:///icons/gesture-two-finger-swipe-right.svg</property>
-  </object>
-
   <object class="GtkShortcutsWindow" id="shortcuts-builder">
     <property name="modal">1</property>
     <child>
@@ -89,19 +82,17 @@
             <property name="visible">1</property>
             <property name="title" translatable="yes">Touchpad gestures</property>
             <child>
-              <object class="GtkShortcutsGesture">
+              <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
+                <property name="shortcut-type">gesture-two-finger-swipe-right</property>
                 <property name="title" translatable="yes">Switch to the next document</property>
-                <property name="subtitle" translatable="yes">Two finger swipe right</property>
-                <property name="icon">right-swipe-icon</property>
               </object>
             </child>
             <child>
-              <object class="GtkShortcutsGesture">
+              <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
+                <property name="shortcut-type">gesture-two-finger-swipe-left</property>
                 <property name="title" translatable="yes">Switch to the previous document</property>
-                <property name="subtitle" translatable="yes">Two finger swipe left</property>
-                <property name="icon">left-swipe-icon</property>
               </object>
             </child>
           </object>
diff --git a/demos/gtk-demo/shortcuts-gedit.ui b/demos/gtk-demo/shortcuts-gedit.ui
index 74bd2dc..acb30d0 100644
--- a/demos/gtk-demo/shortcuts-gedit.ui
+++ b/demos/gtk-demo/shortcuts-gedit.ui
@@ -2,13 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.17 -->
 
-  <object class="GFileIcon" id="left-swipe-icon">
-    <property name="file">resource:///icons/gesture-two-finger-swipe-left.svg</property>
-  </object>
-  <object class="GFileIcon" id="right-swipe-icon">
-    <property name="file">resource:///icons/gesture-two-finger-swipe-right.svg</property>
-  </object>
-
   <object class="GtkShortcutsWindow" id="shortcuts-gedit">
     <property name="modal">1</property>
     <child>
@@ -21,19 +14,17 @@
             <property name="visible">1</property>
             <property name="title" translatable="yes">Touchpad gestures</property>
             <child>
-              <object class="GtkShortcutsGesture">
+              <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
+                <property name="shortcut-type">gesture-two-finger-swipe-right</property>
                 <property name="title" translatable="yes">Switch to the next document</property>
-                <property name="subtitle" translatable="yes">Two finger swipe right</property>
-                <property name="icon">right-swipe-icon</property>
               </object>
             </child>
             <child>
-              <object class="GtkShortcutsGesture">
+              <object class="GtkShortcutsShortcut">
                 <property name="visible">1</property>
+                <property name="shortcut-type">gesture-two-finger-swipe-left</property>
                 <property name="title" translatable="yes">Switch to the previous document</property>
-                <property name="subtitle" translatable="yes">Two finger swipe left</property>
-                <property name="icon">left-swipe-icon</property>
               </object>
             </child>
           </object>