[deja-dup/f18] * Mon Mar 25 2013 Kai Engert <kaie at redhat.com> - 24.0-3 - Hide status icon when using Gnome-Shell on

[Kai Engert]

commit edced2983b6c9375890d57cdc1585e0b9c563f9e
Author: Kai Engert <kaie at redhat.com>
Date:   Mon Mar 25 14:52:25 2013 +0100

    * Mon Mar 25 2013 Kai Engert <kaie at redhat.com> - 24.0-3
    - Hide status icon when using Gnome-Shell only. Upstream patch, fixes Cinnamon.

 deja-dup.spec                |    9 +++++++-
 restrict-status-hiding.patch |   48 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --git a/deja-dup.spec b/deja-dup.spec
index 42e1eb3..d9bb38a 100644
--- a/deja-dup.spec
+++ b/deja-dup.spec
@@ -1,6 +1,6 @@
 Name:           deja-dup
 Version:        24.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple backup tool and frontend for duplicity
 
 Group:          Applications/Archiving
@@ -8,6 +8,7 @@ License:        GPLv3+
 URL:            https://launchpad.net/deja-dup
 Source0:        http://launchpad.net/%{name}/24/%{version}/+download/%{name}-%{version}.tar.xz
 Patch0:         duplicity-tempdir.patch
+Patch1:         restrict-status-hiding.patch
 
 BuildRequires:  gettext desktop-file-utils intltool scrollkeeper
 BuildRequires:  yelp-tools pango-devel cairo-devel vala-devel
@@ -35,6 +36,9 @@ Features:
 %prep
 %setup -q
 %patch0 -b .tempdir
+# will be fixed in deja-dup 26
+# http://bazaar.launchpad.net/~deja-dup-hackers/deja-dup/26/revision/1440
+%patch1 -p0 -b .fixicon
 
 %build
 %configure --disable-static --with-nautilus --with-gnu-ld
@@ -87,6 +91,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/icons/hicolor/scalable/devices/deja-dup-cloud.svg
 
 %changelog
+* Mon Mar 25 2013 Kai Engert <kaie at redhat.com> - 24.0-3
+- Hide status icon when using Gnome-Shell only. Upstream patch, fixes Cinnamon.
+
 * Mon Mar 18 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 24.0-2
 - tmp on tmpfs patch. resolves rhbz#892063
 
diff --git a/restrict-status-hiding.patch b/restrict-status-hiding.patch
new file mode 100644
index 0000000..02c9810
--- /dev/null
+++ b/restrict-status-hiding.patch
@@ -0,0 +1,48 @@
+=== modified file 'widgets/WidgetUtils.vala'
+--- widgets/WidgetUtils.vala	2011-10-08 19:57:36 +0000
++++ widgets/WidgetUtils.vala	2013-03-18 12:01:46 +0000
+@@ -41,6 +41,11 @@
+   LEGACY
+ }
+ 
++[DBus (name = "org.gnome.Shell")]
++public interface GnomeShell : GLib.Object {
++    public abstract string ShellVersion { owned get; }
++}
++
+ protected ShellEnv shell = ShellEnv.NONE;
+ public ShellEnv get_shell()
+ {
+@@ -52,6 +57,8 @@
+     else
+ #endif
+     {
++      // Use Legacy unless we detect a different shell.
++      shell = ShellEnv.LEGACY;
+       // Next check for Shell by notification capabilities
+       unowned List<string> caps = Notify.get_server_caps();
+       bool persistence = false, actions = false;
+@@ -61,10 +68,18 @@
+         else if (cap == "actions")
+           actions = true;
+       }
+-      if (persistence && actions)
+-        shell = ShellEnv.GNOME;
+-      else
+-        shell = ShellEnv.LEGACY;
++      if (persistence && actions) {
++        // Ensure it's really Gnome-Shell, not a variation (like Cinnamon).
++        string gsv = null;
++        try {
++          GnomeShell gs = GLib.Bus.get_proxy_sync (BusType.SESSION, "org.gnome.Shell", "/org/gnome/Shell");
++          gsv = gs.ShellVersion;
++        } catch (Error e) {}
++        if (gsv != null) {
++          // It's really GnomeShell.
++          shell = ShellEnv.GNOME;
++        }
++      }
+     }
+   }
+ 
+