r48596 - in /packages/unstable/gnome-calendar/debian: changelog patches/0001-Hide-GOA-sources-on-Unity.patch

[laney at users.alioth.debian.org]

Author: laney
Date: Wed May 11 12:19:01 2016
New Revision: 48596

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48596
Log:
debian/patches/0001-Hide-GOA-sources-on-Unity.patch: Fix Unity detection
for starting GOA.

Modified:
    packages/unstable/gnome-calendar/debian/changelog
    packages/unstable/gnome-calendar/debian/patches/0001-Hide-GOA-sources-on-Unity.patch

Modified: packages/unstable/gnome-calendar/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-calendar/debian/changelog?rev=48596&op=diff
==============================================================================
--- packages/unstable/gnome-calendar/debian/changelog	[utf-8] (original)
+++ packages/unstable/gnome-calendar/debian/changelog	[utf-8] Wed May 11 12:19:01 2016
@@ -1,3 +1,10 @@
+gnome-calendar (3.20.1-2) UNRELEASED; urgency=medium
+
+  * debian/patches/0001-Hide-GOA-sources-on-Unity.patch: Fix Unity detection
+    for starting GOA.
+
+ -- Iain Lane <laney at debian.org>  Wed, 11 May 2016 13:10:29 +0100
+
 gnome-calendar (3.20.1-1) unstable; urgency=medium
 
   * New upstream release.

Modified: packages/unstable/gnome-calendar/debian/patches/0001-Hide-GOA-sources-on-Unity.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-calendar/debian/patches/0001-Hide-GOA-sources-on-Unity.patch?rev=48596&op=diff
==============================================================================
--- packages/unstable/gnome-calendar/debian/patches/0001-Hide-GOA-sources-on-Unity.patch	[utf-8] (original)
+++ packages/unstable/gnome-calendar/debian/patches/0001-Hide-GOA-sources-on-Unity.patch	[utf-8] Wed May 11 12:19:01 2016
@@ -12,6 +12,8 @@
  src/gcal-source-dialog.c |  9 +++++++++
  2 files changed, 19 insertions(+), 4 deletions(-)
 
+Index: b/src/gcal-manager.c
+===================================================================
 --- a/src/gcal-manager.c
 +++ b/src/gcal-manager.c
 @@ -21,6 +21,7 @@
@@ -39,7 +41,7 @@
 -                  (GAsyncReadyCallback) gcal_manager_client_ready_cb,
 -                  object);
 +  desktop = g_getenv ("XDG_CURRENT_DESKTOP");
-+  if (desktop && strstr (desktop, "Unity"))
++  if (!desktop || !strstr (desktop, "Unity"))
 +    {
 +      /* load GOA client */
 +      goa_client_new (NULL, // we won't really cancel it
@@ -49,6 +51,8 @@
  
    /* reading sources and schedule its connecting */
    manager->source_registry = e_source_registry_new_sync (NULL, &error);
+Index: b/src/gcal-source-dialog.c
+===================================================================
 --- a/src/gcal-source-dialog.c
 +++ b/src/gcal-source-dialog.c
 @@ -38,6 +38,7 @@