Merge lp:~midori/midori/fix-build-after-granite into lp:midori

[Paweł Forysiuk]

Properly guard usage of gtk3 get_style_context

[frenchy82 (cartes)]

build is ok on gtk2 (ubuntu 12.04)

review: Approve (testing)

[Cris Dywan (kalikiana)]

That's wrong, this is GTK+3 not Granite.

review: Needs Fixing

[lp:~midori/midori/fix-build-after-granite]

6636. By Paweł Forysiuk on 2014-03-30

Dynamic notebook class is not specific to granite

[Cris Dywan (kalikiana)]

Looks good, thanks!

review: Approve

[Rico Tzschichholz (ricotz)]

It should require both

#if HAVE_GTK3 && HAVE_GRANITE
...
#end

review: Needs Fixing

=== modified file 'midori/midori-notebook.vala'
--- midori/midori-notebook.vala	2014-03-29 21:45:57 +0000
+++ midori/midori-notebook.vala	2014-03-30 14:01:28 +0000
@@ -207,9 +207,10 @@
             notebook.show_border = false;
             notebook.set ("group-name", PACKAGE_NAME);
             add (notebook);
+
+#if HAVE_GTK3
             get_style_context ().add_class ("dynamic-notebook");
-
-#if !HAVE_GTK3
+#else
             /* Remove the inner border between scrollbars and window border */
             Gtk.RcStyle rcstyle = new Gtk.RcStyle ();
             rcstyle.xthickness = 0;