GNOME.org
 

[evince/wip/gpoo/Set-back-D-Bus-application-name-to-lowercase] Set back D-Bus application name to lowercase

commit d189395373aad656c32b64ecdfd6eb3a26d10e53
Author: Germán Poo-Caamaño <gpoo gnome org>
Date:   Wed Oct 3 14:56:56 2018 -0300

    Set back D-Bus application name to lowercase
    
    * Set application id lowercase
    * Make the daemon and application names match
    * Make the icons and desktop files match the
      application id
    * Keep the D-BUS interfaces backwards compatible,
      and enable
      the flatpak version to launch the daemon.
    * Take care of translations after renaming files.
    
    This commit also changes the application id for flatpak,
    which is a compromise.
    
    Backported from master, commit f99c554309.

 .gitlab-ci.yml                                        |   2 +-
 Makefile.am                                           |   2 +-
 README.md                                             |   2 +-
 .../comics/evince-comicsdocument.metainfo.xml.in.in   |   2 +-
 backend/djvu/evince-djvudocument.metainfo.xml.in.in   |   2 +-
 backend/dvi/evince-dvidocument.metainfo.xml.in.in     |   2 +-
 backend/pdf/evince-pdfdocument.metainfo.xml.in.in     |   2 +-
 backend/ps/evince-psdocument.metainfo.xml.in.in       |   2 +-
 backend/tiff/evince-tiffdocument.metainfo.xml.in.in   |   2 +-
 backend/xps/evince-xpsdocument.metainfo.xml.in.in     |   2 +-
 build-aux/flatpak/local-build.sh                      |   4 ++--
 build-aux/flatpak/org.gnome.Evince.json               |   2 +-
 build-aux/snap/snapcraft.yaml                         |  12 ++++++------
 configure.ac                                          |   4 ++--
 data/Makefile.am                                      |   6 +++---
 data/icons/16x16/apps/Makefile.am                     |   2 +-
 .../{org.gnome.Evince.png => org.gnome.evince.png}    | Bin
 data/icons/22x22/apps/Makefile.am                     |   2 +-
 .../{org.gnome.Evince.png => org.gnome.evince.png}    | Bin
 data/icons/24x24/apps/Makefile.am                     |   2 +-
 .../{org.gnome.Evince.png => org.gnome.evince.png}    | Bin
 data/icons/256x256/apps/Makefile.am                   |   2 +-
 .../{org.gnome.Evince.png => org.gnome.evince.png}    | Bin
 data/icons/48x48/apps/Makefile.am                     |   2 +-
 .../{org.gnome.Evince.png => org.gnome.evince.png}    | Bin
 data/icons/symbolic/apps/Makefile.am                  |   2 +-
 ...nce-symbolic.svg => org.gnome.evince-symbolic.svg} |   0
 ...in.in => org.gnome.evince-previewer.desktop.in.in} |   0
 ....service.in => org.gnome.evince.Daemon.service.in} |   2 +-
 ...e.desktop.in.in => org.gnome.evince.desktop.in.in} |   3 ++-
 ....Evince.service.in => org.gnome.evince.service.in} |   2 +-
 ....appdata.xml.in => org.gnome.evince.appdata.xml.in |   4 ++--
 po/POTFILES.in                                        |   8 ++++----
 po/POTFILES.skip                                      |  18 +++++++++++-------
 shell/Makefile.am                                     |   4 ++--
 shell/ev-application.c                                |  10 +++++-----
 shell/ev-daemon-gdbus.xml                             |   2 +-
 shell/ev-daemon.c                                     |   6 +++---
 shell/ev-gdbus.xml                                    |   4 ++--
 shell/ev-window.c                                     |   2 +-
 shell/main.c                                          |   2 +-
 41 files changed, 66 insertions(+), 61 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 366ea78a..58a100af 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,5 +46,5 @@ flatpak:
     artifacts:
         when: on_success
         paths:
-        - build-aux/flatpak/org.gnome.Evince.flatpak
+        - build-aux/flatpak/org.gnome.evince.flatpak
         expire_in: 2 days
diff --git a/Makefile.am b/Makefile.am
index 39fe7d54..c2bff983 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,7 @@ header_DATA = \
 # Appdata files
 
 appdatadir = $(datadir)/metainfo
-appdata_in_files = org.gnome.Evince.appdata.xml.in
+appdata_in_files = org.gnome.evince.appdata.xml.in
 nodist_appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 
 @INTLTOOL_XML_RULE@
diff --git a/README.md b/README.md
index 23439abe..918d5f66 100644
--- a/README.md
+++ b/README.md
@@ -30,4 +30,4 @@ This software is licensed under the [GPLv2][license].
 [tiff]: http://libtiff.org/
 [xps]: https://wiki.gnome.org/Projects/libgxps
 [license]: COPYING
-[evince-logo]: data/icons/48x48/apps/org.gnome.Evince.png
+[evince-logo]: data/icons/48x48/apps/org.gnome.evince.png
diff --git a/backend/comics/evince-comicsdocument.metainfo.xml.in.in 
b/backend/comics/evince-comicsdocument.metainfo.xml.in.in
index 4c441d3b..0f5e00b4 100644
--- a/backend/comics/evince-comicsdocument.metainfo.xml.in.in
+++ b/backend/comics/evince-comicsdocument.metainfo.xml.in.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
   <id>evince-comicsdocument</id>
-  <extends>org.gnome.Evince</extends>
+  <extends>org.gnome.evince</extends>
   <_name>Comic Books</_name>
   <_summary>Adds support for reading comic books</_summary>
   <mimetypes>
diff --git a/backend/djvu/evince-djvudocument.metainfo.xml.in.in 
b/backend/djvu/evince-djvudocument.metainfo.xml.in.in
index f48a8cb2..e86972f0 100644
--- a/backend/djvu/evince-djvudocument.metainfo.xml.in.in
+++ b/backend/djvu/evince-djvudocument.metainfo.xml.in.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
   <id>evince-djvudocument</id>
-  <extends>org.gnome.Evince</extends>
+  <extends>org.gnome.evince</extends>
   <_name>DjVu Documents</_name>
   <_summary>Adds support for reading DjVu documents</_summary>
   <mimetypes>
diff --git a/backend/dvi/evince-dvidocument.metainfo.xml.in.in 
b/backend/dvi/evince-dvidocument.metainfo.xml.in.in
index ae5c98bf..a24fc332 100644
--- a/backend/dvi/evince-dvidocument.metainfo.xml.in.in
+++ b/backend/dvi/evince-dvidocument.metainfo.xml.in.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
   <id>evince-dvidocument</id>
-  <extends>org.gnome.Evince</extends>
+  <extends>org.gnome.evince</extends>
   <_name>DVI Documents</_name>
   <_summary>Adds support for reading DVI documents</_summary>
   <mimetypes>
diff --git a/backend/pdf/evince-pdfdocument.metainfo.xml.in.in 
b/backend/pdf/evince-pdfdocument.metainfo.xml.in.in
index 6c5fcc8f..a732958e 100644
--- a/backend/pdf/evince-pdfdocument.metainfo.xml.in.in
+++ b/backend/pdf/evince-pdfdocument.metainfo.xml.in.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
   <id>evince-pdfocument</id>
-  <extends>org.gnome.Evince</extends>
+  <extends>org.gnome.evince</extends>
   <_name>PDF Documents</_name>
   <_summary>Adds support for reading PDF Documents</_summary>
   <mimetypes>
diff --git a/backend/ps/evince-psdocument.metainfo.xml.in.in b/backend/ps/evince-psdocument.metainfo.xml.in.in
index 4f3d1fd1..5794f74b 100644
--- a/backend/ps/evince-psdocument.metainfo.xml.in.in
+++ b/backend/ps/evince-psdocument.metainfo.xml.in.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
   <id>evince-psdocument</id>
-  <extends>org.gnome.Evince</extends>
+  <extends>org.gnome.evince</extends>
   <_name>PostScript Documents</_name>
   <_summary>Adds support for reading PostScript documents</_summary>
   <mimetypes>
diff --git a/backend/tiff/evince-tiffdocument.metainfo.xml.in.in 
b/backend/tiff/evince-tiffdocument.metainfo.xml.in.in
index e54ed74d..0adbd95c 100644
--- a/backend/tiff/evince-tiffdocument.metainfo.xml.in.in
+++ b/backend/tiff/evince-tiffdocument.metainfo.xml.in.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
   <id>evince-tiffdocument</id>
-  <extends>org.gnome.Evince</extends>
+  <extends>org.gnome.evince</extends>
   <_name>TIFF Documents</_name>
   <_summary>Adds support for reading TIFF documents</_summary>
   <mimetypes>
diff --git a/backend/xps/evince-xpsdocument.metainfo.xml.in.in 
b/backend/xps/evince-xpsdocument.metainfo.xml.in.in
index 557dfa7a..772bcf2f 100644
--- a/backend/xps/evince-xpsdocument.metainfo.xml.in.in
+++ b/backend/xps/evince-xpsdocument.metainfo.xml.in.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="addon">
   <id>evince-xpsdocument</id>
-  <extends>org.gnome.Evince</extends>
+  <extends>org.gnome.evince</extends>
   <_name>XPS Documents</_name>
   <_summary>Adds support for reading XPS documents</_summary>
   <mimetypes>
diff --git a/build-aux/flatpak/local-build.sh b/build-aux/flatpak/local-build.sh
index 3d54a166..d53b7a67 100755
--- a/build-aux/flatpak/local-build.sh
+++ b/build-aux/flatpak/local-build.sh
@@ -4,11 +4,11 @@ scriptdir=`dirname $0`
 olddir=`pwd`
 cd $scriptdir
 
-rm -f org.gnome.Evince.flatpak
+rm -f org.gnome.evince.flatpak
 rm -rf _build ; mkdir _build
 rm -rf _repo ; mkdir _repo
 
 flatpak-builder --ccache --force-clean _build org.gnome.Evince.json --repo=_repo
-flatpak build-bundle _repo org.gnome.Evince.flatpak org.gnome.Evince master
+flatpak build-bundle _repo org.gnome.evince.flatpak org.gnome.evince master
 
 cd $olddir
diff --git a/build-aux/flatpak/org.gnome.Evince.json b/build-aux/flatpak/org.gnome.Evince.json
index 36672c82..8fd95ab6 100644
--- a/build-aux/flatpak/org.gnome.Evince.json
+++ b/build-aux/flatpak/org.gnome.Evince.json
@@ -1,5 +1,5 @@
 {
-    "app-id" : "org.gnome.Evince",
+    "app-id" : "org.gnome.evince",
     "runtime" : "org.gnome.Platform",
     "runtime-version" : "master",
     "sdk" : "org.gnome.Sdk",
diff --git a/build-aux/snap/snapcraft.yaml b/build-aux/snap/snapcraft.yaml
index 9fbf769f..7c794ed6 100644
--- a/build-aux/snap/snapcraft.yaml
+++ b/build-aux/snap/snapcraft.yaml
@@ -19,7 +19,7 @@ slots:
   evince:
     interface: dbus
     bus: session
-    name: org.gnome.Evince
+    name: org.gnome.evince
 
 apps:
   evince:
@@ -32,7 +32,7 @@ apps:
       - network
       - unity7
       - wayland
-    desktop: usr/share/applications/org.gnome.Evince.desktop
+    desktop: usr/share/applications/org.gnome.evince.desktop
   evince-previewer:
     command: desktop-launch evince-previewer
     plugs:
@@ -43,7 +43,7 @@ apps:
       - network
       - unity7
       - wayland
-    desktop: usr/share/applications/org.gnome.Evince-previewer.desktop
+    desktop: usr/share/applications/org.gnome.evince-previewer.desktop
 
 parts:
   evince:
@@ -53,10 +53,10 @@ parts:
     source-type: git
     plugin: autotools
     prepare:
-      sed -i.bak -e 's|=evince$|=${SNAP}/meta/gui/evince.png|g' data/org.gnome.Evince.desktop.in.in
+      sed -i.bak -e 's|=evince$|=${SNAP}/meta/gui/evince.png|g' data/org.gnome.evince.desktop.in.in
     install: |
       mkdir -p $SNAPCRAFT_PART_INSTALL/meta/gui/
-      cp ../src/data/icons/256x256/apps/org.gnome.Evince.png $SNAPCRAFT_PART_INSTALL/meta/gui/
+      cp ../src/data/icons/256x256/apps/org.gnome.evince.png $SNAPCRAFT_PART_INSTALL/meta/gui/
       cp data/evince.desktop $SNAPCRAFT_PART_INSTALL/meta/gui/
     configflags: [--disable-maintainer-mode, --prefix=/snap/evince/current/usr]
     organize:
@@ -106,4 +106,4 @@ parts:
       - libpoppler58
     prime:
       - "usr/lib/x86_64-linux-gnu/libpoppler-glib.so.*"
-      - "usr/lib/x86_64-linux-gnu/libpoppler.so.*"
\ No newline at end of file
+      - "usr/lib/x86_64-linux-gnu/libpoppler.so.*"
diff --git a/configure.ac b/configure.ac
index 21584733..feec3c18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -954,8 +954,8 @@ cut-n-paste/unarr/Makefile
 cut-n-paste/unarr/common/Makefile
 cut-n-paste/unarr/lzmasdk/Makefile
 cut-n-paste/unarr/rar/Makefile
-data/org.gnome.Evince.desktop.in
-data/org.gnome.Evince-previewer.desktop.in
+data/org.gnome.evince.desktop.in
+data/org.gnome.evince-previewer.desktop.in
 data/Makefile
 data/icons/Makefile
 data/icons/16x16/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 22b84481..1f94663f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -23,7 +23,7 @@ ui_DATA =                             \
 
 @INTLTOOL_DESKTOP_RULE@
 
-DESKTOP_IN_FILES= org.gnome.Evince.desktop.in.in org.gnome.Evince-previewer.desktop.in.in
+DESKTOP_IN_FILES= org.gnome.evince.desktop.in.in org.gnome.evince-previewer.desktop.in.in
 DESKTOP_FILES= $(DESKTOP_IN_FILES:.desktop.in.in=.desktop)
 
 desktopdir = $(datadir)/applications
@@ -34,10 +34,10 @@ desktop_DATA = $(DESKTOP_FILES)
 #
 if ENABLE_DBUS
 servicedir = $(datadir)/dbus-1/services
-service_in_files = org.gnome.Evince.Daemon.service.in
+service_in_files = org.gnome.evince.Daemon.service.in
 service_DATA = $(service_in_files:.service.in=.service)
 
-systemd_user_in_files = org.gnome.Evince.service.in
+systemd_user_in_files = org.gnome.evince.service.in
 
 if WITH_SYSTEMD_USER_UNITS
 systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
diff --git a/data/icons/16x16/apps/Makefile.am b/data/icons/16x16/apps/Makefile.am
index 68d72ca5..9f96d16f 100644
--- a/data/icons/16x16/apps/Makefile.am
+++ b/data/icons/16x16/apps/Makefile.am
@@ -5,7 +5,7 @@ context = apps
 iconsdir = $(themedir)/$(size)/$(context)
 
 icons_DATA = \
-       org.gnome.Evince.png
+       org.gnome.evince.png
 
 noinst_DATA = 
 
diff --git a/data/icons/16x16/apps/org.gnome.Evince.png b/data/icons/16x16/apps/org.gnome.evince.png
similarity index 100%
rename from data/icons/16x16/apps/org.gnome.Evince.png
rename to data/icons/16x16/apps/org.gnome.evince.png
diff --git a/data/icons/22x22/apps/Makefile.am b/data/icons/22x22/apps/Makefile.am
index 5bd24083..59f83cae 100644
--- a/data/icons/22x22/apps/Makefile.am
+++ b/data/icons/22x22/apps/Makefile.am
@@ -5,7 +5,7 @@ context = apps
 iconsdir = $(themedir)/$(size)/$(context)
 
 icons_DATA = \
-       org.gnome.Evince.png
+       org.gnome.evince.png
 
 noinst_DATA = 
 
diff --git a/data/icons/22x22/apps/org.gnome.Evince.png b/data/icons/22x22/apps/org.gnome.evince.png
similarity index 100%
rename from data/icons/22x22/apps/org.gnome.Evince.png
rename to data/icons/22x22/apps/org.gnome.evince.png
diff --git a/data/icons/24x24/apps/Makefile.am b/data/icons/24x24/apps/Makefile.am
index 9fbd116a..3b185df9 100644
--- a/data/icons/24x24/apps/Makefile.am
+++ b/data/icons/24x24/apps/Makefile.am
@@ -5,7 +5,7 @@ context = apps
 iconsdir = $(themedir)/$(size)/$(context)
 
 icons_DATA = \
-       org.gnome.Evince.png
+       org.gnome.evince.png
 
 noinst_DATA = 
 
diff --git a/data/icons/24x24/apps/org.gnome.Evince.png b/data/icons/24x24/apps/org.gnome.evince.png
similarity index 100%
rename from data/icons/24x24/apps/org.gnome.Evince.png
rename to data/icons/24x24/apps/org.gnome.evince.png
diff --git a/data/icons/256x256/apps/Makefile.am b/data/icons/256x256/apps/Makefile.am
index 5b14e801..20fca7dd 100644
--- a/data/icons/256x256/apps/Makefile.am
+++ b/data/icons/256x256/apps/Makefile.am
@@ -5,7 +5,7 @@ context = apps
 iconsdir = $(themedir)/$(size)/$(context)
 
 icons_DATA = \
-       org.gnome.Evince.png
+       org.gnome.evince.png
 
 noinst_DATA = 
 
diff --git a/data/icons/256x256/apps/org.gnome.Evince.png b/data/icons/256x256/apps/org.gnome.evince.png
similarity index 100%
rename from data/icons/256x256/apps/org.gnome.Evince.png
rename to data/icons/256x256/apps/org.gnome.evince.png
diff --git a/data/icons/48x48/apps/Makefile.am b/data/icons/48x48/apps/Makefile.am
index f8428fa8..dc25ae84 100644
--- a/data/icons/48x48/apps/Makefile.am
+++ b/data/icons/48x48/apps/Makefile.am
@@ -5,7 +5,7 @@ context = apps
 iconsdir = $(themedir)/$(size)/$(context)
 
 icons_DATA = \
-       org.gnome.Evince.png
+       org.gnome.evince.png
 
 noinst_DATA = 
 
diff --git a/data/icons/48x48/apps/org.gnome.Evince.png b/data/icons/48x48/apps/org.gnome.evince.png
similarity index 100%
rename from data/icons/48x48/apps/org.gnome.Evince.png
rename to data/icons/48x48/apps/org.gnome.evince.png
diff --git a/data/icons/symbolic/apps/Makefile.am b/data/icons/symbolic/apps/Makefile.am
index 220b16e0..d23d6375 100644
--- a/data/icons/symbolic/apps/Makefile.am
+++ b/data/icons/symbolic/apps/Makefile.am
@@ -5,7 +5,7 @@ context = apps
 iconsdir = $(themedir)/$(size)/$(context)
 
 icons_DATA = \
-       org.gnome.Evince-symbolic.svg
+       org.gnome.evince-symbolic.svg
 
 noinst_DATA =
 
diff --git a/data/icons/symbolic/apps/org.gnome.Evince-symbolic.svg 
b/data/icons/symbolic/apps/org.gnome.evince-symbolic.svg
similarity index 100%
rename from data/icons/symbolic/apps/org.gnome.Evince-symbolic.svg
rename to data/icons/symbolic/apps/org.gnome.evince-symbolic.svg
diff --git a/data/org.gnome.Evince-previewer.desktop.in.in b/data/org.gnome.evince-previewer.desktop.in.in
similarity index 100%
rename from data/org.gnome.Evince-previewer.desktop.in.in
rename to data/org.gnome.evince-previewer.desktop.in.in
diff --git a/data/org.gnome.Evince.Daemon.service.in b/data/org.gnome.evince.Daemon.service.in
similarity index 59%
rename from data/org.gnome.Evince.Daemon.service.in
rename to data/org.gnome.evince.Daemon.service.in
index c51f3bf0..c987f59a 100644
--- a/data/org.gnome.Evince.Daemon.service.in
+++ b/data/org.gnome.evince.Daemon.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.gnome.Evince.Daemon
+Name=org.gnome.evince.Daemon
 Exec=@libexecdir@/evinced
diff --git a/data/org.gnome.Evince.desktop.in.in b/data/org.gnome.evince.desktop.in.in
similarity index 75%
rename from data/org.gnome.Evince.desktop.in.in
rename to data/org.gnome.evince.desktop.in.in
index dbe87deb..2520d75e 100644
--- a/data/org.gnome.Evince.desktop.in.in
+++ b/data/org.gnome.evince.desktop.in.in
@@ -7,7 +7,8 @@ Exec=evince %U
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=org.gnome.Evince
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=org.gnome.evince
 X-GNOME-DocPath=
 Categories=GNOME;GTK;Office;Viewer;Graphics;2DGraphics;VectorGraphics;
 MimeType=@EVINCE_MIME_TYPES@;
diff --git a/data/org.gnome.Evince.service.in b/data/org.gnome.evince.service.in
similarity index 79%
rename from data/org.gnome.Evince.service.in
rename to data/org.gnome.evince.service.in
index b56916e0..3d19bcc8 100644
--- a/data/org.gnome.Evince.service.in
+++ b/data/org.gnome.evince.service.in
@@ -4,5 +4,5 @@ Documentation=man:evince(1)
 
 [Service]
 Type=dbus
-BusName=org.gnome.Evince.Daemon
+BusName=org.gnome.evince.Daemon
 ExecStart=@libexecdir@/evinced
diff --git a/org.gnome.Evince.appdata.xml.in b/org.gnome.evince.appdata.xml.in
similarity index 97%
rename from org.gnome.Evince.appdata.xml.in
rename to org.gnome.evince.appdata.xml.in
index dc47d253..2cb37643 100644
--- a/org.gnome.Evince.appdata.xml.in
+++ b/org.gnome.evince.appdata.xml.in
@@ -16,8 +16,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <component type="desktop-application">
-  <id>org.gnome.Evince</id>
-  <launchable type="desktop-id">org.gnome.Evince.desktop</launchable>
+  <id>org.gnome.evince</id>
+  <launchable type="desktop-id">org.gnome.evince.desktop</launchable>
   <metadata_license>GPL-2.0+ or GFDL-1.3-only</metadata_license>
   <project_license>GPL-2.0+</project_license>
   <_name>Evince</_name>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 41236467..96ff5bc4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -22,9 +22,9 @@ backend/tiff/evince-tiffdocument.metainfo.xml.in.in
 backend/xps/evince-xpsdocument.metainfo.xml.in.in
 [type: gettext/ini]backend/xps/xpsdocument.evince-backend.in.in
 browser-plugin/EvBrowserPluginToolbar.cpp
-data/org.gnome.Evince.desktop.in.in
-data/org.gnome.Evince-previewer.desktop.in.in
-data/org.gnome.Evince.gschema.xml.in
+data/org.gnome.evince.desktop.in.in
+data/org.gnome.Evince.gschema.xml
+data/org.gnome.evince-previewer.desktop.in.in
 libdocument/ev-attachment.c
 libdocument/ev-document-factory.c
 libdocument/ev-file-helpers.c
@@ -64,4 +64,4 @@ shell/ev-zoom-action.c
 shell/main.c
 [type: gettext/glade]shell/evince-menus.ui
 [type: gettext/glade]shell/help-overlay.ui
-org.gnome.Evince.appdata.xml.in
+org.gnome.evince.appdata.xml.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index d569618b..f4361297 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -22,14 +22,18 @@ backend/dvi/mdvi-lib/tt.c
 backend/dvi/mdvi-lib/util.c
 backend/dvi/mdvi-lib/vf.c
 backend/pdf/evince-pdfdocument.metainfo.xml.in
-backend/pdf/pdfdocument.evince-backend.desktop.in
 backend/ps/evince-psdocument.metainfo.xml.in
-backend/ps/psdocument.evince-backend.desktop.in
 backend/tiff/evince-tiffdocument.metainfo.xml.in
-backend/tiff/tiffdocument.evince-backend.desktop.in
 backend/xps/evince-xpsdocument.metainfo.xml.in
-backend/xps/xpsdocument.evince-backend.desktop.in
 cut-n-paste/unarr/common/conv.c
-data/org.gnome.Evince.desktop.in
-data/org.gnome.Evince-previewer.desktop.in
-data/org.gnome.Evince.Daemon.service.in
+
+sub/backend/comics/evince-comicsdocument.metainfo.xml.in
+sub/backend/djvu/evince-djvudocument.metainfo.xml.in
+sub/backend/dvi/evince-dvidocument.metainfo.xml.in
+sub/backend/pdf/evince-pdfdocument.metainfo.xml.in
+sub/backend/ps/evince-psdocument.metainfo.xml.in
+sub/backend/tiff/evince-tiffdocument.metainfo.xml.in
+sub/backend/xps/evince-xpsdocument.metainfo.xml.in
+sub/data/org.gnome.evince.desktop.in
+sub/data/org.gnome.evince-previewer.desktop.in
+sub/data/org.gnome.evince.Daemon.service.in
diff --git a/shell/Makefile.am b/shell/Makefile.am
index a3302fc5..092f7780 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -191,7 +191,7 @@ ev-resources.c: $(GRESOURCE_XML_FILE) Makefile $(shell $(GLIB_COMPILE_RESOURCES)
 
 ev-gdbus-generated.c ev-gdbus-generated.h: ev-gdbus.xml Makefile
        $(AM_V_GEN) $(GDBUS_CODEGEN) \
-                       --interface-prefix=org.gnome.Evince \
+                       --interface-prefix=org.gnome.evince \
                        --c-namespace=Ev \
                        --c-generate-object-manager \
                        --generate-c-code ev-gdbus-generated \
@@ -199,7 +199,7 @@ ev-gdbus-generated.c ev-gdbus-generated.h: ev-gdbus.xml Makefile
 
 ev-daemon-gdbus-generated.c ev-daemon-gdbus-generated.h: ev-daemon-gdbus.xml Makefile
        $(AM_V_GEN) $(GDBUS_CODEGEN) \
-                       --interface-prefix=org.gnome.Evince \
+                       --interface-prefix=org.gnome.evince \
                        --c-namespace=Ev \
                        --c-generate-object-manager \
                        --generate-c-code ev-daemon-gdbus-generated \
diff --git a/shell/ev-application.c b/shell/ev-application.c
index f58b349b..d226a954 100644
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -65,13 +65,13 @@ struct _EvApplicationClass {
 G_DEFINE_TYPE (EvApplication, ev_application, GTK_TYPE_APPLICATION)
 
 #ifdef ENABLE_DBUS
-#define APPLICATION_NAME             "org.gnome.Evince"
+#define APPLICATION_NAME             "org.gnome.evince"
 #define APPLICATION_DBUS_OBJECT_PATH "/org/gnome/evince/Evince"
-#define APPLICATION_DBUS_INTERFACE   "org.gnome.Evince.Application"
+#define APPLICATION_DBUS_INTERFACE   "org.gnome.evince.Application"
 
-#define EVINCE_DAEMON_SERVICE        "org.gnome.Evince.Daemon"
+#define EVINCE_DAEMON_SERVICE        "org.gnome.evince.Daemon"
 #define EVINCE_DAEMON_OBJECT_PATH    "/org/gnome/evince/Daemon"
-#define EVINCE_DAEMON_INTERFACE      "org.gnome.Evince.Daemon"
+#define EVINCE_DAEMON_INTERFACE      "org.gnome.evince.Daemon"
 #endif
 
 static void _ev_application_open_uri_at_dest (EvApplication  *application,
@@ -993,7 +993,7 @@ app_about_cb (GSimpleAction *action,
                                "authors", authors,
                                "documenters", documenters,
                                "translator-credits", _("translator-credits"),
-                               "logo-icon-name", "org.gnome.Evince",
+                               "logo-icon-name", "org.gnome.evince",
                                NULL);
 }
 
diff --git a/shell/ev-daemon-gdbus.xml b/shell/ev-daemon-gdbus.xml
index 5cb469dc..6b4f9d15 100644
--- a/shell/ev-daemon-gdbus.xml
+++ b/shell/ev-daemon-gdbus.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Introspection 0.1//EN"
                       "http://www.freedesktop.org/software/dbus/introspection.dtd";>
 <node>
-  <interface name="org.gnome.Evince.Daemon">
+  <interface name="org.gnome.evince.Daemon">
     <method name="RegisterDocument">
       <arg type="s" name="uri" direction="in"/>
       <arg type="s" name="owner" direction="out"/>
diff --git a/shell/ev-daemon.c b/shell/ev-daemon.c
index a8e584fe..91fdd19a 100644
--- a/shell/ev-daemon.c
+++ b/shell/ev-daemon.c
@@ -33,11 +33,11 @@
 
 #include "ev-daemon-gdbus-generated.h"
 
-#define EV_DBUS_DAEMON_NAME             "org.gnome.Evince.Daemon"
-#define EV_DBUS_DAEMON_INTERFACE_NAME   "org.gnome.Evince.Daemon"
+#define EV_DBUS_DAEMON_NAME             "org.gnome.evince.Daemon"
+#define EV_DBUS_DAEMON_INTERFACE_NAME   "org.gnome.evince.Daemon"
 #define EV_DBUS_DAEMON_OBJECT_PATH      "/org/gnome/evince/Daemon"
 
-#define EV_DBUS_WINDOW_INTERFACE_NAME   "org.gnome.Evince.Window"
+#define EV_DBUS_WINDOW_INTERFACE_NAME   "org.gnome.evince.Window"
 
 #define DAEMON_TIMEOUT (30) /* seconds */
 
diff --git a/shell/ev-gdbus.xml b/shell/ev-gdbus.xml
index dcded61c..b6b50d12 100644
--- a/shell/ev-gdbus.xml
+++ b/shell/ev-gdbus.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Introspection 0.1//EN"
                       "http://www.freedesktop.org/software/dbus/introspection.dtd";>
 <node>
-  <interface name='org.gnome.Evince.Application'>
+  <interface name='org.gnome.evince.Application'>
     <annotation name="org.gtk.GDBus.C.Name" value="EvinceApplication" />
     <method name='Reload'>
       <arg type='a{sv}' name='args' direction='in'/>
@@ -12,7 +12,7 @@
       <arg type='ao' name='window_list' direction='out'/>
     </method>
   </interface>
-  <interface name='org.gnome.Evince.Window'>
+  <interface name='org.gnome.evince.Window'>
     <annotation name="org.gtk.GDBus.C.Name" value="EvinceWindow" />
     <method name='SyncView'>
       <arg type='s' name='source_file' direction='in'/>
diff --git a/shell/ev-window.c b/shell/ev-window.c
index 1e29a6ce..8faa4ed3 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -256,7 +256,7 @@ struct _EvWindowPrivate {
 
 #ifdef ENABLE_DBUS
 #define EV_WINDOW_DBUS_OBJECT_PATH "/org/gnome/evince/Window/%d"
-#define EV_WINDOW_DBUS_INTERFACE   "org.gnome.Evince.Window"
+#define EV_WINDOW_DBUS_INTERFACE   "org.gnome.evince.Window"
 #endif
 
 #define GS_SCHEMA_NAME           "org.gnome.Evince"
diff --git a/shell/main.c b/shell/main.c
index 6c54078b..98a7ed5f 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -296,7 +296,7 @@ main (int argc, char *argv[])
 
        /* Manually set name and icon */
        g_set_application_name (_("Document Viewer"));
-       gtk_window_set_default_icon_name ("org.gnome.Evince");
+       gtk_window_set_default_icon_name ("org.gnome.evince");
 
         application = ev_application_new ();
         if (!g_application_register (G_APPLICATION (application), NULL, &error)) {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]