[ooo-build-commit] .: patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                     |    1 +
 patches/dev300/moblin-netbook-theme.diff |   19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

New commits:
commit 14a1d3b0500565e51a60ab3a1b0d3f49e87fbdc1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Apr 27 12:37:48 2010 +0300

    Correct menubar appearance with some GTK+ themes
    
    * patches/dev300/moblin-netbook-theme.diff: New diff. Use correct text
      colour for menu bar entries when picking colours from the GTK+ theme.
      Fixes a problem noticed especially with the Moblin Netbook theme.
    * patches/dev300/apply: Add it to Fixes.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 47606d4..75d06b3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3813,6 +3813,7 @@ vcl-default-wheel-behaviour.diff, n#591650, thorsten
 filled-tab-editeng.diff, n#564454, cbosdo
 chart-ui-fix.diff, i#110702, timar
 vcl-limit-iterator-advance.diff, i#110806, dtardon
+moblin-netbook-theme.diff, i#103999, bnc#527356, tml
 
 [ Features ]
 # embed generic media files inside odf docs, 2nd part
diff --git a/patches/dev300/moblin-netbook-theme.diff b/patches/dev300/moblin-netbook-theme.diff
new file mode 100644
index 0000000..5aac593
--- /dev/null
+++ b/patches/dev300/moblin-netbook-theme.diff
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User Philipp Lohmann [pl] <Philipp.Lohmann at Sun.COM>
+# Date 1272292577 -7200
+# Node ID 1f21040f063df81e894459971d03424146203339
+# Parent  3f6d3fa8969b69a4ecdb2926d962d2e4f8056678
+vcl111: #i103999# fix problem with moblin theme (thanks tml)
+
+diff -r 3f6d3fa8969b -r 1f21040f063d vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	Mon Apr 26 11:14:03 2010 +0200
++++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	Mon Apr 26 16:36:17 2010 +0200
+@@ -3475,7 +3475,7 @@
+     aStyleSet.SetMenuColor( aBackColor );
+     aStyleSet.SetMenuTextColor( aTextColor );
+ 
+-    aTextColor = getColor( pMenubarStyle->text[GTK_STATE_NORMAL] );
++    aTextColor = getColor( pMenubarStyle->fg[GTK_STATE_NORMAL] );
+     aStyleSet.SetMenuBarTextColor( aTextColor );
+     
+ #if OSL_DEBUG_LEVEL > 1