[nautilus] (23 commits) Created branch merge_replace_dialog

[Cosimo Cecchi <cosimoc src gnome org>]

The branch 'merge_replace_dialog' was created.

Summary of new commits:

  8b84fe6... First implementation of NautilusFileConflictDialog
  30099cf... Hook the dialog inside the relevant file operations
  fb5df6a... Use a GtkDialog.
  d3c1925... UI and HIG fixes
  e892302... Finish implement icon boxes in the dialog.
  a97500c... HIG fixes
  26e96c5... Implement responses from the dialog back to the file operat
  5313353... Adapt the file operations code to use the new dialog
  e601894... Implement support for rename in the operations code
  e9f7a12... Use NautilusFile machinery instead of is_dir
  33a59da... Build fix
  ea74754... Swap the order of files in the dialog
  2fe1f94... Fix a conflict after rebase.
  d44f93b... Fix indentation.
  7de2646... Show the file type only if it's different.
  df1819b... Make sure NautilusFiles are ready.
  4219ee9... Specify which file is older.
  0593a26... Make the primary label bold.
  fcb549c... Remove manual markup.
  c3c2161... Simplify the mtime compare code.
  4945108... Reverse broken logic.
  2e19e90... Whitespace fixes.
  ab1035e... Tweak UI according to usability suggestions.