[meld] Fix style context state access for GTK+ 3.20 rules

[Kai Willadsen <kaiw src gnome org>]

commit 52529905f59670f9c3b400ca180a3cf142921884
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Jan 31 06:34:12 2016 +1000

    Fix style context state access for GTK+ 3.20 rules

 bin/meld                 |    6 +++++-
 meld/ui/notebooklabel.py |    7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/bin/meld b/bin/meld
index 43866ea..324758d 100755
--- a/bin/meld
+++ b/bin/meld
@@ -207,7 +207,11 @@ def setup_resources():
     # do this on the widget itself.
     textview = Gtk.TextView()
     textview_context = textview.get_style_context()
-    bg_colour = textview_context.get_background_color(Gtk.StateFlags.NORMAL)
+    textview_context.save()
+    textview_context.set_state(Gtk.StateFlags.NORMAL)
+    bg_colour = textview_context.get_background_color(
+        textview_context.get_state())
+    textview_context.restore()
     linkmap_css = "LinkMap { background-color: %s; }" % bg_colour.to_string()
     linkmap_provider = Gtk.CssProvider()
     linkmap_provider.load_from_data(linkmap_css)
diff --git a/meld/ui/notebooklabel.py b/meld/ui/notebooklabel.py
index 60c7252..cf3b208 100644
--- a/meld/ui/notebooklabel.py
+++ b/meld/ui/notebooklabel.py
@@ -49,8 +49,13 @@ class NotebookLabel(Gtk.HBox):
         label.set_alignment(0.0, 0.5)
         label.set_padding(0, 0)
 
+        style_context = self.get_style_context()
+        style_context.save()
+        style_context.set_state(Gtk.StateFlags.NORMAL)
+        font_desc = style_context.get_font(style_context.get_state())
+        style_context.restore()
+
         context = self.get_pango_context()
-        font_desc = self.get_style_context().get_font(Gtk.StateFlags.NORMAL)
         metrics = context.get_metrics(font_desc, context.get_language())
         char_width = metrics.get_approximate_char_width() / Pango.SCALE
         valid, w, h = Gtk.icon_size_lookup_for_settings(