From 2f68d57f5cb9defee8c4cd9411cc5df0b33d478f Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@anakreon.cz>
Date: Mon, 1 Jun 2015 14:10:16 +0200
Subject: [PATCH] Added fix for rhbz#1226868 - [GTK3] regression: bad colors
 make notifications unreadable

---
 firefox.spec          |  8 +++++++-
 mozilla-1169232.patch | 27 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 mozilla-1169232.patch

diff --git a/firefox.spec b/firefox.spec
index e4c6976..6c6d111 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -107,7 +107,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        38.0.1
-Release:        5%{?pre_tag}%{?dist}
+Release:        6%{?pre_tag}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -160,6 +160,7 @@ Patch418:        mozilla-1144745-2.patch
 Patch419:        mozilla-1144745-3.patch
 Patch420:        mozilla-1160154.patch
 Patch421:        mozilla-1169233.patch
+Patch422:        mozilla-1169232.patch
 
 # Fix Skia Neon stuff on AArch64
 Patch500:        aarch64-fix-skia.patch
@@ -321,6 +322,7 @@ cd %{tarballdir}
 %patch419 -p1 -b .1144745-3
 %patch420 -p1 -b .1160154
 %patch421 -p1 -b .1169233
+%patch422 -p1 -b .1169232
 %endif
 
 %patch500 -p1
@@ -812,6 +814,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Jun 1 2015 Martin Stransky <stransky@redhat.com> - 38.0.1-6
+- Added fix for rhbz#1226868 - [GTK3] regression: bad colors
+  make notifications unreadable
+
 * Fri May 29 2015 Martin Stransky <stransky@redhat.com> - 38.0.1-5
 - Added patch for mozbz#1169233 - Disabled menu items
   are not greyed out
diff --git a/mozilla-1169232.patch b/mozilla-1169232.patch
new file mode 100644
index 0000000..016e82f
--- /dev/null
+++ b/mozilla-1169232.patch
@@ -0,0 +1,27 @@
+# HG changeset patch
+# User Martin Stransky <stransky@redhat.com>
+# Parent  f8d21278244bc0531513131f85a45e5736207ae1
+Bug 1169232 - [gtk3] add background class to tooltip window
+              to get correct background color. r=?karlt
+
+diff --git a/widget/gtk/nsLookAndFeel.cpp b/widget/gtk/nsLookAndFeel.cpp
+--- a/widget/gtk/nsLookAndFeel.cpp
++++ b/widget/gtk/nsLookAndFeel.cpp
+@@ -1004,16 +1004,17 @@ nsLookAndFeel::Init()
+     gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);
+     sMozWindowBackground = GDK_RGBA_TO_NS_RGBA(color);
+     gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);
+     sMozWindowText = GDK_RGBA_TO_NS_RGBA(color);
+     gtk_style_context_restore(style);
+ 
+     // tooltip foreground and background
+     gtk_style_context_add_class(style, GTK_STYLE_CLASS_TOOLTIP);
++    gtk_style_context_add_class(style, GTK_STYLE_CLASS_BACKGROUND);
+     gtk_style_context_get_background_color(style, GTK_STATE_FLAG_NORMAL, &color);
+     sInfoBackground = GDK_RGBA_TO_NS_RGBA(color);
+     gtk_style_context_get_color(style, GTK_STATE_FLAG_NORMAL, &color);
+     sInfoText = GDK_RGBA_TO_NS_RGBA(color);
+     g_object_unref(style);
+ 
+     // menu foreground & menu background
+     GtkWidget *accel_label = gtk_accel_label_new("M");