[gtk+/quartz-integration] (12 commits) ...Merge branch 'master' into quartz-integration

[John Ralls <jralls src gnome org>]

Summary of changes:

  8effa1e... [gi] Added missing (allow-none) annotation to gdk_device_gr (*)
  a79f05c... fix win32 build after removal of the colormap debug categor (*)
  287a388... gtk: remove unused "window" variable from gtk_entry_draw_fr (*)
  7fabfec... gtk: save/restore the cairo_t around early upchaining in dr (*)
  6e55332... Make gtk_widget_get_state_flags() avoid propagating the foc (*)
  5d31062... gtk: no need to add GTK_STYLE_FLAG_FOCUSED to the widget's  (*)
  e2d42f3... [gi] Return value of gdk_window_new should have transfer fu (*)
  120e289... Use actual app name in app choosers (*)
  d07231c... bgo#626336 - Don't assume that GtkButton is activated only  (*)
  84bf984... bgo#640161 - Maintain map/unmap invariants in GtkFileChoose (*)
  a4a2d76... bgo#639531 - [filechooser] Handle the case where the user t (*)
  085c618... Merge branch 'master' into quartz-integration

(*) This commit already existed in another branch; no separate mail sent