Merge lp:~darkxst/ubuntu/saucy/evolution-data-server/lp1184234 into lp:~ubuntu-desktop/evolution-data-server/ubuntu

[Tim Lunn]

[Iain Lane (laney)]

Thanks - don't suppose you could forward it upstream too could you?

[Iain Lane (laney)]

review: Approve

[Iain Lane (laney)]

Although, hmm, what happens when evolution isn't installed? Perhaps it'd be better for eds to have its own maybe?

[Tim Lunn (darkxst)]

Yes will forward it upstream.

If evolution is not installed, then it won't find the desktop file and will end up with the previous behaviour of emitting a warning and not display in UOA.

[Tim Lunn (darkxst)]

actually maybe e-d-s should install its own desktop file, since the UOA integration should work across the gnome stack, not just evolution?

[Iain Lane (laney)]

On Mon, Jun 10, 2013 at 10:33:26PM -0000, Tim wrote:
> actually maybe e-d-s should install its own desktop file, since the UOA integration should work across the gnome stack, not just evolution?

I think so. I'm not sure anything else actually does use it currently,
but it could in the future.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Tim Lunn (darkxst)]

gnome-contacts seems to work, documents has not been implemented.

[Iain Lane (laney)]

On Tue, Jun 11, 2013 at 08:27:28AM -0000, Tim wrote:
> gnome-contacts seems to work, documents has not been implemented.

So yes, doing this in eds seems to make sense to me. If you propose this
directly upstream (ask mardy to review, maybe?) then we can easily
cherry-pick or you can ask for it to be pushed into the 3.8 branch and
we'll get it normally.

Thanks for your work!

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Jeremy Bícha (jbicha)]

We merged Laney's latest version of this patch.

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-07 15:59:38 +0000
+++ debian/changelog	2013-06-10 02:17:30 +0000
@@ -1,3 +1,11 @@
+evolution-data-server (3.8.2-1ubuntu3) UNRELEASED; urgency=low
+
+  * debian/patches/uoa_eds_desktop_entry.patch
+    - UOA: Add desktop_entry to e-d-s application provider so that e-d-s
+      integration can be toggled on/off from UOA. (LP: #1184234)
+
+ -- Tim Lunn <[e-mail]>  Mon, 10 Jun 2013 12:10:22 +1000
+
 evolution-data-server (3.8.2-1ubuntu2) saucy; urgency=low
 
   * debian/patches/uoa_google_responsetype.patch

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-06-07 15:59:38 +0000
+++ debian/patches/series	2013-06-10 02:17:30 +0000
@@ -1,1 +1,2 @@
 uoa_google_responsetype.patch
+uoa_eds_desktop_entry.patch

=== added file 'debian/patches/uoa_eds_desktop_entry.patch'
--- debian/patches/uoa_eds_desktop_entry.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/uoa_eds_desktop_entry.patch	2013-06-10 02:17:30 +0000
@@ -0,0 +1,10 @@
+--- 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>
++  <desktop-entry>evolution.desktop</desktop-entry>
+   <translations>@GETTEXT_PACKAGE@</translations>
+   <service-types>
+     <service-type id="mail"/>