[evince/wip/gpoo/fix-dbus-and-flatpak: 3/4] Revert "shell: Make evinced D-Bus name match application name"

[Germán Poo-Caamaño <gpoo src gnome org>]

commit adc1fb72c8eca9e2bf9aaf905d9b645db6b2c0c9
Author: Germán Poo-Caamaño <gpoo gnome org>
Date:   Sun Oct 7 00:02:00 2018 -0300

    Revert "shell: Make evinced D-Bus name match application name"
    
    This reverts commit 116bd1d0229416ac5f96e87f51654f86e49078f0.

 data/Makefile.am                                                      | 2 +-
 data/org.gnome.Evince.service.in                                      | 2 +-
 ...me.Evince.Daemon.service.in => org.gnome.evince.Daemon.service.in} | 2 +-
 po/POTFILES.skip                                                      | 2 +-
 shell/Makefile.am                                                     | 2 +-
 shell/ev-application.c                                                | 4 ++--
 shell/ev-daemon-gdbus.xml                                             | 2 +-
 shell/ev-daemon.c                                                     | 4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 96cd6bf4..2cf12da7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -38,7 +38,7 @@ org.gnome.Evince.desktop: org.gnome.Evince.desktop.in
 #
 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
diff --git a/data/org.gnome.Evince.service.in b/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/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/po/POTFILES.skip b/po/POTFILES.skip
index d569618b..32447881 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -32,4 +32,4 @@ 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
+data/org.gnome.evince.Daemon.service.in
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 92c52584..092f7780 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -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 9baa8db9..42fef8cb 100644
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -69,9 +69,9 @@ G_DEFINE_TYPE (EvApplication, ev_application, GTK_TYPE_APPLICATION)
 #define APPLICATION_DBUS_OBJECT_PATH "/org/gnome/evince/Evince"
 #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,
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 145b5813..91fdd19a 100644
--- a/shell/ev-daemon.c
+++ b/shell/ev-daemon.c
@@ -33,8 +33,8 @@
 
 #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"