Commit 116bd1d0 authored by Bastien Nocera's avatar Bastien Nocera

shell: Make evinced D-Bus name match application name

D-Bus names are case sensitive, so we need to use org.gnome.Evince.Daemon
not org.gnome.evince.Daemon as its name.

Closes: #990
parent dddd98b4
......@@ -34,7 +34,7 @@ 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
......
[D-BUS Service]
Name=org.gnome.evince.Daemon
Name=org.gnome.Evince.Daemon
Exec=@libexecdir@/evinced
@if_systemd_service@SystemdService=org.gnome.Evince.service
......@@ -4,5 +4,5 @@ Documentation=man:evince(1)
[Service]
Type=dbus
BusName=org.gnome.evince.Daemon
BusName=org.gnome.Evince.Daemon
ExecStart=@libexecdir@/evinced
......@@ -25,7 +25,7 @@ backend/xps/evince-xpsdocument.metainfo.xml.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
sub/backend/comics/evince-comicsdocument.metainfo.xml.in
sub/backend/djvu/evince-djvudocument.metainfo.xml.in
......@@ -36,4 +36,4 @@ 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
sub/data/org.gnome.Evince.Daemon.service.in
......@@ -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 \
......
......@@ -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,
......
......@@ -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"/>
......
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment