[libreoffice] 51/152: lp#1506544: reenable unity-default-breeze, which wasnt reenabled on 5.1 yet

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit 52a926a01104a0caadb1c93a11b0561963db678f
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Feb 26 13:33:26 2016 +0100

    lp#1506544: reenable unity-default-breeze, which wasnt reenabled on 5.1 yet
---
 changelog                                               |  3 ++-
 patches/series                                          |  1 +
 ...ity-default-human.diff => unity-default-breeze.diff} | 17 ++++++++---------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/changelog b/changelog
index 560f4d7..bbc3b60 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,9 @@ libreoffice (1:5.1.1~rc2-0ubuntu1) xenial; urgency=medium
 
   * new upstream rc
   * update patches, remove upstreamed ones
+  * reenable unity-default-breeze, which wasnt reenabled on 5.1 yet (LP: #1506544)
 
- -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Fri, 26 Feb 2016 13:20:54 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Fri, 26 Feb 2016 13:31:36 +0100
 
 libreoffice (1:5.1.0-0ubuntu1) xenial; urgency=medium
 
diff --git a/patches/series b/patches/series
index 7767520..4e71c1a 100644
--- a/patches/series
+++ b/patches/series
@@ -29,3 +29,4 @@ rsc-no-error-about-unknown-switch.diff
 disable-npapi-plugin-support.diff
 lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
 integraltrans.diff
+unity-default-breeze.diff
diff --git a/patches/unity-default-human.diff b/patches/unity-default-breeze.diff
similarity index 55%
rename from patches/unity-default-human.diff
rename to patches/unity-default-breeze.diff
index 8dce116..9f55150 100644
--- a/patches/unity-default-human.diff
+++ b/patches/unity-default-breeze.diff
@@ -1,24 +1,23 @@
 From: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
 Date: Tue, 20 Oct 2015 23:10:36 +0200
-Subject: [PATCH] on unity, default to human if possible
+Subject: [PATCH] on unity, default to breeze if possible
 
 ---
- vcl/source/app/IconThemeSelector.cxx | 3 +++
- 1 file changed, 3 insertions(+)
+ vcl/source/app/IconThemeSelector.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
 --- a/vcl/source/app/IconThemeSelector.cxx
 +++ b/vcl/source/app/IconThemeSelector.cxx
-@@ -65,6 +65,9 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi
-     else if ( desktopEnvironment.equalsIgnoreAsciiCase("MacOSX") ) {
+@@ -66,7 +66,7 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi
          r = "breeze";
      }
-+    else if ( desktopEnvironment.equalsIgnoreAsciiCase("unity") ) {
+     else if ( desktopEnvironment.equalsIgnoreAsciiCase("unity") ) {
+-        r = "human";
 +        r = "breeze";
-+    }
+     }
      else {
          r = FALLBACK_ICON_THEME_ID;
-     }
 -- 
-2.1.4
+2.5.0
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git