[shotwell] Revert "Add Quit menu item to File menu"

[Jens Georg <jensgeorg src gnome org>]

commit 248bb1463f967073df05228c37b0410de7506d52
Author: Jens Georg <mail jensge org>
Date:   Thu Dec 22 21:07:09 2016 +0100

    Revert "Add Quit menu item to File menu"
    
    This reverts commit 0fa222a858adee5014c91dd2a8de0658b3a4ec24.

 src/Page.vala          |   10 +---------
 ui/direct.ui           |    3 ---
 ui/event.ui            |    6 +++++-
 ui/events_directory.ui |    3 ---
 ui/import.ui           |    3 ---
 ui/import_queue.ui     |    3 ---
 ui/media.ui            |    3 ---
 ui/offline.ui          |    3 ---
 ui/photo.ui            |    3 ---
 ui/tags.ui             |    3 ---
 ui/trash.ui            |    3 ---
 11 files changed, 6 insertions(+), 37 deletions(-)
---
diff --git a/src/Page.vala b/src/Page.vala
index 7adc1db..a65a1e2 100644
--- a/src/Page.vala
+++ b/src/Page.vala
@@ -571,15 +571,7 @@ public abstract class Page : Gtk.ScrolledWindow {
     // This is called during init_ui() to collect all Page.InjectedUIElements for the page.  They
     // should be added to the MultiSet using the injection path as the key.
     protected virtual InjectionGroup[] init_collect_injection_groups() {
-        var result = new InjectionGroup[0];
-        var settings = Gtk.Settings.get_default ();
-        if (settings.gtk_shell_shows_app_menu) {
-            InjectionGroup group = new InjectionGroup("QuitPlaceholder");
-            group.add_menu_item ("_Quit", "CommonQuit", "<Primary>q");
-            result += group;
-        }
-
-        return result;
+        return new InjectionGroup[0];
     }
     
     // This is called during "map" allowing for Gtk.Actions to be updated at
diff --git a/ui/direct.ui b/ui/direct.ui
index 7e81149..6053967 100644
--- a/ui/direct.ui
+++ b/ui/direct.ui
@@ -32,9 +32,6 @@
           <attribute name="action">win.CommonJumpToFile</attribute>
         </item>
       </section>
-      <section>
-      <attribute name="id">QuitPlaceholder</attribute>
-      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Edit</attribute>
diff --git a/ui/event.ui b/ui/event.ui
index cadd49d..c2bc6cb 100644
--- a/ui/event.ui
+++ b/ui/event.ui
@@ -36,7 +36,11 @@
         </item>
       </section>
       <section>
-        <attribute name="id">QuitPlaceholder</attribute>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
       </section>
     </submenu>
     <submenu>
diff --git a/ui/events_directory.ui b/ui/events_directory.ui
index 1078aa6..ad4135e 100644
--- a/ui/events_directory.ui
+++ b/ui/events_directory.ui
@@ -20,9 +20,6 @@
           <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
-      <section>
-        <attribute name="id">QuitPlaceholder</attribute>
-      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Edit</attribute>
diff --git a/ui/import.ui b/ui/import.ui
index 646f467..4a75993 100644
--- a/ui/import.ui
+++ b/ui/import.ui
@@ -28,9 +28,6 @@
           <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
-      <section>
-        <attribute name="id">QuitPlaceholder</attribute>
-      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Edit</attribute>
diff --git a/ui/import_queue.ui b/ui/import_queue.ui
index 8acd0c8..a19c32b 100644
--- a/ui/import_queue.ui
+++ b/ui/import_queue.ui
@@ -26,9 +26,6 @@
           <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
-      <section>
-        <attribute name="id">QuitPlaceholder</attribute>
-      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_View</attribute>
diff --git a/ui/media.ui b/ui/media.ui
index b1503a2..895855a 100644
--- a/ui/media.ui
+++ b/ui/media.ui
@@ -35,9 +35,6 @@
           <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
-      <section>
-        <attribute name="id">QuitPlaceholder</attribute>
-      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Edit</attribute>
diff --git a/ui/offline.ui b/ui/offline.ui
index c060fc2..bf241ed 100644
--- a/ui/offline.ui
+++ b/ui/offline.ui
@@ -20,9 +20,6 @@
           <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
-      <section>
-        <attribute name="id">QuitPlaceholder</attribute>
-      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Edit</attribute>
diff --git a/ui/photo.ui b/ui/photo.ui
index 9843959..cb39801 100644
--- a/ui/photo.ui
+++ b/ui/photo.ui
@@ -43,9 +43,6 @@
           <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
-      <section>
-        <attribute name="id">QuitPlaceholder</attribute>
-      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Edit</attribute>
diff --git a/ui/tags.ui b/ui/tags.ui
index 92b7805..11a4f44 100644
--- a/ui/tags.ui
+++ b/ui/tags.ui
@@ -35,9 +35,6 @@
           <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
-      <section>
-        <attribute name="id">QuitPlaceholder</attribute>
-      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Edit</attribute>
diff --git a/ui/trash.ui b/ui/trash.ui
index 5bab97f..58badfa 100644
--- a/ui/trash.ui
+++ b/ui/trash.ui
@@ -25,9 +25,6 @@
           <attribute name="action">win.CommonEmptyTrash</attribute>
         </item>
       </section>
-      <section>
-        <attribute name="id">QuitPlaceholder</attribute>
-      </section>
     </submenu>
     <submenu>
       <attribute name="label" translatable="yes">_Edit</attribute>