[geany/geany] b7485c: Merge "Improve GTK compatibility macros for GTK 2.16" from eht16/master