midori recent trunk build error on fedora 22

[kuh3h3]

make -C _build
make[1]: Entering directory '/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/_build'
make[2]: Entering directory '/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/_build'
make[3]: Entering directory '/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/_build'
[ 0%] Generating /run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/../katze/midori-uri.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/../katze/midori-paths.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/../katze/midori-hsts.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/../katze/katze-separatoraction.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/midori-panedaction.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/midori-database.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/midori-viewable.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/midori-notebook.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/midori-speeddial.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/midori-viewcompletion.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/midori-contextaction.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/midori-bookmarksdatabase.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/midori-tab.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/midori-dialog.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/midori-completion.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/midori-settings.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/midori-download.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/midori-historydatabase.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/midori-extensions-column.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/midori-historycompletion.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/midori-searchcompletion.c;/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/midori-window.c;midori-core.vapi;midori-core.h
/run/media/reandr/48fed7c3-c2ce-49e5-8eaa-3bdf47cff596/midori/midori/midori-notebook.vala:123.62-123.73: error: The name `scale_factor' does not exist in the context of `Midori.Tally.icon_changed'
            this.icon.set_from_gicon (scale_if_needed (icon, scale_factor), Gtk.IconSize.MENU);
                                                             ^^^^^^^^^^^^
Compilation failed: 1 error(s), 0 warning(s)
midori/CMakeFiles/midori-core-vala.dir/build.make:156: recipe for target 'midori/midori_valac.stamp' failed
make[3]: *** [midori/midori_valac.stamp] Error 1

[gue5t gue5t (gue5t)]

Looks like the last commit broke GTK2 build; we need to make scale_if_needed (icon, scale_factor) conditional on GTK3, as with gtk2 we can just use the icon without scaling.

[gue5t gue5t (gue5t)]

https://code.launchpad.net/~gue5t/midori/fix-gtk2-compile should fix this.