Commit 63ceaa99 authored by Germán Poo-Caamaño's avatar Germán Poo-Caamaño

Revert "Set back D-Bus application name to lowercase"

This reverts commit f99c5543.
parent f99c5543
......@@ -76,5 +76,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
......@@ -46,10 +46,10 @@ 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)
org.gnome.evince.appdata.xml: org.gnome.evince.appdata.xml.in
org.gnome.Evince.appdata.xml: org.gnome.Evince.appdata.xml.in
$(AM_V_GEN)$(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
# Applications
......
......@@ -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
<?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>
......
<?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>
......
<?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>
......
<?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>
......
<?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>
......
<?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>
......
<?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>
......
......@@ -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
{
"app-id" : "org.gnome.evince",
"app-id" : "org.gnome.Evince",
"runtime" : "org.gnome.Platform",
"runtime-version" : "master",
"sdk" : "org.gnome.Sdk",
......
......@@ -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.*"
- "usr/lib/x86_64-linux-gnu/libpoppler.so.*"
\ No newline at end of file
......@@ -953,8 +953,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
......
......@@ -21,16 +21,16 @@ ui_DATA = \
# Desktop file
#
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
desktop_DATA = $(DESKTOP_FILES)
org.gnome.evince-previewer.desktop: org.gnome.evince-previewer.desktop.in
org.gnome.Evince-previewer.desktop: org.gnome.Evince-previewer.desktop.in
$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
org.gnome.evince.desktop: org.gnome.evince.desktop.in
org.gnome.Evince.desktop: org.gnome.Evince.desktop.in
$(AM_V_GEN)$(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
#
......@@ -38,10 +38,10 @@ 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
systemd_user_in_files = org.gnome.Evince.service.in
if WITH_SYSTEMD_USER_UNITS
systemd_user_DATA = $(systemd_user_in_files:.service.in=.service)
......
......@@ -5,7 +5,7 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
icons_DATA = \
org.gnome.evince.png
org.gnome.Evince.png
noinst_DATA =
......
......@@ -5,7 +5,7 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
icons_DATA = \
org.gnome.evince.png
org.gnome.Evince.png
noinst_DATA =
......
......@@ -5,7 +5,7 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
icons_DATA = \
org.gnome.evince.png
org.gnome.Evince.png
noinst_DATA =
......
......@@ -5,7 +5,7 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
icons_DATA = \
org.gnome.evince.png
org.gnome.Evince.png
noinst_DATA =
......
......@@ -5,7 +5,7 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
icons_DATA = \
org.gnome.evince.png
org.gnome.Evince.png
noinst_DATA =
......
......@@ -5,7 +5,7 @@ context = apps
iconsdir = $(themedir)/$(size)/$(context)
icons_DATA = \
org.gnome.evince-symbolic.svg
org.gnome.Evince-symbolic.svg
noinst_DATA =
......
[D-BUS Service]
Name=org.gnome.evince.Daemon
Name=org.gnome.Evince.Daemon
Exec=@libexecdir@/evinced
......@@ -9,6 +9,6 @@ StartupNotify=true
Terminal=false
Type=Application
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=org.gnome.evince
Icon=org.gnome.Evince
Categories=GNOME;GTK;Office;Viewer;Graphics;2DGraphics;VectorGraphics;
MimeType=@EVINCE_MIME_TYPES@;
......@@ -4,5 +4,5 @@ Documentation=man:evince(1)
[Service]
Type=dbus
BusName=org.gnome.evince.Daemon
BusName=org.gnome.Evince.Daemon
ExecStart=@libexecdir@/evinced
......@@ -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>
......
......@@ -21,9 +21,9 @@ backend/tiff/tiffdocument.evince-backend.desktop.in.in
backend/xps/evince-xpsdocument.metainfo.xml.in.in
backend/xps/xpsdocument.evince-backend.desktop.in.in
browser-plugin/EvBrowserPluginToolbar.cpp
data/org.gnome.evince.desktop.in.in
data/org.gnome.Evince.desktop.in.in
data/org.gnome.Evince.gschema.xml
data/org.gnome.evince-previewer.desktop.in.in
data/org.gnome.Evince-previewer.desktop.in.in
libdocument/ev-attachment.c
libdocument/ev-document-factory.c
libdocument/ev-file-helpers.c
......@@ -35,7 +35,7 @@ libview/ev-print-operation.c
libview/ev-view-accessible.c
libview/ev-view.c
libview/ev-view-presentation.c
org.gnome.evince.appdata.xml.in
org.gnome.Evince.appdata.xml.in
previewer/ev-previewer.c
previewer/ev-previewer-window.c
properties/ev-properties-main.c
......
......@@ -30,6 +30,6 @@ 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
data/org.gnome.Evince.desktop.in
data/org.gnome.Evince-previewer.desktop.in
data/org.gnome.Evince.Daemon.service.in
......@@ -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 \
......
......@@ -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);
}
......
......@@ -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,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 */
......
......@@ -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"
......
......@@ -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)) {
......
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