1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
From 61b357eed343d98e63ac898440759fea18067f53 Mon Sep 17 00:00:00 2001
From: Iain Lane <iain.lane@canonical.com>
Date: Sat, 22 Jun 2013 22:45:33 +0000
Subject: Add a desktop file for Ubuntu Online Accounts.
This is required for E-D-S to show up in the Ubuntu Online Accounts
configuration UI. It's only installed when built with UOA support.
---
diff --git a/configure.ac b/configure.ac
index 96aedb1..90327a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1707,6 +1707,7 @@ modules/ubuntu-online-accounts/Makefile
modules/ubuntu-online-accounts/calendar.service-type.in
modules/ubuntu-online-accounts/contacts.service-type.in
modules/ubuntu-online-accounts/evolution-data-server.application.in
+modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in
modules/ubuntu-online-accounts/google-calendar.service.in
modules/ubuntu-online-accounts/google-contacts.service.in
modules/ubuntu-online-accounts/google-gmail.service.in
diff --git a/modules/ubuntu-online-accounts/Makefile.am b/modules/ubuntu-online-accounts/Makefile.am
index 581bbe5..3669c04 100644
--- a/modules/ubuntu-online-accounts/Makefile.am
+++ b/modules/ubuntu-online-accounts/Makefile.am
@@ -65,6 +65,12 @@ service_DATA = \
yahoo-calendar.service \
$(NULL)
+desktopdir = $(datadir)/applications
+desktop_in_files = evolution-data-server-uoa.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+@INTLTOOL_DESKTOP_RULE@
+
EXTRA_DIST = \
evolution-data-server.application.in.in \
mail.service-type.in.in \
@@ -75,10 +81,12 @@ EXTRA_DIST = \
google-contacts.service.in.in \
yahoo-mail.service.in.in \
yahoo-calendar.service.in.in \
+ $(desktop_DATA) \
$(NULL)
DISTCLEANFILES = \
$(application_DATA) \
+ $(desktop_DATA) \
$(servicetype_DATA) \
$(service_DATA) \
$(NULL)
diff --git a/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in b/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in
new file mode 100644
index 0000000..1273f95
--- /dev/null
+++ b/modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+_Name=Evolution Data Server
+_Comment=Required to have EDS appear in UOA
+Type=Application
+NoDisplay=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=evolution-data-server
+X-GNOME-Bugzilla-Component=General
+X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/modules/ubuntu-online-accounts/evolution-data-server.application.in.in b/modules/ubuntu-online-accounts/evolution-data-server.application.in.in
index 8d9277e..883c12a 100644
--- a/modules/ubuntu-online-accounts/evolution-data-server.application.in.in
+++ b/modules/ubuntu-online-accounts/evolution-data-server.application.in.in
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<application id="evolution-data-server">
- <description>Evolution-Data-Server</description>
+ <description>Evolution Data Server</description>
+ <desktop-entry>evolution-data-server-uoa.desktop</desktop-entry>
<translations>@GETTEXT_PACKAGE@</translations>
<service-types>
<service-type id="mail"/>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5ee0de3..2deeb43 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -204,6 +204,7 @@ modules/trust-prompt/trust-prompt-gtk.c
[type: gettext/xml]modules/ubuntu-online-accounts/calendar.service-type.in.in
[type: gettext/xml]modules/ubuntu-online-accounts/contacts.service-type.in.in
modules/ubuntu-online-accounts/e-signon-session-password.c
+modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in.in
[type: gettext/xml]modules/ubuntu-online-accounts/google-calendar.service.in.in
[type: gettext/xml]modules/ubuntu-online-accounts/google-contacts.service.in.in
[type: gettext/xml]modules/ubuntu-online-accounts/google-gmail.service.in.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 541f86e..c52ce22 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -5,6 +5,7 @@ camel/providers/nntp/camel-nntp-grouplist.c
camel/providers/nntp/camel-nntp-newsrc.c
camel/providers/nntp/camel-nntp-utils.c
camel/providers/nntp/test-newsrc.c
+modules/ubuntu-online-accounts/evolution-data-server-uoa.desktop.in
modules/ubuntu-online-accounts/google-contacts.service.in
modules/ubuntu-online-accounts/google-gmail.service.in
servers/exchange/lib/e2k-user-dialog.c
|