[evince/wip/hadess/dbus-names: 2/2] shell: Make app D-Bus name match application name

[Bastien Nocera <hadess src gnome org>]

commit 98370393d264c79e99ac2810a95f5825ef8d6398
Author: Bastien Nocera <hadess hadess net>
Date:   Sat Sep 22 02:17:23 2018 +0200

    shell: Make app D-Bus name match application name
    
    Just as for the daemon's name, make it match the application name.

 shell/Makefile.am      | 2 +-
 shell/ev-application.c | 2 +-
 shell/ev-daemon.c      | 2 +-
 shell/ev-gdbus.xml     | 4 ++--
 shell/ev-window.c      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 92c52584..a3302fc5 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 \
diff --git a/shell/ev-application.c b/shell/ev-application.c
index 9baa8db9..f58b349b 100644
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -67,7 +67,7 @@ G_DEFINE_TYPE (EvApplication, ev_application, GTK_TYPE_APPLICATION)
 #ifdef ENABLE_DBUS
 #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_OBJECT_PATH    "/org/gnome/evince/Daemon"
diff --git a/shell/ev-daemon.c b/shell/ev-daemon.c
index 145b5813..a8e584fe 100644
--- a/shell/ev-daemon.c
+++ b/shell/ev-daemon.c
@@ -37,7 +37,7 @@
 #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 b6b50d12..dcded61c 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 142836ba..177a1233 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"