[gnome-books/wip/hadess/remove-documents-ui] data: Remove documents-app-menu.ui



commit 8fcedf949aad8bbdc6019b0339c0ab70f25db312
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Aug 2 12:20:05 2019 +0200

    data: Remove documents-app-menu.ui
    
    And make sure to remove references to it in the sources. This also
    removes some lingering references to the documents application.
    
    Spotted by Juna Edi <junae8229 gmail com>

 data/org.gnome.Books.data.gresource.xml |  1 -
 data/ui/documents-app-menu.ui           | 26 --------------------------
 po/POTFILES.in                          |  1 -
 src/main.js                             |  2 +-
 src/mainToolbar.js                      |  8 +-------
 5 files changed, 2 insertions(+), 36 deletions(-)
---
diff --git a/data/org.gnome.Books.data.gresource.xml b/data/org.gnome.Books.data.gresource.xml
index 49cf01dd..b8100a03 100644
--- a/data/org.gnome.Books.data.gresource.xml
+++ b/data/org.gnome.Books.data.gresource.xml
@@ -3,7 +3,6 @@
   <gresource prefix="/org/gnome/Documents">
     <file>application.css</file>
     <file preprocess="xml-stripblanks">ui/books-app-menu.ui</file>
-    <file preprocess="xml-stripblanks">ui/documents-app-menu.ui</file>
     <file preprocess="xml-stripblanks">ui/organize-collection-dialog.ui</file>
     <file preprocess="xml-stripblanks">ui/preview-context-menu.ui</file>
     <file preprocess="xml-stripblanks">ui/preview-menu.ui</file>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bb35e9a7..a2f97746 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,6 @@ data/org.gnome.Books.appdata.xml.in
 data/org.gnome.Books.desktop.in
 data/org.gnome.books.gschema.xml
 data/ui/books-app-menu.ui
-data/ui/documents-app-menu.ui
 data/ui/help-overlay.ui
 data/ui/organize-collection-dialog.ui
 data/ui/preview-context-menu.ui
diff --git a/src/main.js b/src/main.js
index 9bfaaf6e..57f62019 100644
--- a/src/main.js
+++ b/src/main.js
@@ -41,6 +41,6 @@ const Application = imports.application;
 const GLib = imports.gi.GLib;
 
 function main(args) {
-    let application = new Application.Application(pkg.name == 'org.gnome.Books');
+    let application = new Application.Application();
     return application.run(args);
 }
diff --git a/src/mainToolbar.js b/src/mainToolbar.js
index 53fc6c01..2d291f86 100644
--- a/src/mainToolbar.js
+++ b/src/mainToolbar.js
@@ -87,15 +87,9 @@ var MainToolbar = new Lang.Class({
     },
 
     addMenuButton: function() {
-      let path = null;
       let model_name = null;
-      if (pkg.name == 'org.gnome.Books') {
-        path = "/org/gnome/Documents/ui/books-app-menu.ui";
-      } else {
-        path = "/org/gnome/Documents/ui/documents-app-menu.ui";
-      }
 
-      let builder = Gtk.Builder.new_from_resource(path);
+      let builder = Gtk.Builder.new_from_resource("/org/gnome/Documents/ui/books-app-menu.ui");
       let model = builder.get_object('app-menu');
       let menuButton = new Gtk.MenuButton({ image: new Gtk.Image ({ icon_name: 'open-menu-symbolic' }),
                                             tooltip_text: Gettext.pgettext("menu button tooltip", "Menu"),


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]