fix GTK+3 build - add missing semicolon
fix GTK+3 build - use GDK_WINDOW_XID for inter-GTK compatibility
fix GI build - remove useless GConf reference
Merge remote-tracking branch 'upstream/master'

Conflicts:
	libmate-desktop/Makefile.am
	libmate-desktop/mate-rr.c