[libreoffice] 104/152: update gtk3 toolbar theming patch and re-enable it (LP: #1580537)

[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 93bf8e2da6110a244007208d56b89c31ef5fb1ad
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Aug 30 20:24:55 2016 +0200

    update gtk3 toolbar theming patch and re-enable it (LP: #1580537)
---
 changelog                            |  5 +++--
 patches/gtk3-toolbar-styleclass.diff | 23 +++++++++++------------
 patches/series                       |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/changelog b/changelog
index 68fbf7e..6652f77 100644
--- a/changelog
+++ b/changelog
@@ -1,10 +1,11 @@
-libreoffice (1:5.2.1~rc2-0ubuntu1) yakkety; urgency=medium
+libreoffice (1:5.2.1~rc2-0ubuntu1~yakkety1) yakkety; urgency=medium
 
   * new upstream rc
   * disable cups for autopkgtests too
   * make libreoffice-gnome depend on -gtk3 by default
+  * update gtk3 toolbar theming patch and re-enable it (LP: #1580537)
 
- -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Thu, 25 Aug 2016 10:53:18 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Tue, 30 Aug 2016 20:21:07 +0200
 
 libreoffice (1:5.2.0-0ubuntu2) yakkety; urgency=medium
 
diff --git a/patches/gtk3-toolbar-styleclass.diff b/patches/gtk3-toolbar-styleclass.diff
index fd7fd2b..b902a61 100644
--- a/patches/gtk3-toolbar-styleclass.diff
+++ b/patches/gtk3-toolbar-styleclass.diff
@@ -1,23 +1,22 @@
 From: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
-Date: Mon, 8 Aug 2016 16:47:02 +0200
+Date: Tue, 30 Aug 2016 20:16:04 +0200
 Subject: [PATCH] Add style class to LibreOffice toolbars in gtk3
 
 ---
- vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 2 ++
- 1 file changed, 2 insertions(+)
+ vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 1 +
+ 1 file changed, 1 insertion(+)
 
 diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
 --- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
 +++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
-@@ -1289,6 +1289,8 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, co
-         }
-         break;
-     case CTRL_TOOLBAR:
-+        static const gchar* sToolbarStyle = "libreoffice-toolbar";
-+        styleClass = sToolbarStyle;
-         switch(nPart)
-         {
-         case PART_DRAW_BACKGROUND_HORZ:
+@@ -2354,6 +2354,7 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow )
+ 
+     GtkWidget* pToolbar = gtk_toolbar_new();
+     mpToolbarStyle = gtk_widget_get_style_context(pToolbar);
++    gtk_style_context_add_class(mpToolbarStyle, "libreoffice-toolbar");
+     gtk_style_context_add_class(mpToolbarStyle, GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
+     gtk_style_context_add_class(mpToolbarStyle, GTK_STYLE_CLASS_TOOLBAR);
+ 
 -- 
 2.7.4
 
diff --git a/patches/series b/patches/series
index c192e29..e4a01ca 100644
--- a/patches/series
+++ b/patches/series
@@ -29,4 +29,4 @@ rsc-no-error-about-unknown-switch.diff
 lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
 integraltrans.diff
 mysqlc-boost-fallthrough.diff
-#gtk3-toolbar-styleclass.diff
+gtk3-toolbar-styleclass.diff

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