[gnome-devel-docs] Samples: reorganisation of gmenu examples for consistency.

[Tiffany Antopolski <antopolski src gnome org>]

commit 036397796e91519b64b4e2e4785f265c401aaec1
Author: Tiffany Antopolski <tiffany antopolski gmail com>
Date:   Tue May 1 13:44:06 2012 -0400

    Samples: reorganisation of gmenu examples for consistency.

 platform-demos/C/gmenu.c.page                      |    4 +-
 .../{GtkApplication.vala.page => gmenu.vala.page}  |   35 ++++++-------------
 platform-demos/C/media/GtkApplication1.png         |  Bin 6918 -> 0 bytes
 platform-demos/C/media/{gmenu.png => gmenu.c.png}  |  Bin 21338 -> 21338 bytes
 .../media/{GtkApplication2.png => gmenu.vala.png}  |  Bin 22136 -> 22136 bytes
 platform-demos/Makefile.am                         |    7 ++--
 6 files changed, 16 insertions(+), 30 deletions(-)
---
diff --git a/platform-demos/C/gmenu.c.page b/platform-demos/C/gmenu.c.page
index 01c8648..47eefaf 100644
--- a/platform-demos/C/gmenu.c.page
+++ b/platform-demos/C/gmenu.c.page
@@ -1,7 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:xi="http://www.w3.org/2001/XInclude";
       type="guide" style="task"
-      id="gmenu.vala">
+      id="gmenu.c">
   <info>
     <link type="guide" xref="beginner.c#menu-combo-toolbar"/>
     <revision version="0.1" date="2012-04-28" status="draft"/>
@@ -16,7 +16,7 @@
   </info>
 
   <title>GMenu</title>
-  <media type="image" mime="image/png" src="media/gmenu.png"/>
+  <media type="image" mime="image/png" src="media/gmenu.c.png"/>
   <p>A GtkApplication with a simple GMenu and SimpleActions</p>
   <note><p><em style="bold">You need to be running Gtk3.4 or later for this to work</em></p></note>
 
diff --git a/platform-demos/C/GtkApplication.vala.page b/platform-demos/C/gmenu.vala.page
similarity index 61%
rename from platform-demos/C/GtkApplication.vala.page
rename to platform-demos/C/gmenu.vala.page
index 70668e0..716f063 100644
--- a/platform-demos/C/GtkApplication.vala.page
+++ b/platform-demos/C/gmenu.vala.page
@@ -1,7 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       xmlns:xi="http://www.w3.org/2001/XInclude";
       type="guide" style="task"
-      id="GtkApplication.vala">
+      id="gmenu.vala">
   <info>
     <link type="guide" xref="beginner.vala#menu-combo-toolbar"/>
     <revision version="0.1" date="2012-04-07" status="stub"/>
@@ -17,31 +17,18 @@
       <email>tiffany antopolski gmail com</email>
     </credit>
 
-    <desc>A Gtk.Application with a GMenu</desc>
+    <desc>A simple implementation of GMenuModel</desc>
   </info>
 
-  <title>Application with GMenu</title>
-  <table>
-    <tr>
-      <td>
-        <media type="image" mime="image/png" height="200" src="media/GtkApplication2.png"/>
-      </td>
-       <td>
-        <media type="image" mime="image/png" height="200" src="media/GtkApplication1.png"/>
-      </td>
-     </tr>
-     <tr>
-     <td>
-        <note style="important">
-          <p><em style="strong">You need to be running Gtk+-3.4 or later for this to work</em></p>
-        </note>
-        <note style="bug"><p>
-           This program will not compile with the quit action connected until <link href="https://bugzilla.gnome.org/show_bug.cgi?id=674090";>Bug #674090</link> is fixed. Therefore, the problematic line has been commented out.
-        </p></note>
-     </td>
-    </tr>
-  </table>
-  <p>A demonstration of the menu integration.</p>
+  <title>GMenu</title>
+    <media type="image" mime="image/png" height="200" src="media/gmenu.vala.png"/>
+    <note style="important">
+       <p><em style="strong">You need to be running Gtk+-3.4 or later for this to work</em></p>
+    </note>
+    <note style="bug">
+      <p>This program will not compile with the quit action connected until <link href="https://bugzilla.gnome.org/show_bug.cgi?id=674090";>Bug #674090</link> is fixed. Therefore, the problematic line has been commented out.</p>
+    </note>
+    <p>A GtkApplication with a simple GMenu and SimpleActions</p>
 
 <code mime="text/x-vala" style="numbered">
 <xi:include href="samples/aboutdialog_GMenu.vala" parse="text"><xi:fallback/></xi:include>
diff --git a/platform-demos/C/media/gmenu.png b/platform-demos/C/media/gmenu.c.png
similarity index 100%
rename from platform-demos/C/media/gmenu.png
rename to platform-demos/C/media/gmenu.c.png
diff --git a/platform-demos/C/media/GtkApplication2.png b/platform-demos/C/media/gmenu.vala.png
similarity index 100%
rename from platform-demos/C/media/GtkApplication2.png
rename to platform-demos/C/media/gmenu.vala.png
diff --git a/platform-demos/Makefile.am b/platform-demos/Makefile.am
index b35512a..7c165c1 100644
--- a/platform-demos/Makefile.am
+++ b/platform-demos/Makefile.am
@@ -43,11 +43,10 @@ DOC_FIGURES = \
 	media/entry.png				\
 	media/fedora.png			\
 	media/opensuse.png			\
-	media/gmenu.png				\
+	media/gmenu.c.png			\
 	media/gmenu.py.png			\
+	media/gmenu.vala.png			\
 	media/grid.png				\
-	media/GtkApplication1.png		\
-	media/GtkApplication2.png		\
 	media/guitar-tuner.png			\
 	media/guitar-tuner-glade.png		\
 	media/guitar-tuner-pipeline.png		\
@@ -86,8 +85,8 @@ DOC_PAGES =				\
 	grid.js.page			\
 	gmenu.c.page			\
 	gmenu.py.page			\
+	gmenu.vala.page			\
 	grid.py.page			\
-	GtkApplication.vala.page	\
 	GtkApplicationWindow.c.page	\
 	GtkApplicationWindow.vala.page	\
 	guitar-tuner.c.page		\