[meld] (63 commits) ...Merge branch 'Gio'

[Kai Willadsen <kaiw src gnome org>]

Summary of changes:

  2c33048... filediff: Use GtkSourceView's file loader
  d972673... filediff: Use the GtkSourceEncoding instead of the charset 
  b6d08c4... filediff: Improve file load handling and avoid multiple dif
  92be30f... filediff, meldbuffer: Make BufferData do our writability ch
  b5e3104... ui.msgarea: Move dismissable message helper to msgarea
  96d6cc7... filediff: Remove progress callback until we support network
  299294b... filediff, filemerge: Fix auto-merge mode for file loading c
  7d444bf... filediff: Do less work when starting a load, and de-yieldif
  1fc308a... filemerge: Remove the hack to avoid a flash of unmerged tex
  1fda7bd... filediff, filemerge: Remove our now-unneeded file load shim
  1a95826... filediff, filemerge: More file-loading unification
  fdabc60... filediff: Stop passing buffers needlessly
  4037942... filediff, meldbuffer: Move label and filename reset into Me
  8239c32... filediff: Absorb _load_files into out only file setter
  cb8ebcd... meldbuffer: Remove support for creating buffer and bufferda
  e5522a8... filediff, meldbuffer: Have BufferData record and use a gfil
  b0ba634... filediff: Move focus grabbing until our initial comparison 
  369d147... filediff: There's no need to recalculate the label before l
  e122ab7... filediff: Reorder some file load activity
  353c247... meldbuffer: Start to move towards GFile as the basis of Buf
  12fd9d2... filediff, sourceview: Simplify source language sniffing
  9a801b1... filediff: More gfile-ification
  f18cf09... filediff: Remove TaskEntry object that we're no longer usin
  02a53cf... filediff: Minor buffer data handling refactor
  1ef1ee2... meldbuffer: Create and keep a sourcefile associated with ou
  0c18dae... filediff: Remove mixed newline handling; we just save what'
  9a2bcc1... meldbuffer: Fix file monitoring behaviour for gfile based b
  82c4bf8... meldwindow: Improve tab-removal logic by manually triggerin
  b0bd2d1... Remove unused appquit argument
  e7b8c41... filediff: Fix some logic errors around pane counts
  745556e... filediff: Remove unused imports
  f21414f... newdifftab: Add and emit the close signal, as melddoc does
  7424577... meldwindow: Move to handling page removal in a callback
  d01bd6a... filediff: Add hack to work around double setting of filecho
  bb4c111... patchdialog: Use a simplistic GtkSourceFileSaver for saving
  ffd28fc... Move filediff to using GtkSourceFileSaver
  87eba5f... filediff: Rework file saving logic to handle errors in asyn
  3f4e62c... melddoc: Make state a property and emit a signal on change
  376d557... filediff: Use symbolic icons for per-view file saving
  2b21de6... meldapp, meldwindow: Rework window deletion logic for async
  e1d183f... filediff, meldwindow: Remove outdated comments about new sa
  4317f44... Merge branch 'master' into Gio; includes non-trivial binary
  fbeceed... ui.msgarea: Add helper for actionable messages and use for 
  d8cf663... filediff: Use new message action helper for file change not
  fb3f098... filediff: Update copyright years
  4b8774c... filediff: Use symbolic icons for the locked-file button
  06783e0... dirdiff, filediff, msgarea: Switch to using symbolic dialog
  6f79973... settings: Don't bind sensitivity settings automatically
  7e1b075... filediff: Use sensitivity rather than editability while loa
  812556a... meldbuffer: Remove now-unused editable variable from buffer
  ee4e37c... Use native buffer modified tracking instead of our own weir
  93a3004... filediff: Use the MeldBuffer-associated source file to get 
  2f2184f... filediff, meldbuffer: Use detected newlines from the source
  a6ed5cc... filediff, meldbuffer: Get the encodings from the source fil
  109d19e... meldbuffer: Use our existing property for the save file tar
  3a8dae9... meldbuffer: Handle having a None target
  5f84284... Merge branch 'master' into Gio
  7e2230f... Update gsettings schema for change in use of custom encodin
  a1cadb7... filediff: Remove now-unused success flag
  dec395e... filediff, sourceview: Re-add support for old detect-encodin
  062c72a... filediff: Handle buffer handler reconnection for blank file
  41e753d... filediff: Clean up buffer handlers after disconnecting
  baa1646... Merge branch 'Gio'