Commit 98370393 authored by Bastien Nocera's avatar Bastien Nocera

shell: Make app D-Bus name match application name

Just as for the daemon's name, make it match the application name.
parent 116bd1d0
......@@ -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 \
......
......@@ -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"
......
......@@ -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 */
......
......@@ -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'/>
......
......@@ -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"
......
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